From b7ffd31ea47acbee417cf9b256b0b5ed2d947dee Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Tue, 29 Nov 2016 16:37:39 -0500
Subject: [PATCH] Cleaning up tests after merge.

---
 models/setting.js                |   1 +
 routes/api/stream/index.js       |   2 +-
 tests/routes/api/stream/index.js | 152 +++++++++++++++----------------
 3 files changed, 78 insertions(+), 77 deletions(-)

diff --git a/models/setting.js b/models/setting.js
index f0c6a1abc..e23f654a7 100644
--- a/models/setting.js
+++ b/models/setting.js
@@ -42,6 +42,7 @@ SettingSchema.statics.getSettings = function () {
  * @return {Promise} moderation the settings for how to moderate comments
  */
 SettingSchema.statics.getModerationSetting = function () {
+  console.log('Getting moderation setting');
   return this.findOne({id: '1'}).select('moderation');
 };
 
diff --git a/routes/api/stream/index.js b/routes/api/stream/index.js
index 5a110e2d6..ce8871ab8 100644
--- a/routes/api/stream/index.js
+++ b/routes/api/stream/index.js
@@ -34,7 +34,7 @@ router.get('/', (req, res, next) => {
     // Merge the asset specific settings with the returned settings object in
     // the event that the asset that was returned also had settings.
     if (asset.settings) {
-      settings = Object.assign(settings, asset.settings);
+      settings = Object.assign({}, settings, asset.settings);
     }
 
     // Fetch the appropriate comments stream.
diff --git a/tests/routes/api/stream/index.js b/tests/routes/api/stream/index.js
index ea08ceebb..6484fdc12 100644
--- a/tests/routes/api/stream/index.js
+++ b/tests/routes/api/stream/index.js
@@ -14,90 +14,90 @@ const Asset = require('../../../../models/asset');
 const Setting = require('../../../../models/setting');
 
 describe('/api/v1/stream', () => {
+  describe('#get', () => {
+    const settings = {
+      id: '1',
+      moderation: 'post'
+    };
 
-  const settings = {
-    id: '1',
-    moderation: 'post'
-  };
+    let comments;
 
-  const comments = [{
-    id: 'abc',
-    body: 'comment 10',
-    author_id: '',
-    parent_id: '',
-    status: 'accepted'
-  }, {
-    id: 'def',
-    body: 'comment 20',
-    author_id: '',
-    parent_id: '',
-    status: ''
-  }, {
-    id: 'uio',
-    body: 'comment 30',
-    asset_id: 'asset',
-    author_id: '456',
-    parent_id: '',
-    status: 'accepted'
-  }, {
-    id: 'hij',
-    body: 'comment 40',
-    asset_id: '456',
-    status: 'rejected'
-  }];
+    const users = [{
+      displayName: 'Ana',
+      email: 'ana@gmail.com',
+      password: '123'
+    }, {
+      displayName: 'Maria',
+      email: 'maria@gmail.com',
+      password: '123'
+    }];
 
-  const users = [{
-    displayName: 'Ana',
-    email: 'ana@gmail.com',
-    password: '123'
-  }, {
-    displayName: 'Maria',
-    email: 'maria@gmail.com',
-    password: '123'
-  }];
+    const actions = [{
+      action_type: 'flag',
+      item_id: 'abc'
+    }, {
+      action_type: 'like',
+      item_id: 'hij'
+    }];
 
-  const actions = [{
-    action_type: 'flag',
-    item_id: 'abc'
-  }, {
-    action_type: 'like',
-    item_id: 'hij'
-  }];
+    beforeEach(() => {
 
-  beforeEach(() => {
-
-    return Promise.all([
-      User.createLocalUsers(users),
-      Asset.findOrCreateByUrl('http://test.com'),
-      Asset
-        .findOrCreateByUrl('http://coralproject.net/asset2')
-        .then((asset) => {
-          return Asset
-            .overrideSettings(asset.id, {moderation: 'pre'})
-            .then(() => asset);
-        })
-    ])
-    .then(([users, asset1, asset2]) => {
-
-      comments[0].author_id = users[0].id;
-      comments[1].author_id = users[1].id;
-      comments[2].author_id = users[0].id;
-      comments[3].author_id = users[1].id;
-
-      comments[0].asset_id = asset1.id;
-      comments[1].asset_id = asset1.id;
-      comments[2].asset_id = asset2.id;
-      comments[3].asset_id = asset2.id;
+      comments = [{
+        id: 'abc',
+        body: 'comment 10',
+        author_id: '',
+        parent_id: '',
+        status: 'accepted'
+      }, {
+        id: 'def',
+        body: 'comment 20',
+        author_id: '',
+        parent_id: '',
+        status: ''
+      }, {
+        id: 'uio',
+        body: 'comment 30',
+        asset_id: 'asset',
+        author_id: '456',
+        parent_id: '',
+        status: 'accepted'
+      }, {
+        id: 'hij',
+        body: 'comment 40',
+        asset_id: '456',
+        status: 'rejected'
+      }];
 
       return Promise.all([
-        Comment.create(comments),
-        Action.create(actions),
-        Setting.create(settings)
-      ]);
-    });
-  });
+        User.createLocalUsers(users),
+        Asset.findOrCreateByUrl('http://test.com'),
+        Asset
+          .findOrCreateByUrl('http://coralproject.net/asset2')
+          .then((asset) => {
+            return Asset
+              .overrideSettings(asset.id, {moderation: 'pre'})
+              .then(() => asset);
+          })
+      ])
+      .then(([users, asset1, asset2]) => {
 
-  describe('#get', () => {
+        comments[0].author_id = users[0].id;
+        comments[1].author_id = users[1].id;
+        comments[2].author_id = users[0].id;
+        comments[3].author_id = users[1].id;
+
+        comments[0].asset_id = asset1.id;
+        comments[1].asset_id = asset1.id;
+        comments[2].asset_id = asset2.id;
+        comments[3].asset_id = asset2.id;
+
+        return Promise.all([
+          Comment.create(comments),
+          Action.create(actions),
+          Setting.init().then(() => Setting.updateSettings(settings))
+        ]);
+      });
+    });
     it('should return a stream with comments, users and actions for an existing asset', () => {
       return chai.request(app)
         .get('/api/v1/stream')