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

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

diff --git a/.travis.yml b/.travis.yml
index eabd58f6fab4..3a0e5caa6210 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: php
 
-sudo: true
+sudo: false
 
 php:
   - 5.5
@@ -27,7 +27,6 @@ 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 -y install phantomjs screen
 
 install:
   # install Composer dependencies
@@ -54,8 +53,7 @@ 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
-  - screen -S server -d m phantomjs --webdriver=4444 &
+  - phantomjs --webdriver=4444 & # '&' allows to run in background
   # Give it some time to start
   - sleep 5
   # Make sure the app is up-to-date
@@ -65,9 +63,9 @@ script:
   - php ./vendor/codeception/codeception/codecept run --html --debug
 
 after_script:
-  - cat tests/_output/*
-  - cat /var/log/apache2/access.log
-  - cat /var/log/apache2/error.log
+  #- cat tests/_output/*
+  #- cat /var/log/apache2/access.log
+  #- cat /var/log/apache2/error.log
   - cat storage/logs/laravel.log 
 
 
diff --git a/tests/acceptance.suite.yml b/tests/acceptance.suite.yml
index 34317d145566..05dcbc71eca7 100644
--- a/tests/acceptance.suite.yml
+++ b/tests/acceptance.suite.yml
@@ -8,10 +8,10 @@ class_name: AcceptanceTester
 modules:
     enabled:
         - WebDriver:
-            url: 'http://ninja.dev:8000'
+            url: 'http://ninja.dev:8000/'
             window_size: 1024x768
             wait: 5
-            browser: phantomjs
+            browser: firefox
             capabilities:
                 unexpectedAlertBehaviour: 'accept'
                 webStorageEnabled: true