Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-22 16:30:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

more test fixes

Browse Source
This commit is contained in:
barisusakli
2016-10-16 21:51:42 +03:00
parent 15d948894d
commit 1a63672e66
11 changed files with 65 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/database/mongo/sorted.js
View File

@@ -19,7 +19,7 @@ module.exports = function (db, module) {
db.collection('objects').update({_key: key, value: value}, {$set: {score: parseInt(score, 10)}}, {upsert:true, w: 1}, function (err) {
if (err && err.message.startsWith('E11000 duplicate key error')) {
return module.sortedSetAdd(key, score, value, callback);
return process.nextTick(module.sortedSetAdd, key, score, value, callback);
}
callback(err);
});
@@ -572,7 +572,7 @@ module.exports = function (db, module) {
// https://jira.mongodb.org/browse/SERVER-14322
// https://docs.mongodb.org/manual/reference/command/findAndModify/#upsert-and-unique-index
if (err && err.message.startsWith('E11000 duplicate key error')) {
return module.sortedSetIncrBy(key, increment, value, callback);
return process.nextTick(module.sortedSetIncrBy, key, increment, value, callback);
}
callback(err, result && result.value ? result.value.score : null);
});

8
src/routes/index.js
View File

@@ -1,6 +1,7 @@
"use strict";
var nconf = require('nconf');
var winston = require('winston');
var path = require('path');
var async = require('async');
var controllers = require('../controllers');
@@ -157,5 +158,10 @@ module.exports = function (app, middleware, hotswapIds) {
async.apply(plugins.reloadRoutes),
async.apply(authRoutes.reloadRoutes),
async.apply(user.addInterstitials)
]);
], function (err) {
if (err) {
return winston.error(err);
}
winston.info('Routes added');
});
};

6
src/socket.io/index.js
View File

@@ -1,12 +1,10 @@
"use strict";
var SocketIO = require('socket.io');
var socketioWildcard = require('socketio-wildcard')();
var async = require('async');
var nconf = require('nconf');
var cookieParser = require('cookie-parser')(nconf.get('secret'));
var winston = require('winston');
var url = require('url');
var cookieParser = require('cookie-parser')(nconf.get('secret'));
var db = require('../database');
var logger = require('../logger');
@@ -19,6 +17,8 @@ var ratelimit = require('../middleware/ratelimit');
Sockets.init = function (server) {
requireModules();
var SocketIO = require('socket.io');
var socketioWildcard = require('socketio-wildcard')();
io = new SocketIO({
path: nconf.get('relative_path') + '/socket.io'
});

25
src/webserver.js
View File

@@ -65,6 +65,7 @@ module.exports.listen = function (callback) {
emitter.all(['templates:compiled', 'meta:js.compiled', 'meta:css.compiled'], function () {
winston.info('NodeBB Ready');
emitter.emit('nodebb:ready');
listen(callback);
});
@@ -100,6 +101,19 @@ function initializeNodeBB(callback) {
},
async.apply(plugins.fireHook, 'static:assets.prepare', {}),
async.apply(meta.js.bridgeModules, app),
function (next) {
plugins.fireHook('static:app.preload', {
app: app,
middleware: middleware
}, next);
},
function (next) {
plugins.fireHook('filter:hotswap.prepare', [], next);
},
function (hotswapIds, next) {
routes(app, middleware, hotswapIds);
next();
},
function (next) {
async.series([
async.apply(meta.templates.compile),
@@ -110,17 +124,6 @@ function initializeNodeBB(callback) {
async.apply(languages.init),
async.apply(meta.blacklist.load)
], next);
},
function (results, next) {
plugins.fireHook('static:app.preload', {
app: app,
middleware: middleware
}, next);
},
async.apply(plugins.fireHook, 'filter:hotswap.prepare', []),
function (hotswapIds, next) {
routes(app, middleware, hotswapIds);
next();
}
], callback);
}

18
test/authentication.js
View File

