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

# Conflicts:
#	.travis.yml

.scripts/start.js

@@ -9,8 +9,8 @@ var baseDir = path.resolve(__dirname, '..'),
 	srcDir = path.resolve(baseDir);
 
 var appOptions = {
-	port: 3000,
 	env: {
+		PORT: 3000,
 		ROOT_URL: 'http://localhost:3000'
 	}
 };
@@ -55,7 +55,7 @@ function startProcess(opts, callback) {
 function startApp(callback) {
 	startProcess({
 		name: 'Meteor App',
-		command: 'meteor --port ' + appOptions.port,
+		command: 'node /tmp/build-test/bundle/main.js',
 		waitForMessage: appOptions.waitForMessage,
 		options: {
 			cwd: srcDir,
@@ -79,10 +79,10 @@ function startChimp() {
 }
 
 function chimpNoMirror() {
-	appOptions.waitForMessage = 'App running at';
+	appOptions.waitForMessage = 'SERVER RUNNING';
 	startApp(function() {
 		startChimp();
 	});
 }
 
-chimpNoMirror();
+chimpNoMirror();

.travis.yml

@@ -51,11 +51,17 @@ before_script:
 - |-
   mongo --eval 'rs.initiate({_id:"rs0", members: [{"_id":1, "host":"localhost:27017"}]})'
 - npm run lint
+- travis_retry meteor build --headless /tmp/build
+- mkdir /tmp/build-test
+- tar -xf /tmp/build/Rocket.Chat.tar.gz -C /tmp/build-test/
+- cd /tmp/build-test/bundle/programs/server
+- npm install -g node-gyp node-pre-gyp
+- npm install
+- cd -
 - mongo --eval 'rs.status()'
 script:
 - npm test
 before_deploy:
-- travis_retry meteor build --headless /tmp/build
 - source ".travis/setartname.sh"
 - source ".travis/setdeploydir.sh"
 - ".travis/setupsig.sh"

tests/steps/API.js

@@ -51,7 +51,7 @@ describe('API default', () => {
 
 describe('API v1', () => {
 	before((done) => {
-		request.post(api('/login'))
+		request.post(api('login'))
 			.send(login)
 			.expect('Content-Type', 'application/json')
 			.expect(200)