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

fix tests for subfolder installs

Browse Source
This commit is contained in:
barisusakli
2017-02-25 16:04:04 +03:00
parent 347761173a
commit 0e7740af32
7 changed files with 47 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
test/helpers/index.js
View File

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