merged docker-compose

.eslintignore

@@ -5,3 +5,4 @@ intl/*
 locales/*
 **/*.min.js
 **/node_modules/*
+scratch-gui/*

.travis.yml

@@ -94,8 +94,8 @@ jobs:
     - cd test/integration
     - npm install
     - cd -
-    script: npm run smoke
+    script: npm run smoke-sauce
 stages:
 - test
 - name: smoke
-  if: branch IN (travis) and type != pull_request
+  if: type != pull_request

dev-server/index.js

@@ -21,7 +21,18 @@ routes.forEach(route => {
     app.get(route.pattern, handler(route));
 });
 
-app.use(webpackDevMiddleware(compiler));
+var middlewareOptions = {};
+if (process.env.USE_DOCKER_WATCHOPTIONS) {
+    middlewareOptions = {
+        watchOptions: {
+            aggregateTimeout: 500,
+            poll: 2500,
+            ignored: ['node_modules', 'build']
+        }
+    };
+}
+
+app.use(webpackDevMiddleware(compiler, middlewareOptions));
 
 var proxyHost = process.env.FALLBACK || '';
 if (proxyHost !== '') {

docker-compose.yml

@@ -15,6 +15,7 @@ services:
     environment:
       - API_HOST=http://localhost:8491
       - FALLBACK=http://localhost:8080
+      - USE_DOCKER_WATCHOPTIONS=true
     build:
       context: ./
       dockerfile: Dockerfile

src/components/social-message/social-message.scss

@@ -13,7 +13,7 @@
 }
 
 .social-message.mod-unread {
-    background-color: lighten($ui-blue, 40);
+    background-color: $ui-blue-10percent;
 }
 
 .social-message.mod-unread .social-message-icon {

test/integration/selenium-helpers.js

@@ -3,6 +3,8 @@ const bindAll = require('lodash.bindall');
 
 const headless = process.env.SMOKE_HEADLESS || false;
 const remote = process.env.SMOKE_REMOTE || false;
+const ci = process.env.CI || false;
+const buildID = process.env.TRAVIS_BUILD_NUMBER;
 const {SAUCE_USERNAME, SAUCE_ACCESS_KEY} = process.env;
 const {By, until} = webdriver;
 
@@ -24,7 +26,13 @@ class SeleniumHelper {
     }
     buildDriver (name) {
         if (remote === 'true'){
-            this.driver = this.getSauceDriver(SAUCE_USERNAME, SAUCE_ACCESS_KEY, name);
+            let nameToUse;
+            if (ci === 'true'){
+                nameToUse = 'travis ' + buildID + ' : ' + name;
+            } else {
+                nameToUse = name;
+            }
+            this.driver = this.getSauceDriver(SAUCE_USERNAME, SAUCE_ACCESS_KEY, nameToUse);
         } else {
             this.driver = this.getDriver();
         }