wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-12 12:30:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:coralproject/talk into username-ban

Browse Source
This commit is contained in:
David Jay
2017-02-02 12:29:29 -05:00
parent 97c3ebc3e0 ce002e366d
commit feb0860ba1
42 changed files with 8560 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/client/coral-framework/store/notificationReducer.spec.js
+2 -2
View File
@@ -28,8 +28,8 @@ describe ('notificationsReducer', () => {
type: 'test'
});
const result = notificationReducer(store, action);
expect(result.get('text')).to.equal(undefined);
expect(result.get('type')).to.equal(undefined);
expect(result.get('text')).to.equal('');
expect(result.get('type')).to.equal('');
});
});
});
test/routes/api/queue/index.js
+1 -1
View File
@@ -97,7 +97,7 @@ describe('/api/v1/queue', () => {
it('should return all the pending comments, users and actions', () => {
return chai.request(app)
.get('/api/v1/queue/comments/pending')
.get('/api/v1/queue/comments/premod')
.set(passport.inject({roles: ['ADMIN']}))
.then((res) => {
expect(res).to.have.status(200);