From c3ba842273352ba6ec6809d64cf7a981973f4a45 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 18 Feb 2016 10:10:46 +0200
Subject: [PATCH] Working on TravisCI

---
 .travis.yml                | 4 +++-
 tests/acceptance.suite.yml | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4bdcc265fb53..5ff07dd0e3db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ before_install:
   # set GitHub token and update composer
   - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
   - composer self-update && composer -V
+  - sudo apt-get install -y phantomjs screen
 
 install:
   # install Composer dependencies
@@ -53,7 +54,8 @@ before_script:
   # Start webserver on ninja.dev:8000
   - php artisan serve --host=ninja.dev --port=8000 & # '&' allows to run in background
   # Start PhantomJS
-  - phantomjs --webdriver=4444 & # '&' allows to run in background
+  #- phantomjs --webdriver=4444 & # '&' allows to run in background
+  - screen -S server -d -m phantomjs --webdriver=4444
   # Give it some time to start
   - sleep 5
   # Make sure the app is up-to-date
diff --git a/tests/acceptance.suite.yml b/tests/acceptance.suite.yml
index e49f045e53f9..4a152dce6eff 100644
--- a/tests/acceptance.suite.yml
+++ b/tests/acceptance.suite.yml
@@ -10,10 +10,9 @@ modules:
         - WebDriver:
             url: 'http://ninja.dev:8000'
             host: 127.0.0.1
-            http_proxy: direct
             window_size: 1024x768
             wait: 5
-            browser: firefox
+            browser: phantomjs
             capabilities:
                 unexpectedAlertBehaviour: 'accept'
                 webStorageEnabled: true