diff --git a/.travis.yml b/.travis.yml index 839210c..1985551 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,12 +38,12 @@ before_script: - if [[ $BEHAT_TEST ]]; then mkdir artifacts; fi - if [[ $BEHAT_TEST ]]; then sh -e /etc/init.d/xvfb start; sleep 3; fi - if [[ $BEHAT_TEST ]]; then (vendor/bin/selenium-server-standalone > artifacts/selenium.log 2>&1 &); fi - - if [[ $BEHAT_TEST ]]; then (vendor/bin/serve --bootstrap-file cms/tests/behat/serve-bootstrap.php &> artifacts/serve.log &); fi + - if [[ $BEHAT_TEST ]]; then (vendor/bin/serve --bootstrap-file vendor/silverstripe/cms/tests/behat/serve-bootstrap.php &> artifacts/serve.log &); fi script: - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi - - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs --standard=framework/phpcs.xml.dist src/ tests/; fi + - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs --standard=vendor/silverstripe/framework/phpcs.xml.dist src/ tests/; fi - if [[ $BEHAT_TEST ]]; then vendor/bin/behat @contentreview; fi after_success: diff --git a/behat.yml b/behat.yml index f4dd94e..8972b55 100644 --- a/behat.yml +++ b/behat.yml @@ -24,4 +24,4 @@ default: SilverStripe\BehatExtension\Extension: screenshot_path: %paths.base%/artifacts/screenshots - bootstrap_file: "cms/tests/behat/serve-bootstrap.php" + bootstrap_file: "vendor/silverstripe/cms/tests/behat/serve-bootstrap.php" diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 110f952..965f16a 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php/