Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-04 21:15:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Baris Usakli
2017-06-15 14:05:45 -04:00
parent d9e84b1db8 4903585d88
commit 0ea4ee7dda
49 changed files with 683 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/categories.js
View File

@@ -643,7 +643,6 @@ describe('Categories', function () {
assert.ifError(err);
assert.deepEqual(data, {
find: false,
mods: false,
'posts:delete': false,
read: false,
'topics:reply': false,
@@ -651,6 +650,10 @@ describe('Categories', function () {
'topics:create': false,
'topics:delete': false,
'posts:edit': false,
'upload:post:file': false,
'upload:post:image': false,
purge: false,
moderate: false,
});
done();
@@ -669,6 +672,10 @@ describe('Categories', function () {
'groups:posts:delete': true,
'groups:read': true,
'groups:topics:read': true,
'groups:upload:post:file': false,
'groups:upload:post:image': true,
'groups:purge': false,
'groups:moderate': false,
});
done();