Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 12:05:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Julian Lam
2018-01-06 12:04:07 -05:00
parent 8588a54ff2 9922720dd3
commit d1ccd78ac2
94 changed files with 1370 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/messaging.js
View File

@@ -414,7 +414,7 @@ describe('Messaging Library', function () {
it('should fail to load room if user is not in', function (done) {
socketModules.chats.loadRoom({ uid: 0 }, { roomId: roomId }, function (err) {
assert.equal(err.message, '[[error:not-allowed]]');
assert.equal(err.message, '[[error:no-privileges]]');
done();
});
});
@@ -629,11 +629,12 @@ describe('Messaging Library', function () {
});
});
it('should 404 for guest', function (done) {
it('should 500 for guest with no privilege error', function (done) {
meta.config.disableChat = 0;
request(nconf.get('url') + '/user/baz/chats', function (err, response) {
request(nconf.get('url') + '/api/user/baz/chats', { json: true }, function (err, response, body) {
assert.ifError(err);
assert.equal(response.statusCode, 404);
assert.equal(response.statusCode, 500);
assert.equal(body.error, '[[error:no-privileges]]');
done();
});
});