Merge branch 'master' into story-137818425-tag-staff

test/routes/api/comments/index.js

@@ -267,79 +267,3 @@ describe('/api/v1/comments/:comment_id', () => {
     });
   });
 });
-
-describe('/api/v1/comments/:comment_id/actions', () => {
-
-  const comments = [{
-    id: 'abc',
-    body: 'comment 10',
-    asset_id: 'asset',
-    author_id: '123',
-    status_history: []
-  }, {
-    id: 'def',
-    body: 'comment 20',
-    asset_id: 'asset',
-    author_id: '456',
-    status: 'REJECTED',
-    status_history: [{
-      type: 'REJECTED'
-    }]
-  }, {
-    id: 'hij',
-    body: 'comment 30',
-    asset_id: '456',
-    status: 'ACCEPTED',
-    status_history: [{
-      type: 'ACCEPTED'
-    }]
-  }];
-
-  const users = [{
-    displayName: 'Ana',
-    email: 'ana@gmail.com',
-    password: '123456789'
-  }, {
-    displayName: 'Maria',
-    email: 'maria@gmail.com',
-    password: '123456789'
-  }];
-
-  const actions = [{
-    action_type: 'FLAG',
-    item_type: 'COMMENTS',
-    item_id: 'abc'
-  }, {
-    action_type: 'LIKE',
-    item_type: 'COMMENTS',
-    item_id: 'hij'
-  }];
-
-  beforeEach(() => {
-    return SettingsService.init(settings).then(() => {
-      return Promise.all([
-        CommentModel.create(comments),
-        UsersService.createLocalUsers(users),
-        ActionModel.create(actions)
-      ]);
-    });
-  });
-
-  describe('#post', () => {
-    it('it should create an action', () => {
-      return chai.request(app)
-        .post('/api/v1/comments/abc/actions')
-        .set(passport.inject({id: '456', roles: ['ADMIN']}))
-        .send({'action_type': 'flag', 'metadata': {'reason': 'Comment is too awesome.'}})
-        .then((res) => {
-          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('metadata');
-          expect(res.body.metadata).to.deep.equal({'reason': 'Comment is too awesome.'});
-          expect(res.body).to.have.property('item_id', 'abc');
-        });
-    });
-  });
-});