From 3ec183826fb58c1ec90d6cbe8291fcfa29731eb4 Mon Sep 17 00:00:00 2001
From: Nuno Campos <nuno@crowdprocess.com>
Date: Sat, 4 Jun 2016 17:57:05 +0100
Subject: [PATCH] all setup for karma in the same command

---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2b2a58e1f..537ca3f13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,9 +10,7 @@ before_install:
   - 'if [ "${TRAVIS_NODE_VERSION}" != "0.6" ] && [ "${TRAVIS_NODE_VERSION}" != "0.9" ]; then npm install -g npm; fi'
 before_script:
   - "sh install-relevant-react.sh"
-  - if [ $KARMA == 1 ]; then export CHROME_BIN=chromium-browser; fi
-  - if [ $KARMA == 1 ]; then export DISPLAY=:99.0; fi
-  - if [ $KARMA == 1 ]; then sh -e /etc/init.d/xvfb start; fi
+  - if [ $KARMA == 1 ]; then export CHROME_BIN=chromium-browser; export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; fi
 script:
   - 'if [ -z "$REACT" ] && [ "${TRAVIS_NODE_VERSION}" = "4" ]; then npm run test:env -- "${EXAMPLE}" ; elif [ -z "$REACT" ]; then echo "Test Skipped" ; elif [ $KARMA == 1 ]; then npm run test:karma -- --single-run; elif [ "${TRAVIS_NODE_VERSION}" = "4" ]; then npm run lint && npm run travis ; elif [ "${TRAVIS_NODE_VERSION}" = "0.12" ]; then npm run travis ; else npm test ; fi'
 after_script: