diff --git a/.travis.yml b/.travis.yml index 0831b71bfe..8af21d531f 100755 --- a/.travis.yml +++ b/.travis.yml @@ -34,15 +34,10 @@ before_script: - ./vendor/bin/codecept build - APP_ENV=travis-ci php artisan serve --port=8007 & - sleep 5 - - php artisan env # omitting "script:" will default to phpunit # use the $DB env variable to determine the phpunit.xml to use script: ./vendor/bin/codecept run --env travis-ci -vvv -#script: phpunit - -after_failure: - - cat tests/_output/WelcomeCept.fail.html # configure notifications (email, IRC, campfire etc) notifications: diff --git a/bootstrap/start.php b/bootstrap/start.php index 65f9be0335..73f0609bb3 100755 --- a/bootstrap/start.php +++ b/bootstrap/start.php @@ -23,18 +23,12 @@ | given environment, then we will automatically detect it for you. | */ -// if (isset($_SERVER[ 'APP_ENV' ]) && $_SERVER[ 'APP_ENV' ] == 'travis-ci') { -// $env = $app->detectEnvironment(function() { -// return 'travis-ci'; -// }); -// } else { $env = $app->detectEnvironment( [ 'local' => [ 'homestead', 'AlisonMBP' ], 'travis-ci' => getenv('APP_ENV') == 'travis-ci', 'staging' => [ 'stagingweb01' ], 'production' => [ 'www.yourserver.com' ] ] ); -// } /* |--------------------------------------------------------------------------