Merge branch 'develop' into karlprieb-form-elements-redesign

.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();
\ No newline at end of file
+chimpNoMirror();

.travis.yml

@@ -42,13 +42,26 @@ before_install:
 install:
 - export PATH="$HOME/.meteor:$PATH"
 before_script:
+- echo "replication:" | sudo tee -a /etc/mongod.conf
+- |-
+  echo "  replSetName: \"rs0\"" | sudo tee -a /etc/mongod.conf
+- sudo service mongod restart
 - mkdir /tmp/build
 - travis_retry npm install
+- |-
+  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"
@@ -76,6 +89,7 @@ env:
   - secure: HrPOM5sBibYkMcf9aeQThYPCDiXeLkg0Xgv0HvH88/ku/gphDpNEjHNReHZM3cyfm9y3RhHpVdD+Zzy38S2goKyewRzpXJsuyerOYkjND0v3tivhs9CAX8PAUxj1U5zllTyH4bgW2ZwRtNnwnmtIM/JJlnySMpKVDqIZBpbhn3ph9bJ2J+BW3D3Jw8meQ1vCX8szIibyJK/5QX6HG2RBFXJGYoQ8DmR8jQv0aJQvT1Az5DO4yImk8tX4NP95qOc19Jywr1DsbaSBZeJ8lFJAmBpIGx7KAmUVCcxSxfbXGRhs2K4iEYb3rJ/dU6KiyPsKGUG4aYNGgbvcX0ZxX/BZ6ZU9ff0E4IIf43IxoN3ElrOqOFk5msJAXbrJEreINSzDqKOy8NFYtCQ49E2gwzfage4ZXkhFyx3wMPa5bzpr3ncsTceMjMVz03uL781X6NLuCkUmXv+n8K2MNhJU9Xinpdx1GRJm+0lXJspNNJ1ruHeJtls4epj4bmCwKmmZbFKPXqa5e8xVcMIkwt1LMiHduhE+WgKNHdOMhXrCcTxF62ybLlsHXmyLLJeNjTeKS8QG2XSoonClDAz/1R41I1DsMPblcgz9uvYCf7UtyftbhJ83bnJeEmOYQiwijLG0+QMq+B2+mmZan3Z7Hl7O53dnwuLxz7EO7EhQhY+CqHVgc6s=
   - secure: w55v/9dmQ9wKbc+fhkZdWfaXIGi+5Qo365J0/IEZRCle2jFWUMBSzEghUuubw9Pys56uAcivOzKozT7+qozVaQW9kSgTLK4bSUSWKeSuynF7Too0CNdzt8CWgjcxGvYVWP0vlp+2eTI0x9+HJlFZn1hP+3v9C+ASH6+sqXvi24kNOPANsUvlbwIC7+T3kOdOOFzrA/tNLkXp2NGs9OaHVnvOVrZlHIn0TL8kGV1HyW4k4KLPgAcwgDq8DRWQBWk+E59HyTGXMyt/GxAJkjEebcJ/TnrbCiExbrTY+OmHjwk8Yfp9CbWsEtEYWSdLoNaFMhUrJRGGKjtansqQWktfkrN/Ro6Scl+lorQQ3eBu+ZVdmx3BXj8TRyqkhh6sqbola5XGhffp61fKxLcbYFE6Ph7g9twvFArCt2/zifmKYxH/NniCKGir5eZZnfFwTE6y2b+m37gjd7jd4t8SEcbFKH7tvOVRNm79VDqBQo0rNieCM5fPKsZkYD7sjB9G7cuZaZLAKUJf1K/FYqCeGeNV0Wcxi95nBh5usenm88xdajShxxKJedi1n77qqj03KxW7ictDnt/sEzz6vHjyf1O2pFUuPZ2eVwenpa0utDOvBTYd10OSlqlWaG/ldNJ8ofl/fawm0of4xp0rY3UNaTYdCZsPm6qfq7NIocefb/qeAJ4=
   - secure: iihMgVr2PaP9d0GXuEe3JU/eK5agWWHWDH0WFOTHQ42L1x6wT6oom3zJfwGmFL28BDVp5qQQ3V5isc0p1Vca7PCsRWUht/37EzzLbfrutLDvCpvzGqzqTkvKeW9WINYcIwEQoDE0M2I12WZN9NhGCaT5Z3WanwYX1x6AzjHX4GK/gBzX0WWOqKp7UQijLpuWpdlMUhoWKatGKi9ft+PCBgOonhoqy6Pk9QYNG+jrq86RydOP428DE2Mo5aFxPwhSoMFukOlTIPQylJ3q3q9NDHI9XhV6AJwty/CE9UXr4wAI5RAR/9q0cHkoXj7P/y7cj+SI9pZMt5EaS4DPs4MVb8vvVP+7K0VfbVc5kcoXZoUsORtxiaPk5yPeqaqpB89xp7BjQizr5fOXeTp3Xe8UiZeWvpnbvzWEUAW7XXbMLJjyKT6OLRyVmZ240aMY7zdgC/e3nNePaam1LHYJRejJGM0aFIuwDqryGN9KJMjMFOL6LHm+OBQcjfDokBLc1wjfomNXcIrWWjdNTckpDEIhAFzwgxy9OlJQBJqtpPajPrcU1bxfrnbLks0KeQj9YTSTR0D7FknhVF8OpOnDZDPWdUBJL/dGd4eIf0UIr5xW7ZdFJ0xxhGXpJuH5ITG/C8CMOFsFvUMR1EG+cY4UN8YlVcUyp/S6eJgEzJM9fyWwDgs=
+  - MONGO_OPLOG_URL: "mongodb://localhost:27017/local"
   - MONGO_URL: "mongodb://localhost:27017/meteor"
   - ADMIN_USERNAME: "admin-test"
   - ADMIN_EMAIL: "admin-test@rocket.chat"

HISTORY.md

@@ -46,7 +46,7 @@
 - Set username automaticaly
 - Support username template in CustomOAuth
 - Update momentjs to 2.17.1
-- Update slack-client to 2.0.6- 
+- Update slack-client to 2.0.6
 
 ## 0.47.1, 2016-Dec-09
 

packages/rocketchat-theme/assets/stylesheets/base.less

@@ -1358,7 +1358,7 @@ label.required:after {
 	}
 	.unread-rooms {
 		position: absolute;
-		z-index: 1000;
+		z-index: 1;
 		width: 100%;
 		text-align: center;
 		line-height: 24px;

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)