Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-27 17:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Julian Lam
2017-02-25 21:43:50 -05:00
parent 15542f1382 0e7740af32
commit b1ceec7571
23 changed files with 3096 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/socket.io.js
View File

@@ -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);
});
});