-
-<<<<<<< HEAD
-
-
-=======
->>>>>>> `admin/extend` translations
{installed.id}
diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tpl index 68705951da..2d9a198ec8 100644 --- a/src/views/admin/settings/general.tpl +++ b/src/views/admin/settings/general.tpl @@ -31,8 +31,8 @@- -
+
+
@@ -140,6 +140,11 @@ [[admin/settings/general:outgoing-links.warning-page]] + +
+
+ +
diff --git a/src/views/admin/settings/group.tpl b/src/views/admin/settings/group.tpl
index 1c0b660361..fd696cb5ad 100644
--- a/src/views/admin/settings/group.tpl
+++ b/src/views/admin/settings/group.tpl
@@ -43,7 +43,7 @@
+ +
[[admin/settings/group:default-cover-help]]
-+
diff --git a/src/views/admin/settings/uploads.tpl b/src/views/admin/settings/uploads.tpl index 6c9b59db80..feff2dbff3 100644 --- a/src/views/admin/settings/uploads.tpl +++ b/src/views/admin/settings/uploads.tpl @@ -50,7 +50,7 @@
-
+
diff --git a/src/webserver.js b/src/webserver.js
index 4ce61b1c2e..7d3c6aa9a2 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -61,21 +61,20 @@ module.exports.listen = function (callback) {
logger.init(app);
- initializeNodeBB(function (err) {
- if (err) {
- return callback(err);
- }
-
- winston.info('NodeBB Ready');
+ async.waterfall([
+ initializeNodeBB,
+ function (next) {
+ winston.info('NodeBB Ready');
- require('./socket.io').server.emit('event:nodebb.ready', {
- 'cache-buster': meta.config['cache-buster'],
- });
+ require('./socket.io').server.emit('event:nodebb.ready', {
+ 'cache-buster': meta.config['cache-buster'],
+ });
- plugins.fireHook('action:nodebb.ready');
+ plugins.fireHook('action:nodebb.ready');
- listen(callback);
- });
+ listen(next);
+ },
+ ], callback);
};
function initializeNodeBB(callback) {
@@ -107,7 +106,9 @@ function initializeNodeBB(callback) {
meta.blacklist.load,
], next);
},
- ], callback);
+ ], function (err) {
+ callback(err);
+ });
}
function setupExpressApp(app) {
diff --git a/test/categories.js b/test/categories.js
index bdd91602de..8ef059d8cb 100644
--- a/test/categories.js
+++ b/test/categories.js
@@ -390,6 +390,7 @@ describe('Categories', function () {
it('should get all categories', function (done) {
socketCategories.getAll({ uid: adminUid }, {}, function (err, data) {
assert.ifError(err);
+ assert(data);
done();
});
});
@@ -615,6 +616,72 @@ describe('Categories', function () {
});
+ describe('privileges', function () {
+ var privileges = require('../src/privileges');
+
+ it('should return empty array if uids is empty array', function (done) {
+ privileges.categories.filterUids('find', categoryObj.cid, [], function (err, uids) {
+ assert.ifError(err);
+ assert.equal(uids.length, 0);
+ done();
+ });
+ });
+
+ it('should filter uids by privilege', function (done) {
+ privileges.categories.filterUids('find', categoryObj.cid, [1, 2, 3, 4], function (err, uids) {
+ assert.ifError(err);
+ assert.deepEqual(uids, [1, 2]);
+ done();
+ });
+ });
+
+ it('should load user privileges', function (done) {
+ privileges.categories.userPrivileges(categoryObj.cid, 1, function (err, data) {
+ assert.ifError(err);
+ assert.deepEqual(data, {
+ find: false,
+ mods: false,
+ 'posts:delete': false,
+ read: false,
+ 'topics:reply': false,
+ 'topics:read': false,
+ 'topics:create': false,
+ 'topics:delete': false,
+ 'posts:edit': false,
+ });
+
+ done();
+ });
+ });
+
+ it('should load 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:topics:delete': false,
+ 'groups:topics:create': true,
+ 'groups:topics:reply': true,
+ 'groups:posts:delete': true,
+ 'groups:read': true,
+ 'groups:topics:read': true,
+ });
+
+ done();
+ });
+ });
+
+ it('should return false if cid is falsy', function (done) {
+ privileges.categories.isUserAllowedTo('find', null, adminUid, function (err, isAllowed) {
+ assert.ifError(err);
+ assert.equal(isAllowed, false);
+ done();
+ });
+ });
+ });
+
+
after(function (done) {
db.emptydb(done);
});
diff --git a/test/controllers-admin.js b/test/controllers-admin.js
index ad59b4705d..5a17ca96a9 100644
--- a/test/controllers-admin.js
+++ b/test/controllers-admin.js
@@ -21,6 +21,7 @@ describe('Admin Controllers', function () {
var jar;
before(function (done) {
+ groups.resetCache();
async.series({
category: function (next) {
categories.create({
@@ -43,9 +44,10 @@ describe('Admin Controllers', function () {
cid = results.category.cid;
topics.post({ uid: adminUid, title: 'test topic title', content: 'test topic content', cid: results.category.cid }, function (err, result) {
+ assert.ifError(err);
tid = result.topicData.tid;
pid = result.postData.pid;
- done(err);
+ done();
});
});
});
diff --git a/test/controllers.js b/test/controllers.js
index d79235d16f..e86ae0c00e 100644
--- a/test/controllers.js
+++ b/test/controllers.js
@@ -27,7 +27,7 @@ describe('Controllers', function () {
}, next);
},
user: function (next) {
- user.create({ username: 'foo', password: 'barbar' }, next);
+ user.create({ username: 'foo', password: 'barbar', email: 'foo@test.com' }, next);
},
navigation: function (next) {
var navigation = require('../src/navigation/admin');
@@ -498,11 +498,23 @@ describe('Controllers', function () {
hidden: 0,
}, function (err) {
assert.ifError(err);
- request(nconf.get('url') + '/groups/group-details', function (err, res, body) {
+ groups.join('group-details', fooUid, function (err) {
assert.ifError(err);
- assert.equal(res.statusCode, 200);
- assert(body);
- done();
+ topics.post({
+ uid: fooUid,
+ title: 'topic title',
+ content: 'test topic content',
+ cid: cid,
+ }, function (err) {
+ assert.ifError(err);
+ request(nconf.get('url') + '/api/groups/group-details', { json: true }, function (err, res, body) {
+ assert.ifError(err);
+ assert.equal(res.statusCode, 200);
+ assert(body);
+ assert.equal(body.posts[0].content, 'test topic content');
+ done();
+ });
+ });
});
});
});
@@ -532,6 +544,15 @@ describe('Controllers', function () {
});
});
+ it('should get recent posts', function (done) {
+ request(nconf.get('url') + '/api/recent/posts/month', function (err, res, body) {
+ assert.ifError(err);
+ assert.equal(res.statusCode, 200);
+ assert(body);
+ done();
+ });
+ });
+
it('should get post data', function (done) {
request(nconf.get('url') + '/api/post/pid/' + pid, function (err, res, body) {
assert.ifError(err);
@@ -890,6 +911,42 @@ describe('Controllers', function () {
},
], done);
});
+
+ it('should 404 if user does not exist', function (done) {
+ request(nconf.get('url') + '/api/user/email/doesnotexist', function (err, res, body) {
+ assert.ifError(err);
+ assert.equal(res.statusCode, 404);
+ assert(body);
+ done();
+ });
+ });
+
+ it('should load user by uid', function (done) {
+ request(nconf.get('url') + '/api/user/uid/' + fooUid, function (err, res, body) {
+ assert.ifError(err);
+ assert.equal(res.statusCode, 200);
+ assert(body);
+ done();
+ });
+ });
+
+ it('should load user by username', function (done) {
+ request(nconf.get('url') + '/api/user/username/foo', function (err, res, body) {
+ assert.ifError(err);
+ assert.equal(res.statusCode, 200);
+ assert(body);
+ done();
+ });
+ });
+
+ it('should load user by email', function (done) {
+ request(nconf.get('url') + '/api/user/email/foo@test.com', function (err, res, body) {
+ assert.ifError(err);
+ assert.equal(res.statusCode, 200);
+ assert(body);
+ done();
+ });
+ });
});
describe('account follow page', function () {
@@ -943,7 +1000,7 @@ describe('Controllers', function () {
describe('post redirect', function () {
it('should 404 for invalid pid', function (done) {
- request(nconf.get('url') + '/post/fail', function (err, res) {
+ request(nconf.get('url') + '/api/post/fail', function (err, res) {
assert.ifError(err);
assert.equal(res.statusCode, 404);
done();
diff --git a/test/groups.js b/test/groups.js
index 4d587b3aad..6b52787efa 100644
--- a/test/groups.js
+++ b/test/groups.js
@@ -315,6 +315,15 @@ describe('Groups', function () {
});
});
});
+
+ it('should fail if system groups is being renamed', function (done) {
+ Groups.update('administrators', {
+ name: 'administrators_fail',
+ }, function (err) {
+ assert.equal(err.message, '[[error:not-allowed-to-rename-system-group]]');
+ done();
+ });
+ });
});
describe('.destroy()', function () {
diff --git a/test/posts.js b/test/posts.js
index 0ea8074d28..8508ab70f4 100644
--- a/test/posts.js
+++ b/test/posts.js
@@ -11,6 +11,7 @@ var categories = require('../src/categories');
var privileges = require('../src/privileges');
var user = require('../src/user');
var groups = require('../src/groups');
+var socketPosts = require('../src/socket.io/posts');
describe('Post\'s', function () {
var voterUid;
@@ -66,7 +67,6 @@ describe('Post\'s', function () {
});
describe('voting', function () {
- var socketPosts = require('../src/socket.io/posts');
it('should upvote a post', function (done) {
socketPosts.upvote({ uid: voterUid }, { pid: postData.pid, room_id: 'topic_1' }, function (err, result) {
assert.ifError(err);
@@ -138,7 +138,7 @@ describe('Post\'s', function () {
describe('bookmarking', function () {
it('should bookmark a post', function (done) {
- posts.bookmark(postData.pid, voterUid, function (err, data) {
+ socketPosts.bookmark({ uid: voterUid }, { pid: postData.pid, room_id: 'topic_' + postData.tid }, function (err, data) {
assert.ifError(err);
assert.equal(data.isBookmarked, true);
posts.hasBookmarked(postData.pid, voterUid, function (err, hasBookmarked) {
@@ -150,7 +150,7 @@ describe('Post\'s', function () {
});
it('should unbookmark a post', function (done) {
- posts.unbookmark(postData.pid, voterUid, function (err, data) {
+ socketPosts.unbookmark({ uid: voterUid }, { pid: postData.pid, room_id: 'topic_' + postData.tid }, function (err, data) {
assert.ifError(err);
assert.equal(data.isBookmarked, false);
posts.hasBookmarked([postData.pid], voterUid, function (err, hasBookmarked) {
@@ -163,8 +163,6 @@ describe('Post\'s', function () {
});
describe('post tools', function () {
- var socketPosts = require('../src/socket.io/posts');
-
it('should error if data is invalid', function (done) {
socketPosts.loadPostTools({ uid: globalModUid }, null, function (err) {
assert.equal(err.message, '[[error:invalid-data]]');
@@ -209,7 +207,6 @@ describe('Post\'s', function () {
var mainPid;
var replyPid;
- var socketPosts = require('../src/socket.io/posts');
before(function (done) {
createTopicWithReply(function (topicPostData, replyData) {
tid = topicPostData.topicData.tid;
@@ -299,7 +296,6 @@ describe('Post\'s', function () {
var pid;
var replyPid;
var tid;
- var socketPosts = require('../src/socket.io/posts');
var meta = require('../src/meta');
before(function (done) {
topics.post({
@@ -430,7 +426,6 @@ describe('Post\'s', function () {
var replyPid;
var tid;
var moveTid;
- var socketPosts = require('../src/socket.io/posts');
before(function (done) {
async.waterfall([
@@ -539,6 +534,50 @@ describe('Post\'s', function () {
});
});
+ describe('parse', function () {
+ it('should store post content in cache', function (done) {
+ var oldValue = global.env;
+ global.env = 'production';
+ var postData = {
+ pid: 9999,
+ content: 'some post content',
+ };
+ posts.parsePost(postData, function (err) {
+ assert.ifError(err);
+ posts.parsePost(postData, function (err) {
+ assert.ifError(err);
+ global.env = oldValue;
+ done();
+ });
+ });
+ });
+
+ it('should parse signature and remove links and images', function (done) {
+ var meta = require('../src/meta');
+ meta.config['signatures:disableLinks'] = 1;
+ meta.config['signatures:disableImages'] = 1;
+ var userData = {
+ signature: '[[admin/settings/uploads:allowed-file-extensions-help]]
@@ -131,7 +131,7 @@[[admin/settings/uploads:default-covers-help]]
- +