From c9f38699d206a9086e60ac53a589c0eb3ada2172 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 22 Feb 2016 21:58:16 +0200 Subject: [PATCH] Updated Travis config --- .travis.yml | 4 ++-- app/Libraries/Utils.php | 2 +- tests/_bootstrap.php.default | 2 +- tests/acceptance.suite.yml | 2 +- tests/functional.suite.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index bcfe155094b8..c7dd08d994c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,13 +54,13 @@ before_script: - php artisan db:seed --no-interaction # default seed - php artisan db:seed --no-interaction --class=UserTableSeeder # development seed # Start webserver on ninja.dev:8000 - - php artisan serve --host=ninja.dev & # '&' allows to run in background + - php artisan serve --host=ninja.dev --port=8000 & # '&' allows to run in background # Start PhantomJS - 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/update + - curl -L http://ninja.dev:8000/update script: - php ./vendor/codeception/codeception/codecept run --debug acceptance AllPagesCept.php diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php index 340cfdfeba48..027f512a47df 100644 --- a/app/Libraries/Utils.php +++ b/app/Libraries/Utils.php @@ -72,7 +72,7 @@ class Utils public static function requireHTTPS() { - if (Request::root() === 'http://ninja.dev') { + if (Request::root() === 'http://ninja.dev:8000') { return false; } diff --git a/tests/_bootstrap.php.default b/tests/_bootstrap.php.default index 2f520aacb010..33ecdcb60782 100644 --- a/tests/_bootstrap.php.default +++ b/tests/_bootstrap.php.default @@ -2,7 +2,7 @@ // This is global bootstrap for autoloading use Codeception\Util\Fixtures; -Fixtures::add('url', 'http://ninja.dev'); +Fixtures::add('url', 'http://ninja.dev:8000'); Fixtures::add('username', 'user@example.com'); Fixtures::add('password', 'password'); diff --git a/tests/acceptance.suite.yml b/tests/acceptance.suite.yml index 293645697bef..05dcbc71eca7 100644 --- a/tests/acceptance.suite.yml +++ b/tests/acceptance.suite.yml @@ -8,7 +8,7 @@ class_name: AcceptanceTester modules: enabled: - WebDriver: - url: 'http://ninja.dev/' + url: 'http://ninja.dev:8000/' window_size: 1024x768 wait: 5 browser: firefox diff --git a/tests/functional.suite.yml b/tests/functional.suite.yml index 7c84b1000840..b89e2023daba 100644 --- a/tests/functional.suite.yml +++ b/tests/functional.suite.yml @@ -9,7 +9,7 @@ modules: enabled: - \Helper\Functional - PhpBrowser: - url: 'http://ninja.dev' + url: 'http://ninja.dev:8000' curl: CURLOPT_RETURNTRANSFER: true - Laravel5: