Merge branch 'master' of github.com:coralproject/talk into passport

tests/routes/api/comments/index.js

@@ -75,7 +75,7 @@ describe('Get /comments', () => {
   });
 });
 
-describe('Get moderation queues rejected, pending, flags', () => {
+describe('Get comments by status and action', () => {
   const comments = [{
     id: 'abc',
     body: 'comment 10',
@@ -133,9 +133,20 @@ describe('Get moderation queues rejected, pending, flags', () => {
       });
   });
 
-  it('should return all the pending comments', function(done){
+  it('should return all the approved comments', function(done){
     chai.request(app)
-      .get('/api/v1/comments/status/pending')
+      .get('/api/v1/comments/status/accepted')
+      .end(function(err, res){
+        expect(err).to.be.null;
+        expect(res).to.have.status(200);
+        expect(res.body[0]).to.have.property('id', 'hij');
+        done();
+      });
+  });
+
+  it('should return all the new comments', function(done){
+    chai.request(app)
+      .get('/api/v1/comments/status/new')
       .end(function(err, res){
         expect(err).to.be.null;
         expect(res).to.have.status(200);
@@ -144,37 +155,15 @@ describe('Get moderation queues rejected, pending, flags', () => {
       });
   });
 
-  it('should return all the pending comments as pre moderated', function(done){
+  it('should return all the flagged comments', function(done){
     chai.request(app)
-      .get('/api/v1/comments/status/pending')
-      .query({'moderation': 'pre'})
-      .end(function(err, res){
-        expect(err).to.be.null;
-        expect(res).to.have.status(200);
-        expect(res.body[0]).to.have.property('id', 'def');
-        done();
-      });
-  });
-
-  it('should return all the pending comments as post moderated', function(done){
-    chai.request(app)
-      .get('/api/v1/comments/status/pending')
-      .query({'moderation': 'post'})
-      .end(function(err, res){
-        expect(err).to.be.null;
-        expect(res).to.have.status(200);
-        expect(res.body).to.have.lengthOf(0);
-        done();
-      });
-  });
-
-  it('should return all the flagged comments', () => {
-    return chai.request(app)
       .get('/api/v1/comments/action/flag')
-      .then((res) => {
+      .end(function(err, res){
         expect(res).to.have.status(200);
+        expect(err).to.be.null;
         expect(res.body.length).to.equal(1);
         expect(res.body[0]).to.have.property('id', 'abc');
+        done();
       });
   });
 });
@@ -390,6 +379,11 @@ describe('Remove /:comment_id', () => {
   });
 });
 
+process.on('unhandledRejection', (reason) => {
+  console.error('Reason: ');
+  console.error(reason);
+});
+
 describe('Post /:comment_id/status', () => {
 
   const comments = [{

tests/routes/api/queue/index.js

@@ -0,0 +1,81 @@
+process.env.NODE_ENV = 'test';
+
+require('../../../utils/mongoose');
+
+const app = require('../../../../app');
+const chai = require('chai');
+const expect = chai.expect;
+
+// Setup chai.
+chai.should();
+chai.use(require('chai-http'));
+
+const Comment = require('../../../../models/comment');
+const Action = require('../../../../models/action');
+const User = require('../../../../models/user');
+
+const Setting = require('../../../../models/setting');
+const settings = {id: '1', moderation: 'pre'};
+
+beforeEach(() => {
+  return Setting.create(settings);
+});
+
+describe('Get moderation queues rejected, pending, flags', () => {
+  const comments = [{
+    id: 'abc',
+    body: 'comment 10',
+    asset_id: 'asset',
+    author_id: '123',
+    status: 'rejected'
+  }, {
+    id: 'def',
+    body: 'comment 20',
+    asset_id: 'asset',
+    author_id: '456'
+  }, {
+    id: 'hij',
+    body: 'comment 30',
+    asset_id: '456',
+    status: 'accepted'
+  }];
+
+  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',
+    item_type: 'comment'
+  }, {
+    action_type: 'like',
+    item_id: 'hij',
+    item_type: 'comment'
+  }];
+
+  beforeEach(() => {
+    return Promise.all([
+      Comment.create(comments),
+      User.createLocalUsers(users),
+      Action.create(actions)
+    ]);
+  });
+
+  it('should return all the pending comments', function(done){
+    chai.request(app)
+      .get('/api/v1/queue/comments/pending')
+      .end(function(err, res){
+        expect(err).to.be.null;
+        expect(res).to.have.status(200);
+        expect(res.body[0]).to.have.property('id', 'def');
+        done();
+      });
+  });
+});