+
+
+
+
@@ -53,11 +57,15 @@
+
+
+
+
@@ -207,19 +215,25 @@
+
+
+
+
+
+
@@ -287,6 +301,7 @@
+
@@ -319,6 +334,7 @@
+
@@ -335,6 +351,7 @@
+
@@ -358,8 +375,12 @@
+
+
+
+
@@ -397,6 +418,7 @@
+
@@ -429,8 +451,10 @@
+
+
@@ -495,6 +519,7 @@
+
@@ -504,10 +529,12 @@
+
+
@@ -534,6 +561,7 @@
+
@@ -558,6 +586,7 @@
+
@@ -574,6 +603,7 @@
+
@@ -619,6 +649,7 @@
+
@@ -628,6 +659,7 @@
+
@@ -637,6 +669,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -646,6 +689,8 @@
+
+
@@ -686,11 +731,16 @@
+
+
+
+
+
@@ -715,10 +765,16 @@
+
+
+
+
+
+
diff --git a/src/webserver.js b/src/webserver.js
index d816a861a2..4ce61b1c2e 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -79,7 +79,6 @@ module.exports.listen = function (callback) {
};
function initializeNodeBB(callback) {
- winston.info('initializing NodeBB ...');
var middleware = require('./middleware');
async.waterfall([
diff --git a/test/helpers/index.js b/test/helpers/index.js
index 30aab3c11f..2c37f85500 100644
--- a/test/helpers/index.js
+++ b/test/helpers/index.js
@@ -34,64 +34,56 @@ helpers.loginUser = function (username, password, callback) {
if (err || res.statusCode !== 200) {
return callback(err || new Error('[[error:invalid-response]]'));
}
- myXhr.callbacks.test2 = function () {
- this.setDisableHeaderCheck(true);
- var stdOpen = this.open;
- this.open = function () {
- stdOpen.apply(this, arguments);
- this.setRequestHeader('Cookie', res.headers['set-cookie'][0].split(';')[0]);
- this.setRequestHeader('Origin', nconf.get('url'));
- };
- };
-
- var socketClient = require('socket.io-client');
-
- var io = socketClient.connect(nconf.get('url'), { forceNew: true, multiplex: false });
- io.on('connect', function () {
- callback(null, jar, io, body.csrf_token);
- });
-
- io.on('error', function (err) {
- callback(err);
+ helpers.connectSocketIO(res, function (err, io) {
+ callback(err, jar, io, body.csrf_token);
});
});
});
};
+helpers.connectSocketIO = function (res, callback) {
+ myXhr.callbacks.headerCallback = function () {
+ this.setDisableHeaderCheck(true);
+ var stdOpen = this.open;
+ this.open = function () {
+ stdOpen.apply(this, arguments);
+ this.setRequestHeader('Cookie', res.headers['set-cookie'][0].split(';')[0]);
+ this.setRequestHeader('Origin', nconf.get('url'));
+ };
+ };
+
+ var socketClient = require('socket.io-client');
+
+ var io = socketClient.connect(nconf.get('base_url'), {
+ path: nconf.get('relative_path') + '/socket.io',
+ forceNew: true,
+ multiplex: false,
+ });
+ io.on('connect', function () {
+ callback(null, io);
+ });
+
+ io.on('error', function (err) {
+ callback(err);
+ });
+};
+
helpers.initSocketIO = function (callback) {
var jar;
request.get({
url: nconf.get('url') + '/api/config',
jar: jar,
json: true,
- }, function (err, res, body) {
+ }, function (err, res) {
if (err) {
return callback(err);
}
-
- myXhr.callbacks.test2 = function () {
- this.setDisableHeaderCheck(true);
- var stdOpen = this.open;
- this.open = function () {
- stdOpen.apply(this, arguments);
- this.setRequestHeader('Cookie', res.headers['set-cookie'][0].split(';')[0]);
- this.setRequestHeader('Origin', nconf.get('url'));
- };
- };
-
- var io = require('socket.io-client')(nconf.get('url'), { forceNew: true });
-
- io.on('connect', function () {
- callback(null, jar, io);
- });
-
- io.on('error', function (err) {
- callback(err);
+ helpers.connectSocketIO(res, function (err, io) {
+ callback(err, jar, io);
});
});
};
-
helpers.uploadFile = function (uploadEndPoint, filePath, body, jar, csrf_token, callback) {
var formData = {
files: [
@@ -134,12 +126,8 @@ helpers.registerUser = function (data, callback) {
headers: {
'x-csrf-token': body.csrf_token,
},
- }, function (err, res, body) {
- if (err) {
- return callback(err);
- }
-
- callback(null, jar);
+ }, function (err) {
+ callback(err, jar);
});
});
};
diff --git a/test/socket.io.js b/test/socket.io.js
index 575983a18a..6c935657ac 100644
--- a/test/socket.io.js
+++ b/test/socket.io.js
@@ -12,11 +12,10 @@ var request = require('request');
var cookies = request.jar();
var db = require('./mocks/databasemock');
-var myXhr = require('./mocks/newXhr');
var user = require('../src/user');
var groups = require('../src/groups');
var categories = require('../src/categories');
-
+var helpers = require('./helpers');
describe('socket.io', function () {
var io;
@@ -64,26 +63,12 @@ describe('socket.io', function () {
'x-csrf-token': body.csrf_token,
},
json: true,
- }, function (err, res, body) {
+ }, function (err, res) {
assert.ifError(err);
- myXhr.callbacks.test2 = function () {
- this.setDisableHeaderCheck(true);
- var stdOpen = this.open;
- this.open = function () {
- stdOpen.apply(this, arguments);
- this.setRequestHeader('Cookie', res.headers['set-cookie'][0].split(';')[0]);
- this.setRequestHeader('Origin', nconf.get('url'));
- };
- };
-
- io = require('socket.io-client')(nconf.get('url'), { forceNew: true });
-
- io.on('connect', function () {
- done();
- });
-
- io.on('error', function (err) {
+ helpers.connectSocketIO(res, function (err, _io) {
+ io = _io;
+ assert.ifError(err);
done(err);
});
});
diff --git a/test/template-helpers.js b/test/template-helpers.js
index b5921b81c9..eb145e98a8 100644
--- a/test/template-helpers.js
+++ b/test/template-helpers.js
@@ -1,6 +1,6 @@
'use strict';
-var async = require('async');
+var nconf = require('nconf');
var assert = require('assert');
var db = require('./mocks/databasemock');
@@ -13,7 +13,6 @@ describe('helpers', function () {
done();
});
-
it('should return false if route is /users and privateUserInfo is on and user is not logged in', function (done) {
var flag = helpers.displayMenuItem({
navigation: [{ route: '/users' }],
@@ -49,4 +48,186 @@ describe('helpers', function () {
assert.equal(str, 'gdkfhgk < some > and &');
done();
});
+
+ it('should return empty string if category is falsy', function (done) {
+ assert.equal(helpers.generateCategoryBackground(null), '');
+ done();
+ });
+
+ it('should generate category background', function (done) {
+ var category = {
+ bgColor: '#ff0000',
+ color: '#00ff00',
+ backgroundImage: '/assets/uploads/image.png',
+ imageClass: 'auto',
+ };
+ var bg = helpers.generateCategoryBackground(category);
+ assert.equal(bg, 'background-color: #ff0000; color: #00ff00; background-image: url(/assets/uploads/image.png); background-size: auto;');
+ done();
+ });
+
+ it('should return empty string if category has no children', function (done) {
+ var category = {
+ children: [],
+ };
+ var bg = helpers.generateChildrenCategories(category);
+ assert.equal(bg, '');
+ done();
+ });
+
+ it('should generate html for children', function (done) {
+ var category = {
+ children: [
+ {
+ link: '',
+ bgColor: '#ff0000',
+ color: '#00ff00',
+ name: 'children',
+ },
+ ],
+ };
+ var html = helpers.generateChildrenCategories(category);
+ assert.equal(html, '
children ');
+ done();
+ });
+
+ it('should generate topic class', function (done) {
+ var className = helpers.generateTopicClass({ locked: true, pinned: true, deleted: true, unread: true });
+ assert.equal(className, 'locked pinned deleted unread');
+ done();
+ });
+
+ it('should show leave button if isMember and group is not administrators', function (done) {
+ var btn = helpers.membershipBtn({ displayName: 'some group', name: 'some group', isMember: true });
+ assert.equal(btn, '
');
+ done();
+ });
+
+ it('should show pending button if isPending and group is not administrators', function (done) {
+ var btn = helpers.membershipBtn({ displayName: 'some group', name: 'some group', isPending: true });
+ assert.equal(btn, '
');
+ done();
+ });
+
+ it('should show reject invite button if isInvited', function (done) {
+ var btn = helpers.membershipBtn({ displayName: 'some group', name: 'some group', isInvited: true });
+ assert.equal(btn, '
');
+ done();
+ });
+
+ it('should show join button if join requests are not disabled and group is not administrators', function (done) {
+ var btn = helpers.membershipBtn({ displayName: 'some group', name: 'some group', disableJoinRequests: false });
+ assert.equal(btn, '
');
+ done();
+ });
+
+ it('should show nothing if group is administrators ', function (done) {
+ var btn = helpers.membershipBtn({ displayName: 'administrators', name: 'administrators' });
+ assert.equal(btn, '');
+ done();
+ });
+
+ it('should spawn privilege states', function (done) {
+ var privs = {
+ find: true,
+ read: true,
+ };
+ var html = helpers.spawnPrivilegeStates('guests', privs);
+ assert.equal(html, '
| | ');
+ done();
+ });
+
+ it('should spawn privilege states', function (done) {
+ var privs = {
+ find: true,
+ read: true,
+ };
+ var html = helpers.spawnPrivilegeStates('guests', privs);
+ assert.equal(html, '
| | ');
+ done();
+ });
+
+ it('should render thumb as topic image', function (done) {
+ var topicObj = { thumb: '/uploads/1.png', user: { username: 'baris' } };
+ var html = helpers.renderTopicImage(topicObj);
+ assert.equal(html, '
');
+ done();
+ });
+
+ it('should render user picture as topic image', function (done) {
+ var topicObj = { thumb: '', user: { uid: 1, username: 'baris', picture: '/uploads/2.png' } };
+ var html = helpers.renderTopicImage(topicObj);
+ assert.equal(html, '
');
+ done();
+ });
+
+ it('should render digest avatar', function (done) {
+ var block = { teaser: { user: { username: 'baris', picture: '/uploads/1.png' } } };
+ var html = helpers.renderDigestAvatar(block);
+ assert.equal(html, '
');
+ done();
+ });
+
+ it('should render digest avatar', function (done) {
+ var block = { teaser: { user: { username: 'baris', 'icon:text': 'B', 'icon:bgColor': '#ff000' } } };
+ var html = helpers.renderDigestAvatar(block);
+ assert.equal(html, '
' + block.teaser.user['icon:text'] + '
');
+ done();
+ });
+
+ it('should render digest avatar', function (done) {
+ var block = { user: { username: 'baris', picture: '/uploads/1.png' } };
+ var html = helpers.renderDigestAvatar(block);
+ assert.equal(html, '
');
+ done();
+ });
+
+ it('should render digest avatar', function (done) {
+ var block = { user: { username: 'baris', 'icon:text': 'B', 'icon:bgColor': '#ff000' } };
+ var html = helpers.renderDigestAvatar(block);
+ assert.equal(html, '
' + block.user['icon:text'] + '
');
+ done();
+ });
+
+ it('shoud render user agent/browser icons', function (done) {
+ var html = helpers.userAgentIcons({ platform: 'Linux', browser: 'Chrome' });
+ assert.equal(html, '
');
+ done();
+ });
+
+ it('shoud render user agent/browser icons', function (done) {
+ var html = helpers.userAgentIcons({ platform: 'Microsoft Windows', browser: 'Firefox' });
+ assert.equal(html, '
');
+ done();
+ });
+
+ it('shoud render user agent/browser icons', function (done) {
+ var html = helpers.userAgentIcons({ platform: 'Apple Mac', browser: 'Safari' });
+ assert.equal(html, '
');
+ done();
+ });
+
+ it('shoud render user agent/browser icons', function (done) {
+ var html = helpers.userAgentIcons({ platform: 'Android', browser: 'IE' });
+ assert.equal(html, '
');
+ done();
+ });
+
+ it('shoud render user agent/browser icons', function (done) {
+ var html = helpers.userAgentIcons({ platform: 'iPad', browser: 'Edge' });
+ assert.equal(html, '
');
+ done();
+ });
+
+ it('shoud render user agent/browser icons', function (done) {
+ var html = helpers.userAgentIcons({ platform: 'iPhone', browser: 'unknow' });
+ assert.equal(html, '
');
+ done();
+ });
+
+ it('shoud render user agent/browser icons', function (done) {
+ var html = helpers.userAgentIcons({ platform: 'unknow', browser: 'unknown' });
+ assert.equal(html, '
');
+ done();
+ });
});
diff --git a/test/uploads.js b/test/uploads.js
index 0c4ca8d1d6..624b1c25b7 100644
--- a/test/uploads.js
+++ b/test/uploads.js
@@ -71,7 +71,7 @@ describe('Upload Controllers', function () {
assert.equal(res.statusCode, 200);
assert(Array.isArray(body));
assert.equal(body.length, 1);
- assert.equal(body[0].url, '/assets/uploads/profile/' + regularUid + '-profileavatar.png');
+ assert.equal(body[0].url, nconf.get('relative_path') + '/assets/uploads/profile/' + regularUid + '-profileavatar.png');
done();
});
});
@@ -165,7 +165,7 @@ describe('Upload Controllers', function () {
assert.ifError(err);
assert.equal(res.statusCode, 200);
assert(Array.isArray(body));
- assert.equal(body[0].url, '/assets/uploads/system/site-logo.png');
+ assert.equal(body[0].url, nconf.get('relative_path') + '/assets/uploads/system/site-logo.png');
done();
});
});
@@ -175,7 +175,7 @@ describe('Upload Controllers', function () {
assert.ifError(err);
assert.equal(res.statusCode, 200);
assert(Array.isArray(body));
- assert.equal(body[0].url, '/assets/uploads/category/category-1.png');
+ assert.equal(body[0].url, nconf.get('relative_path') + '/assets/uploads/category/category-1.png');
done();
});
});
diff --git a/test/user.js b/test/user.js
index 00794b3d0e..468ab9b0b4 100644
--- a/test/user.js
+++ b/test/user.js
@@ -522,7 +522,7 @@ describe('User', function () {
};
User.uploadPicture(uid, picture, function (err, uploadedPicture) {
assert.ifError(err);
- assert.equal(uploadedPicture.url, '/assets/uploads/profile/' + uid + '-profileavatar.png');
+ assert.equal(uploadedPicture.url, nconf.get('relative_path') + '/assets/uploads/profile/' + uid + '-profileavatar.png');
assert.equal(uploadedPicture.path, path.join(nconf.get('base_dir'), 'public', 'uploads', 'profile', uid + '-profileavatar.png'));
done();
});