@@ -2,21 +2,17 @@
/*global require, before*/
var assert = require('assert');
var async = require('async');
var nconf = require('nconf');
var request = require('request');
var db = require('./mocks/databasemock');
var user = require('../src/user');
describe('authentication', function () {
var jar = request.jar();
before(function (done) {
request({
url: nconf.get('url') + '/api/config',
json: true,
jar: jar
}, function (err, response, body) {
user.create({username: 'regular', password: 'regularpwd', email: 'regular@nodebb.org' }, function (err) {
assert.ifError(err);
done();
});
@@ -54,7 +50,7 @@ describe('authentication', function () {
assert(body);
assert.equal(body.username, 'admin');
assert.equal(body.email, 'admin@nodebb.org');
done()
done();
});
});
});
@@ -102,8 +98,8 @@ describe('authentication', function () {
request.post(nconf.get('url') + '/login', {
form: {
username: 'admin',
password: 'adminpwd',
username: 'regular',
password: 'regularpwd',
},
json: true,
jar: jar,
@@ -121,8 +117,8 @@ describe('authentication', function () {
}, function (err, response, body) {
assert.ifError(err);
assert(body);
assert.equal(body.username, 'admin');
assert.equal(body.email, 'admin@nodebb.org');
assert.equal(body.username, 'regular');
assert.equal(body.email, 'regular@nodebb.org');
done()
});
});

14
test/messaging.js
View File

@@ -1,13 +1,13 @@
'use strict';
/*global require, before, after*/
var assert = require('assert'),
db = require('./mocks/databasemock'),
async = require('async'),
User = require('../src/user'),
Groups = require('../src/groups'),
Messaging = require('../src/messaging'),
testUids;
var assert = require('assert');
var db = require('./mocks/databasemock');
var async = require('async');
var User = require('../src/user');
var Groups = require('../src/groups');
var Messaging = require('../src/messaging');
var testUids;
describe('Messaging Library', function () {
before(function (done) {

4
test/mocks/databasemock.js
View File

@@ -12,7 +12,6 @@
var path = require('path');
var nconf = require('nconf');
var url = require('url');
var winston = require('winston');
var errorText;
@@ -82,10 +81,10 @@
winston.info(testDbConfig);
var db = require('../../src/database');
var meta = require('../../src/meta');
before(function (done) {
this.timeout(30000);
var meta;
async.waterfall([
function (next) {
db.init(next);
@@ -95,6 +94,7 @@
},
function (next) {
winston.info('test_database flushed');
meta = require('../../src/meta');
meta.configs.init(next);
},
function (next) {

1
test/plugins.js
View File

@@ -17,7 +17,6 @@ describe('Plugins', function () {
assert(plugins.libraries[pluginId]);
assert(plugins.loadedHooks['static:app.load']);
assert(plugins.staticDirs['nodebb-plugin-markdown/js']);
assert.notEqual(plugins.lessFiles.indexOf('nodebb-plugin-markdown/public/less/default.less'), -1);
done();
});

4
test/socket.io.js
View File

@@ -19,11 +19,10 @@ var groups = require('../src/groups');
describe('socket.io', function () {
var adminUid;
var io;
before(function (done) {
async.parallel([
async.series([
async.apply(user.create, { username: 'admin', password: 'adminpwd' }),
async.apply(user.create, { username: 'regular', password: 'regularpwd' })
], function (err, uids) {
@@ -31,7 +30,6 @@ describe('socket.io', function () {
return done(err);
}
adminUid = uids[0];
groups.join('administrators', uids[0], done);
});
});

22
test/user.js
View File

@@ -3,20 +3,20 @@
var winston = require('winston');
var assert = require('assert'),
async = require('async'),
db = require('./mocks/databasemock');
var assert = require('assert');
var async = require('async');
var db = require('./mocks/databasemock');
var User = require('../src/user'),
Topics = require('../src/topics'),
Categories = require('../src/categories'),
Meta = require('../src/meta'),
Password = require('../src/password');
var User = require('../src/user');
var Topics = require('../src/topics');
var Categories = require('../src/categories');
var Meta = require('../src/meta');
var Password = require('../src/password');
describe('User', function () {
var userData,
testUid,
testCid;
var userData;
var testUid;
var testCid;
before(function (done) {
var groups = require('../src/groups');