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

.travis.yml

@@ -1,10 +1,10 @@
 services:
   - redis-server
 before_install:
-  - "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10"
+  - "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6"
-  - "echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list"
+  - "echo 'deb [ arch=amd64 ] http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.4 multiverse' | sudo tee /etc/apt/sources.list.d/mongodb-org-3.4.list"
   - "sudo apt-get update"
-  - "sudo apt-get install mongodb-org-server"
+  - "sudo apt-get install -y mongodb-org"
   - "sudo service mongod start"
 before_script:
   - sleep 15 # wait for mongodb to be ready

app.js

@@ -219,14 +219,13 @@ function upgrade() {
 	var meta = require('./src/meta');
 	var upgrade = require('./src/upgrade');
 	var build = require('./src/meta/build');
-	var tasks = [db.init, meta.configs.init, upgrade.run, build.buildAll];
+	var tasks = [db.init, meta.configs.init];
 
 	if (nconf.get('upgrade') !== true) {
 		// Likely an upgrade script name passed in
-		tasks[2] = async.apply(upgrade.runSingle, nconf.get('upgrade'));
+		tasks.push(async.apply(upgrade.runParticular, nconf.get('upgrade').split(',')));
-
+	} else {
-		// Skip build
+		tasks.push(upgrade.run, build.buildAll);
-		tasks.pop();
 	}
 	// disable mongo timeouts during upgrade
 	nconf.set('mongo:options:socketTimeoutMS', 0);

package.json

@@ -109,9 +109,7 @@
     "istanbul": "^0.4.5",
     "jsdom": "^11.3.0",
     "mocha": "^3.5.3",
-    "mocha-lcov-reporter": "^1.3.0",
+    "mocha-lcov-reporter": "^1.3.0"
-    "xmlhttprequest": "1.8.0",
-    "xmlhttprequest-ssl": "1.5.3"
   },
   "bugs": {
     "url": "https://github.com/NodeBB/NodeBB/issues"

src/upgrade.js

@@ -87,23 +87,19 @@ Upgrade.run = function (callback) {
 	});
 };
 
-Upgrade.runSingle = function (query, callback) {
+Upgrade.runParticular = function (names, callback) {
 	process.stdout.write('\nParsing upgrade scripts... ');
 
 	async.waterfall([
 		async.apply(file.walk, path.join(__dirname, './upgrades')),
 		function (files, next) {
-			next(null, files.filter(function (file) {
+			var upgrades = files.filter(function (file) {
-				return path.basename(file, '.js') === query;
+				return names.indexOf(path.basename(file, '.js')) !== -1;
-			}));
+			});
-		},
-	], function (err, files) {
-		if (err) {
-			return callback(err);
-		}
 
-		Upgrade.process(files, 0, callback);
+			Upgrade.process(upgrades, 0, next);
-	});
+		},
+	], callback);
 };
 
 Upgrade.process = function (files, skipCount, callback) {

test/helpers/index.js

@@ -5,7 +5,6 @@ var nconf = require('nconf');
 var fs = require('fs');
 var winston = require('winston');
 
-var myXhr = require('../mocks/newXhr');
 var utils = require('../../public/src/utils');
 
 var helpers = module.exports;
@@ -66,28 +65,22 @@ helpers.logoutUser = function (jar, callback) {
 };
 
 helpers.connectSocketIO = function (res, callback) {
-	myXhr.callbacks.headerCallback = function () {
+	var io = require('socket.io-client');
-		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'), {
+	var cookie = res.headers['set-cookie'][0].split(';')[0];
+	var socket = io(nconf.get('base_url'), {
 		path: nconf.get('relative_path') + '/socket.io',
-		forceNew: true,
+		extraHeaders: {
-		multiplex: false,
+			Origin: nconf.get('url'),
+			Cookie: cookie,
+		},
 	});
-	io.on('connect', function () {
+
-		callback(null, io);
+	socket.on('connect', function () {
+		callback(null, socket);
 	});
 
-	io.on('error', function (err) {
+	socket.on('error', function (err) {
 		callback(err);
 	});
 };

test/mocks/newXhr.js

@@ -1,50 +0,0 @@
-'use strict';
-
-// see https://gist.github.com/jfromaniello/4087861#gistcomment-1447029
-// XMLHttpRequest to override.
-
-var npm2Path = '../../node_modules/socket.io-client/node_modules/engine.io-client/node_modules/xmlhttprequest-ssl';
-var npm3Path = '../../node_modules/xmlhttprequest-ssl';
-var filePath;
-var winston = require('winston');
-
-// Make initial call to require so module is cached.
-try {
-	require(npm2Path);
-	filePath = require.resolve(npm2Path);
-} catch (err) {
-	if (err) {
-		winston.info('Couldn\'t find ' + npm2Path);
-	}
-	try {
-		require(npm3Path);
-		filePath = require.resolve(npm3Path);
-	} catch (err) {
-		if (err) {
-			winston.info('Couldn\'t find ' + npm3Path);
-		}
-	}
-}
-
-winston.info('xmlhttprequest-ssl path: ' + filePath);
-// Get cached version.
-var cachedXhr = require.cache[filePath];
-var stdXhr = cachedXhr.exports;
-
-// Callbacks exposes an object that callback functions can be added to.
-var callbacks = {};
-
-var newXhr = function () {
-	stdXhr.apply(this, arguments);
-	for (var method in callbacks) {
-		if (typeof callbacks[method] === 'function') {
-			callbacks[method].apply(this, arguments);
-		}
-	}
-};
-
-newXhr.XMLHttpRequest = newXhr;
-
-cachedXhr.exports = newXhr;
-module.exports = newXhr;
-module.exports.callbacks = callbacks;