From 7a9e50dbbac55847c980ec6e38378e279dd6e4d6 Mon Sep 17 00:00:00 2001
From: MathWhiz <MathWhiz@users.noreply.github.com>
Date: Mon, 30 May 2016 13:33:54 -0500
Subject: [PATCH] Fix #7388 - Invert tag collapse when adding tasks

---
 common/script/ops/addTask.js | 14 +++-----------
 test/common/ops/addTask.js   | 34 ++++++++++++++++++----------------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/common/script/ops/addTask.js b/common/script/ops/addTask.js
index 592f877248..2c4ea159e2 100644
--- a/common/script/ops/addTask.js
+++ b/common/script/ops/addTask.js
@@ -7,17 +7,9 @@ module.exports = function addTask (user, req = {body: {}}) {
   user.tasksOrder[`${task.type}s`].unshift(task._id);
   user[`${task.type}s`].unshift(task);
 
-  if (user.preferences.newTaskEdit) {
-    task._editing = true;
-  }
-
-  if (user.preferences.tagsCollapsed) {
-    task._tags = true;
-  }
-
-  if (!user.preferences.advancedCollapsed) {
-    task._advanced = true;
-  }
+  task._editing = user.preferences.newTaskEdit;
+  task._tags = !user.preferences.tagsCollapsed;
+  task._advanced = !user.preferences.advancedCollapsed;
 
   return task;
 };
diff --git a/test/common/ops/addTask.js b/test/common/ops/addTask.js
index cb207036db..7137880c61 100644
--- a/test/common/ops/addTask.js
+++ b/test/common/ops/addTask.js
@@ -113,27 +113,29 @@ describe('shared.ops.addTask', () => {
     expect(reward.up).to.not.exists;
   });
 
-  context('respects preferences', () => {
-    it('true', () => {
+  context('user preferences', () => {
+    it('respects newTaskEdit preference', () => {
       user.preferences.newTaskEdit = true;
-      user.preferences.tagsCollapsed = true;
-      user.preferences.advancedCollapsed = false;
-      let task = addTask(user);
+      expect(addTask(user)._editing).to.be.ok;
 
-      expect(task._editing).to.be.true;
-      expect(task._tags).to.be.true;
-      expect(task._advanced).to.be.true;
+      user.preferences.newTaskEdit = false;
+      expect(addTask(user)._editing).not.be.ok
     });
 
-    it('false', () => {
-      user.preferences.newTaskEdit = false;
-      user.preferences.tagsCollapsed = false;
-      user.preferences.advancedCollapsed = true;
-      let task = addTask(user);
+    it('respects tagsCollapsed preference', () => {
+      user.preferences.tagsCollapsed = true;
+      expect(addTask(user)._tags).to.not.be.ok;
 
-      expect(task._editing).to.not.exists;
-      expect(task._tags).to.not.exists;
-      expect(task._advanced).to.not.exists;
+      user.preferences.tagsCollapsed = false;
+      expect(addTask(user)._tags).to.be.ok;
+    });
+
+    it('respects advancedCollapsed preference', () => {
+      user.preferences.advancedCollapsed = true;
+      expect(addTask(user)._advanced).not.be.ok
+
+      user.preferences.advancedCollapsed = false;
+      expect(addTask(user)._advanced).to.be.ok;
     });
   });
 });