Merge branch 'master' into csrf

tests/routes/api/assets/index.js

@@ -18,12 +18,13 @@ describe('/api/v1/assets', () => {
         url: 'https://coralproject.net/news/asset1',
         title: 'Asset 1',
         description: 'term1',
-        id: '1'
+        closedAt: Date.now()
       },
       {
         url: 'https://coralproject.net/news/asset2',
         title: 'Asset 2',
-        description: 'term2'
+        description: 'term2',
+        closedAt: null
       }
     ]);
   });
@@ -81,6 +82,38 @@ describe('/api/v1/assets', () => {
         });
     });
 
+    it('should return only closed assets', () => {
+      return chai.request(app)
+        .get('/api/v1/assets?filter=closed')
+        .set(passport.inject({roles: ['admin']}))
+        .then((res) => {
+          const body = res.body;
+
+          expect(body).to.have.property('count', 1);
+          expect(body).to.have.property('result');
+
+          const assets = body.result;
+
+          expect(assets[0]).to.have.property('title', 'Asset 1');
+        });
+    });
+
+    it('should return only opened assets', () => {
+      return chai.request(app)
+        .get('/api/v1/assets?filter=open')
+        .set(passport.inject({roles: ['admin']}))
+        .then((res) => {
+          const body = res.body;
+
+          expect(body).to.have.property('count', 1);
+          expect(body).to.have.property('result');
+
+          const assets = body.result;
+
+          expect(assets[0]).to.have.property('title', 'Asset 2');
+        });
+    });
+
   });
 
   describe('#put', () => {

tests/routes/api/comments/index.js

@@ -10,22 +10,18 @@ const agent = chai.request.agent(app);
 chai.should();
 chai.use(require('chai-http'));
 
-const wordlist = require('../../../../services/wordlist');
 const Comment = require('../../../../models/comment');
 const Asset = require('../../../../models/asset');
 const Action = require('../../../../models/action');
 const User = require('../../../../models/user');
 
 const Setting = require('../../../../models/setting');
-const settings = {id: '1', moderation: 'pre'};
+const settings = {id: '1', moderation: 'pre', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
 
 describe('/api/v1/comments', () => {
 
   // Ensure that the settings are always available.
-  beforeEach(() => Promise.all([
-    wordlist.insert(['bad words']),
-    Setting.init(settings)
-  ]));
+  beforeEach(() => Setting.init(settings));
 
   describe('#get', () => {
     const comments = [{
@@ -171,12 +167,22 @@ describe('/api/v1/comments', () => {
   describe('#post', () => {
 
     let asset_id;
+    let postmod_asset_id;
 
-    beforeEach(() => Asset.findOrCreateByUrl('https://coralproject.net/section/article-is-the-best').then((asset) => {
+    beforeEach(() => Promise.all([
+      Asset.findOrCreateByUrl('https://coralproject.net/section/article-is-the-best').then((asset) => {
 
-      // Update the asset id.
-      asset_id = asset.id;
-    }));
+        // Update the asset id.
+        asset_id = asset.id;
+      }),
+      Asset.findOrCreateByUrl('https://coralproject.net/section/postmod-article-is-the-best').then((asset) => {
+
+        // Update the asset id.
+        postmod_asset_id = asset.id;
+
+        return Asset.overrideSettings(postmod_asset_id, {moderation: 'post'});
+      }),
+    ]));
 
     it('should create a comment', () => {
       agent
@@ -211,6 +217,37 @@ describe('/api/v1/comments', () => {
         });
     });
 
+    it('should create a comment with no status and a flag if it contains a suspected word', () => {
+      agent
+        .get('/api/v1/auth')
+        .then((resa) => {
+          expect(resa.status).to.be.equal(200);
+          expect(resa.body).to.have.property('csrfToken');
+          return agent.post('/api/v1/comments')
+            .set(passport.inject({roles: []}))
+            .send({'body': 'suspect words are the most suspicious', 'author_id': '123', 'asset_id': postmod_asset_id, 'parent_id': ''})
+            .then((res) => {
+              expect(res).to.have.status(201);
+              expect(res.body).to.have.property('id');
+              expect(res.body).to.have.property('status', null);
+
+              return Promise.all([
+                res.body,
+                Action.findByType('flag', 'comments')
+              ]);
+            })
+            .then(([comment, actions]) => {
+              expect(actions).to.have.length(1);
+
+              let action = actions[0];
+
+              expect(action).to.have.property('item_id', comment.id);
+              expect(action).to.have.property('field', 'body');
+              expect(action).to.have.property('detail', 'Matched suspect word filters.');
+            });
+        });
+    });
+
     it('should create a comment with a premod status if it\'s asset is has pre-moderation enabled', () => {
       return Asset
         .findOrCreateByUrl('https://coralproject.net/article1')
@@ -478,7 +515,8 @@ describe('/api/v1/comments/:comment_id/actions', () => {
               expect(res).to.have.status(201);
               expect(res).to.have.body;
               expect(res.body).to.have.property('action_type', 'flag');
-              expect(res.body).to.have.property('detail', 'Comment is too awesome.');
+              expect(res.body).to.have.property('metadata')
+                .and.to.deep.equal({'reason': 'Comment is too awesome.'});
               expect(res.body).to.have.property('item_id', 'abc');
             });
         });

tests/routes/api/user/index.js

@@ -42,9 +42,11 @@ describe('/api/v1/users/:user_id/actions', () => {
               expect(res).to.have.status(201);
               expect(res).to.have.body;
               expect(res.body).to.have.property('action_type', 'flag');
-              expect(res.body).to.have.property('detail', 'Bio is too awesome.');
+              expect(res.body).to.have.property('metadata')
+                .and.to.deep.equal({'reason': 'Bio is too awesome.'});
               expect(res.body).to.have.property('item_id', 'abc');
-            });
+            })
+            .catch(err => console.error(err.message));
         });
     });
   });