wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-02 05:17:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix users and comments as a merge was weird before.

Browse Source
This commit is contained in:
gaba
2016-11-29 10:56:44 -08:00
parent a375bf638a
commit 27eb341fa8
2 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
models/comment.js
+2 -18
View File
@@ -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}});
};
/**
tests/models/user.js
+7 -2
View File
@@ -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;
});