From 44c638ea54598f6c052cd2376f7f1e92b4718dc2 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 18 Feb 2016 10:50:35 +0200 Subject: [PATCH] Working on TravisCI --- .travis.yml | 2 -- tests/acceptance.suite.yml | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 494d94d0a276..07aa6d10b7dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,8 +56,6 @@ before_script: - phantomjs --webdriver=4444 & # '&' allows to run in background # Give it some time to start - sleep 5 - # Make sure the app is up-to-date - #- curl -L http://ninja.dev:8000/update script: - php ./vendor/codeception/codeception/codecept run --html --debug diff --git a/tests/acceptance.suite.yml b/tests/acceptance.suite.yml index 4a152dce6eff..a6c8033296cc 100644 --- a/tests/acceptance.suite.yml +++ b/tests/acceptance.suite.yml @@ -12,7 +12,8 @@ modules: host: 127.0.0.1 window_size: 1024x768 wait: 5 - browser: phantomjs + browser: firefox + http_proxy: direct capabilities: unexpectedAlertBehaviour: 'accept' webStorageEnabled: true