Separate unit-tests from browser tests

Author: evilaliv3

.travis.yml

@@ -1,6 +1,4 @@
 language: node_js
-node_js:
-  - "4.2"
 sudo: false
 cache:
   directories:
@@ -9,13 +7,19 @@ env:
   global:
   - SAUCE_USERNAME=flowjs
   - SAUCE_ACCESS_KEY=53e609a9-cb5d-4eac-a888-aa5419836f19
-addons:
-  sauce_connect: true
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-  - npm install --quiet -g grunt-cli karma
-  - npm install
+matrix:
+  fast_finish: true
+  include:
+    - env: TEST='unit-tests'
+      node_js: "4.2"
+    - env: TEST='browser-tests'
+      node_js: "4.2"
+      addons:
+        sauce_connect: true
+  allow_failures:
+    - env: TEST='unit-tests'
+    - env: TEST='browser-tests'
+before_install: npm install -g grunt-cli
+install: npm install
 script:
-  - grunt karma:coverage
-  - grunt karma:saucelabs || true
+  - $TRAVIS_BUILD_DIR/travis.sh

karma.conf.js

@@ -59,15 +59,16 @@ module.exports = function(config) {
       base: 'SauceLabs',
       browserName: 'iPhone',
       platform: 'OS X 10.10',
-      deviceName: "iPad Simulator",
+      deviceName: 'iPad Simulator',
       version: '7.1'
     },
     sl_iphone_2: {
       base: 'SauceLabs',
       browserName: 'iPhone',
       platform: 'OS X 10.10',
-      deviceName: "iPad Simulator",
-      version: '9.1'
+      deviceName: 'iPad Simulator',
+      deviceOrientation: 'portrait',
+      version: '9.2'
     },
     sl_safari_1: {
       base: 'SauceLabs',
@@ -130,7 +131,7 @@ module.exports = function(config) {
 
     // Continuous Integration mode
     // if true, it capture browsers, run tests and exit
-    singleRun: false,
+    singleRun: true,
 
     customLaunchers: customLaunchers,
 

travis.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+if [ $TEST = "unit-tests" ]; then
+
+  echo "Running unit-tests"
+  export DISPLAY=:99.0
+  sh -e /etc/init.d/xvfb start
+  sleep 1
+  grunt karma:coverage
+
+elif [[ $TEST = "browser-tests" ]]; then
+
+  echo "Running browser-tests"
+  grunt karma:saucelabs
+
+fi