From 27eb341fa84bc5c66c8d67df047d63b17444e0ce Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Tue, 29 Nov 2016 10:56:44 -0800
Subject: [PATCH] Fix users and comments as a merge was weird before.

---
 models/comment.js    | 20 ++------------------
 tests/models/user.js |  9 +++++++--
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/models/comment.js b/models/comment.js
index f03d1b12d..c1a32cf1b 100644
--- a/models/comment.js
+++ b/models/comment.js
@@ -30,19 +30,6 @@ const CommentSchema = new Schema({
   }
 });
 
-//==============================================================================
-// New Statics
-//==============================================================================
-
-/**
- * Create a comment.
- * @param {String} body  content of comment
-*/
-CommentSchema.statics.new = function(body, author_id, asset_id, parent_id, status, username) {
-  let comment  = new Comment({body, author_id, asset_id, parent_id, status, username});
-  return comment.save();
-};
-
 //==============================================================================
 // Find Statics
 //==============================================================================
@@ -159,16 +146,13 @@ CommentSchema.statics.moderationQueue = function(moderation) {
 //==============================================================================
 
 /**
- * Changes the status of a comment.
+ * Change the status of a comment.
  * @param {String} id  identifier of the comment  (uuid)
  * @param {String} status the new status of the comment
  * @return {Promise}
  */
 CommentSchema.statics.changeStatus = function(id, status) {
-  return Comment.findOneAndUpdate({'id': id}, {$set: {'status': status}}, {upsert: false, new: true})
-    .then((comment) => {
-      return comment;
-    });
+  return Comment.findOneAndUpdate({'id': id}, {$set: {'status': status}});
 };
 
 /**
diff --git a/tests/models/user.js b/tests/models/user.js
index 618472881..22aedf361 100644
--- a/tests/models/user.js
+++ b/tests/models/user.js
@@ -1,5 +1,6 @@
 const User = require('../../models/user');
 const Comment = require('../../models/comment');
+
 const expect = require('chai').expect;
 
 describe('User: models', () => {
@@ -96,7 +97,9 @@ describe('User: models', () => {
   describe('#ban', () => {
     let mockComment;
     beforeEach(() => {
-      return Comment.new('testing the comment for that user if it is rejected.', mockUsers[0].id)
+      return Promise.all([
+        Comment.create([{body: 'testing the comment for that user if it is rejected.', id: mockUsers[0].id}])
+      ])
       .then((comment) => {
         mockComment = comment;
       });
@@ -156,7 +159,9 @@ describe('User: models', () => {
   describe('#unban', () => {
     let mockComment;
     beforeEach(() => {
-      return Comment.new('testing the comment for that user if it is rejected.', mockUsers[0].id)
+      return Promise.all([
+        Comment.create([{body: 'testing the comment for that user if it is rejected.', id: mockUsers[0].id}])
+      ])
       .then((comment) => {
         mockComment = comment;
       });