[[admin/general/dashboard:control-panel]]
-
-
-
-
+
+
- +
+ [[admin/general/dashboard:restart-warning]] + + [[admin/general/dashboard:restart-disabled]] +
[[admin/general/dashboard:maintenance-mode]] diff --git a/src/views/admin/manage/admins-mods.tpl b/src/views/admin/manage/admins-mods.tpl new file mode 100644 index 0000000000..76d3982302 --- /dev/null +++ b/src/views/admin/manage/admins-mods.tpl @@ -0,0 +1,64 @@ +
+
+ +
+ + +
+ +
diff --git a/src/views/admin/manage/category.tpl b/src/views/admin/manage/category.tpl
index 7c39ddee44..cf8ab89312 100644
--- a/src/views/admin/manage/category.tpl
+++ b/src/views/admin/manage/category.tpl
@@ -2,15 +2,7 @@
[[admin/manage/admins-mods:administrators]]
+
+
+
+
+
+
+
+ + +
[[admin/manage/admins-mods:global-moderators]]
+
+
+
+
+
+
+ [[admin/manage/admins-mods:no-global-moderators]]
+
+
+
+ + + +
+
+ [[admin/manage/admins-mods:moderators-of-category, {categories.name}]]
+
+
+
+
+
+
+ [[admin/manage/admins-mods:no-moderators]]
+
+
+ + +
-
-
diff --git a/src/views/admin/manage/privileges.tpl b/src/views/admin/manage/privileges.tpl
new file mode 100644
index 0000000000..42d8be735e
--- /dev/null
+++ b/src/views/admin/manage/privileges.tpl
@@ -0,0 +1,31 @@
+- [[admin/manage/categories:privileges.description]] -
-- [[admin/manage/categories:privileges.warning]] -
--
-
-
-
+
+
diff --git a/src/views/admin/manage/tags.tpl b/src/views/admin/manage/tags.tpl
index 8fa01a1200..56c1c5b8c7 100644
--- a/src/views/admin/manage/tags.tpl
+++ b/src/views/admin/manage/tags.tpl
@@ -41,6 +41,7 @@
[[admin/manage/tags:description]]
+ @@ -74,4 +75,11 @@ + + diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl index 3eca4f998d..1490c8b1c4 100644 --- a/src/views/admin/manage/users.tpl +++ b/src/views/admin/manage/users.tpl @@ -8,9 +8,6 @@-
-
- [[admin/manage/users:make-admin]] -
- [[admin/manage/users:remove-admin]] -
- [[admin/manage/users:validate-email]]
- [[admin/manage/users:send-validation-email]]
- [[admin/manage/users:password-reset-email]] @@ -50,7 +47,7 @@
-
+
diff --git a/src/views/admin/partials/global/privileges.tpl b/src/views/admin/partials/global/privileges.tpl new file mode 100644 index 0000000000..6a792eb7ee --- /dev/null +++ b/src/views/admin/partials/global/privileges.tpl @@ -0,0 +1,86 @@ +
+
+
+
+
+
+
+
diff --git a/test/categories.js b/test/categories.js
index 4bb66b49af..90198f91b4 100644
--- a/test/categories.js
+++ b/test/categories.js
@@ -638,7 +638,7 @@ describe('Categories', function () {
});
});
- it('should load user privileges', function (done) {
+ it('should load category user privileges', function (done) {
privileges.categories.userPrivileges(categoryObj.cid, 1, function (err, data) {
assert.ifError(err);
assert.deepEqual(data, {
@@ -651,8 +651,8 @@ describe('Categories', function () {
'topics:tag': false,
'topics:delete': false,
'posts:edit': false,
- 'upload:post:file': false,
- 'upload:post:image': false,
+ 'posts:upvote': false,
+ 'posts:downvote': false,
purge: false,
moderate: false,
});
@@ -661,12 +661,27 @@ describe('Categories', function () {
});
});
- it('should load group privileges', function (done) {
+ it('should load global user privileges', function (done) {
+ privileges.global.userPrivileges(1, function (err, data) {
+ assert.ifError(err);
+ assert.deepEqual(data, {
+ chat: false,
+ 'upload:post:image': false,
+ 'upload:post:file': false,
+ });
+
+ done();
+ });
+ });
+
+ it('should load category group privileges', function (done) {
privileges.categories.groupPrivileges(categoryObj.cid, 'registered-users', function (err, data) {
assert.ifError(err);
assert.deepEqual(data, {
'groups:find': true,
'groups:posts:edit': true,
+ 'groups:posts:upvote': true,
+ 'groups:posts:downvote': true,
'groups:topics:delete': false,
'groups:topics:create': true,
'groups:topics:reply': true,
@@ -674,8 +689,6 @@ 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,
});
@@ -684,6 +697,19 @@ describe('Categories', function () {
});
});
+ it('should load global group privileges', function (done) {
+ privileges.global.groupPrivileges('registered-users', function (err, data) {
+ assert.ifError(err);
+ assert.deepEqual(data, {
+ 'groups:chat': true,
+ 'groups:upload:post:image': true,
+ 'groups:upload:post:file': false,
+ });
+
+ done();
+ });
+ });
+
it('should return false if cid is falsy', function (done) {
privileges.categories.isUserAllowedTo('find', null, adminUid, function (err, isAllowed) {
assert.ifError(err);
diff --git a/test/controllers-admin.js b/test/controllers-admin.js
index 7639a0df4f..a04167d2f0 100644
--- a/test/controllers-admin.js
+++ b/test/controllers-admin.js
@@ -255,6 +255,14 @@ describe('Admin Controllers', function () {
});
});
+ it('should load /admin/manage/admins-mods', function (done) {
+ request(nconf.get('url') + '/api/admin/manage/admins-mods', { jar: jar, json: true }, function (err, res, body) {
+ assert.ifError(err);
+ assert(body);
+ done();
+ });
+ });
+
it('should return 403 if no referer', function (done) {
request(nconf.get('url') + '/api/admin/users/csv', { jar: jar }, function (err, res, body) {
assert.ifError(err);
@@ -583,21 +591,21 @@ describe('Admin Controllers', function () {
it('should error with not enough reputation to flag', function (done) {
var socketFlags = require('../src/socket.io/flags');
- var oldValue = meta.config['privileges:flag'];
- meta.config['privileges:flag'] = 1000;
+ var oldValue = meta.config['min:rep:flag'];
+ meta.config['min:rep:flag'] = 1000;
socketFlags.create({ uid: regularUid }, { id: pid, type: 'post', reason: 'spam' }, function (err) {
assert.equal(err.message, '[[error:not-enough-reputation-to-flag]]');
- meta.config['privileges:flag'] = oldValue;
+ meta.config['min:rep:flag'] = oldValue;
done();
});
});
it('should return flag details', function (done) {
var socketFlags = require('../src/socket.io/flags');
- var oldValue = meta.config['privileges:flag'];
- meta.config['privileges:flag'] = 0;
+ var oldValue = meta.config['min:rep:flag'];
+ meta.config['min:rep:flag'] = 0;
socketFlags.create({ uid: regularUid }, { id: pid, type: 'post', reason: 'spam' }, function (err, data) {
- meta.config['privileges:flag'] = oldValue;
+ meta.config['min:rep:flag'] = oldValue;
assert.ifError(err);
request(nconf.get('url') + '/api/flags/' + data.flagId, { jar: moderatorJar, json: true }, function (err, res, body) {
assert.ifError(err);
diff --git a/test/database/keys.js b/test/database/keys.js
index 03d607d808..cdd8cc9ab4 100644
--- a/test/database/keys.js
+++ b/test/database/keys.js
@@ -149,6 +149,21 @@ describe('Key methods', function () {
done();
});
});
+
+ it('should set then increment a key', function (done) {
+ db.set('myIncrement', 1, function (err) {
+ assert.ifError(err);
+ db.increment('myIncrement', function (err, value) {
+ assert.ifError(err);
+ assert.equal(value, 2);
+ db.get('myIncrement', function (err, value) {
+ assert.ifError(err);
+ assert.equal(value, 2);
+ done();
+ });
+ });
+ });
+ });
});
describe('rename', function () {
diff --git a/test/emailer.js b/test/emailer.js
index 8c0a525ed2..40a41e6a3d 100644
--- a/test/emailer.js
+++ b/test/emailer.js
@@ -112,6 +112,7 @@ describe('emailer', function () {
Meta.configs.setMultiple({
'email:smtpTransport:enabled': '1',
'email:smtpTransport:user': username,
+ 'email:smtpTransport:pass': 'anything',
'email:smtpTransport:service': 'nodebb-custom-smtp',
'email:smtpTransport:port': 4000,
'email:smtpTransport:host': 'localhost',
diff --git a/test/flags.js b/test/flags.js
index bead3bed0c..6dbcd5e08c 100644
--- a/test/flags.js
+++ b/test/flags.js
@@ -364,7 +364,7 @@ describe('Flags', function () {
});
it('should not pass validation if flag threshold is set and user rep does not meet it', function (done) {
- Meta.configs.set('privileges:flag', '50', function (err) {
+ Meta.configs.set('min:rep:flag', '50', function (err) {
assert.ifError(err);
Flags.validate({
@@ -374,7 +374,7 @@ describe('Flags', function () {
}, function (err) {
assert.ok(err);
assert.strictEqual('[[error:not-enough-reputation-to-flag]]', err.message);
- Meta.configs.set('privileges:flag', 0, done);
+ Meta.configs.set('min:rep:flag', 0, done);
});
});
});
diff --git a/test/groups.js b/test/groups.js
index 311e4ab93b..7c305e1e13 100644
--- a/test/groups.js
+++ b/test/groups.js
@@ -71,9 +71,9 @@ describe('Groups', function () {
describe('.list()', function () {
it('should list the groups present', function (done) {
- Groups.getGroupsFromSet('groups:createtime', 0, 0, -1, function (err, groups) {
+ Groups.getGroupsFromSet('groups:visible:createtime', 0, 0, -1, function (err, groups) {
assert.ifError(err);
- assert.equal(groups.length, 7);
+ assert.equal(groups.length, 4);
done();
});
});
diff --git a/test/messaging.js b/test/messaging.js
index 0253fbf6b0..761500e7e4 100644
--- a/test/messaging.js
+++ b/test/messaging.js
@@ -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();
});
});
@@ -579,11 +579,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();
});
});
diff --git a/test/mocks/databasemock.js b/test/mocks/databasemock.js
index 96eada54b2..5314894543 100644
--- a/test/mocks/databasemock.js
+++ b/test/mocks/databasemock.js
@@ -154,6 +154,9 @@ function setupMockDefaults(callback) {
winston.info('test_database flushed');
setupDefaultConfigs(meta, next);
},
+ function (next) {
+ giveDefaultGlobalPrivileges(next);
+ },
function (next) {
meta.configs.init(next);
},
@@ -182,6 +185,11 @@ function setupDefaultConfigs(meta, next) {
meta.configs.setOnEmpty(defaults, next);
}
+function giveDefaultGlobalPrivileges(next) {
+ var privileges = require('../../src/privileges');
+ privileges.global.give(['chat', 'upload:post:image'], 'registered-users', next);
+}
+
function enableDefaultPlugins(callback) {
winston.info('Enabling default plugins\n');
diff --git a/test/posts.js b/test/posts.js
index 3643454148..84114d0a91 100644
--- a/test/posts.js
+++ b/test/posts.js
@@ -72,6 +72,22 @@ describe('Post\'s', function () {
});
describe('voting', function () {
+ it('should fail to upvote post if group does not have upvote permission', function (done) {
+ privileges.categories.rescind(['posts:upvote', 'posts:downvote'], cid, 'registered-users', function (err) {
+ assert.ifError(err);
+ socketPosts.upvote({ uid: voterUid }, { pid: postData.pid, room_id: 'topic_1' }, function (err) {
+ assert.equal(err.message, '[[error:no-privileges]]');
+ socketPosts.downvote({ uid: voterUid }, { pid: postData.pid, room_id: 'topic_1' }, function (err) {
+ assert.equal(err.message, '[[error:no-privileges]]');
+ privileges.categories.give(['posts:upvote', 'posts:downvote'], cid, 'registered-users', function (err) {
+ assert.ifError(err);
+ done();
+ });
+ });
+ });
+ });
+ });
+
it('should upvote a post', function (done) {
socketPosts.upvote({ uid: voterUid }, { pid: postData.pid, room_id: 'topic_1' }, function (err, result) {
assert.ifError(err);
diff --git a/test/template-helpers.js b/test/template-helpers.js
index 8ada13f29e..73198d03fe 100644
--- a/test/template-helpers.js
+++ b/test/template-helpers.js
@@ -87,7 +87,7 @@ describe('helpers', function () {
],
};
var html = helpers.generateChildrenCategories(category);
- assert.equal(html, 'children ');
+ assert.equal(html, '+
diff --git a/src/views/admin/partials/global/privileges.tpl b/src/views/admin/partials/global/privileges.tpl new file mode 100644 index 0000000000..6a792eb7ee --- /dev/null +++ b/src/views/admin/partials/global/privileges.tpl @@ -0,0 +1,86 @@ +
| + | ||
|---|---|---|
| [[admin/manage/categories:privileges.section-user]] | + +{privileges.labels.users.name} | + +|
|
+
+ {../icon:text}
+
+ |
+ {privileges.users.username} | + {function.spawnPrivilegeStates, privileges.users.username, ../privileges} +|
| + + | +||
| + [[admin/manage/privileges:global.no-users]] + + | +||
| + | ||
|---|---|---|
| [[admin/manage/categories:privileges.section-group]] | + +{privileges.labels.groups.name} | + +|
| + + + + {privileges.groups.name} + | ++ {function.spawnPrivilegeStates, privileges.groups.name, ../privileges} + | |
| + + | +||
+ [[admin/manage/categories:privileges.inherit]]
+
diff --git a/src/views/admin/partials/menu.tpl b/src/views/admin/partials/menu.tpl
index 9fd4742c3c..87d9bfeecb 100644
--- a/src/views/admin/partials/menu.tpl
+++ b/src/views/admin/partials/menu.tpl
@@ -15,7 +15,9 @@
[[admin/menu:section-manage]]
children');
done();
});
diff --git a/test/topics.js b/test/topics.js
index f4d91ad763..559eaab973 100644
--- a/test/topics.js
+++ b/test/topics.js
@@ -1274,9 +1274,9 @@ describe('Topic\'s', function () {
assert.equal(data.matchCount, 3);
assert.equal(data.pageCount, 1);
var tagData = [
- { value: 'nodebb', color: '', bgColor: '', score: 3 },
- { value: 'nodejs', color: '', bgColor: '', score: 1 },
- { value: 'nosql', color: '', bgColor: '', score: 1 },
+ { value: 'nodebb', valueEscaped: 'nodebb', color: '', bgColor: '', score: 3 },
+ { value: 'nodejs', valueEscaped: 'nodejs', color: '', bgColor: '', score: 1 },
+ { value: 'nosql', valueEscaped: 'nosql', color: '', bgColor: '', score: 1 },
];
assert.deepEqual(data.tags, tagData);
@@ -1350,22 +1350,22 @@ describe('Topic\'s', function () {
});
});
- it('should error if data.tag is invalid', function (done) {
+ it('should error if data is not an array', function (done) {
socketAdmin.tags.update({ uid: adminUid }, {
bgColor: '#ff0000',
color: '#00ff00',
}, function (err) {
- assert.equal(err.message, '[[error:invalid-tag]]');
+ assert.equal(err.message, '[[error:invalid-data]]');
done();
});
});
it('should update tag', function (done) {
- socketAdmin.tags.update({ uid: adminUid }, {
- tag: 'emptytag',
+ socketAdmin.tags.update({ uid: adminUid }, [{
+ value: 'emptytag',
bgColor: '#ff0000',
color: '#00ff00',
- }, function (err) {
+ }], function (err) {
assert.ifError(err);
db.getObject('tag:emptytag', function (err, data) {
assert.ifError(err);
@@ -1376,6 +1376,35 @@ describe('Topic\'s', function () {
});
});
+ it('should rename tags', function (done) {
+ async.parallel({
+ topic1: function (next) {
+ topics.post({ uid: adminUid, tags: ['plugins'], title: 'topic tagged with plugins', content: 'topic 1 content', cid: topic.categoryId }, next);
+ },
+ topic2: function (next) {
+ topics.post({ uid: adminUid, tags: ['plugin'], title: 'topic tagged with plugin', content: 'topic 2 content', cid: topic.categoryId }, next);
+ },
+ }, function (err, result) {
+ assert.ifError(err);
+ socketAdmin.tags.rename({ uid: adminUid }, [{
+ value: 'plugin',
+ newName: 'plugins',
+ }], function (err) {
+ assert.ifError(err);
+ topics.getTagTids('plugins', 0, -1, function (err, tids) {
+ assert.ifError(err);
+ assert.equal(tids.length, 2);
+ topics.getTopicTags(result.topic2.topicData.tid, function (err, tags) {
+ assert.ifError(err);
+ assert.equal(tags.length, 1);
+ assert.equal(tags[0], 'plugins');
+ done();
+ });
+ });
+ });
+ });
+ });
+
it('should return related topics', function (done) {
var meta = require('../src/meta');
meta.config.maximumRelatedTopics = 2;
diff --git a/test/translator.js b/test/translator.js
index 62aa2dcea1..413002b2aa 100644
--- a/test/translator.js
+++ b/test/translator.js
@@ -114,6 +114,15 @@ describe('new Translator(language)', function () {
});
});
+ it('should not unescape html in parameters', function () {
+ var translator = Translator.create('en-GB');
+
+ var key = '[[pages:tag, some&tag]]';
+ return translator.translate(key).then(function (translated) {
+ assert.strictEqual(translated, 'Topics tagged under "some&tag"');
+ });
+ });
+
it('should properly escape and ignore % and \\, in arguments', function () {
var translator = Translator.create('en-GB');
diff --git a/test/uploads.js b/test/uploads.js
index 8d76f21baf..7533553cf8 100644
--- a/test/uploads.js
+++ b/test/uploads.js
@@ -62,7 +62,7 @@ describe('Upload Controllers', function () {
assert.ifError(err);
jar = _jar;
csrf_token = _csrf_token;
- privileges.categories.give(['upload:post:file'], cid, 'registered-users', done);
+ privileges.global.give(['upload:post:file'], 'registered-users', done);
});
});
@@ -77,17 +77,8 @@ describe('Upload Controllers', function () {
});
});
- it('should fail to upload an image to a post with invalid cid', function (done) {
- helpers.uploadFile(nconf.get('url') + '/api/post/upload', path.join(__dirname, '../test/files/test.png'), { cid: '0' }, jar, csrf_token, function (err, res, body) {
- assert.ifError(err);
- assert.equal(res.statusCode, 500);
- assert.equal(body.error, '[[error:category-not-selected]]');
- done();
- });
- });
-
it('should upload an image to a post', function (done) {
- helpers.uploadFile(nconf.get('url') + '/api/post/upload', path.join(__dirname, '../test/files/test.png'), { cid: cid }, jar, csrf_token, function (err, res, body) {
+ helpers.uploadFile(nconf.get('url') + '/api/post/upload', path.join(__dirname, '../test/files/test.png'), {}, jar, csrf_token, function (err, res, body) {
assert.ifError(err);
assert.equal(res.statusCode, 200);
assert(Array.isArray(body));
@@ -100,7 +91,7 @@ describe('Upload Controllers', function () {
it('should resize and upload an image to a post', function (done) {
var oldValue = meta.config.maximumImageWidth;
meta.config.maximumImageWidth = 10;
- helpers.uploadFile(nconf.get('url') + '/api/post/upload', path.join(__dirname, '../test/files/test.png'), { cid: cid }, jar, csrf_token, function (err, res, body) {
+ helpers.uploadFile(nconf.get('url') + '/api/post/upload', path.join(__dirname, '../test/files/test.png'), {}, jar, csrf_token, function (err, res, body) {
assert.ifError(err);
assert.equal(res.statusCode, 200);
assert(Array.isArray(body));
@@ -116,7 +107,7 @@ describe('Upload Controllers', function () {
meta.config.allowFileUploads = 1;
var oldValue = meta.config.allowedFileExtensions;
meta.config.allowedFileExtensions = 'png,jpg,bmp,html';
- helpers.uploadFile(nconf.get('url') + '/api/post/upload', path.join(__dirname, '../test/files/503.html'), { cid: cid }, jar, csrf_token, function (err, res, body) {
+ helpers.uploadFile(nconf.get('url') + '/api/post/upload', path.join(__dirname, '../test/files/503.html'), {}, jar, csrf_token, function (err, res, body) {
meta.config.allowedFileExtensions = oldValue;
assert.ifError(err);
assert.equal(res.statusCode, 200);
diff --git a/test/user.js b/test/user.js
index 9a098f4708..8de7491761 100644
--- a/test/user.js
+++ b/test/user.js
@@ -471,6 +471,40 @@ describe('User', function () {
});
});
});
+
+ it('.commit() should invalidate old codes', function (done) {
+ var code1;
+ var code2;
+ var uid;
+ async.waterfall([
+ function (next) {
+ User.create({ username: 'doublereseter', email: 'sorry@forgot.com', password: '123456' }, next);
+ },
+ function (_uid, next) {
+ uid = _uid;
+ User.reset.generate(uid, next);
+ },
+ function (code, next) {
+ code1 = code;
+ User.reset.generate(uid, next);
+ },
+ function (code, next) {
+ code2 = code;
+ User.reset.validate(code1, next);
+ },
+ function (isValid, next) {
+ assert(isValid);
+ User.reset.commit(code2, 'newPwd123', next);
+ },
+ function (next) {
+ User.reset.validate(code1, next);
+ },
+ function (isValid, next) {
+ assert(!isValid);
+ next();
+ },
+ ], done);
+ });
});
describe('hash methods', function () {