diff --git a/.travis.yml b/.travis.yml index 8673531..aad900e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_script: 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 after_success: - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi diff --git a/phpunit.xml.dist b/phpunit.xml.dist index dd8fb7b..f148411 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests diff --git a/tests/WidgetControllerTest/TestPageController.php b/tests/WidgetControllerTest/TestPageController.php index 7fe3788..e41d916 100644 --- a/tests/WidgetControllerTest/TestPageController.php +++ b/tests/WidgetControllerTest/TestPageController.php @@ -19,12 +19,7 @@ class TestPageController extends PageController implements TestOnly */ public function getViewer($action) { - if (file_exists('widgets')) { - SSViewer::add_themes(['silverstripe/widgets:tests/WidgetControllerTest']); - } else { - // When installed as the root project, e.g. Travis - SSViewer::add_themes(['tests/WidgetControllerTest']); - } + SSViewer::add_themes(['silverstripe/widgets:/tests/WidgetControllerTest']); return new SSViewer(TestPage::class); } }