tonyair/silverstripe-widgets
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-widgets synced 2024-10-22 17:05:54 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #155 from creative-commoners/pulls/vendorise-ci

Browse Source 
FIX convert CI bootstrap references to new their new locations in vendor
This commit is contained in:
Robbie Averill 2017-10-05 16:02:05 +13:00 committed by GitHub
commit 3f02a0b295
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -25,7 +25,7 @@ before_script:
script: script:
- if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; 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: after_success:
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi

2
phpunit.xml.dist
View File

@ -1,4 +1,4 @@
<phpunit bootstrap="cms/tests/bootstrap.php" colors="true"> <phpunit bootstrap="vendor/silverstripe/cms/tests/bootstrap.php" colors="true">
<testsuite name="Default"> <testsuite name="Default">
<directory>tests</directory> <directory>tests</directory>
</testsuite> </testsuite>

7
tests/WidgetControllerTest/TestPageController.php
View File

@ -19,12 +19,7 @@ class TestPageController extends PageController implements TestOnly
*/ */
public function getViewer($action) public function getViewer($action)
{ {
if (file_exists('widgets')) { SSViewer::add_themes(['silverstripe/widgets:/tests/WidgetControllerTest']);
SSViewer::add_themes(['silverstripe/widgets:tests/WidgetControllerTest']);
} else {
// When installed as the root project, e.g. Travis
SSViewer::add_themes(['tests/WidgetControllerTest']);
}
return new SSViewer(TestPage::class); return new SSViewer(TestPage::class);
} }
} }