diff options
| author | diosmosis <benakamoorthi@fastmail.fm> | 2014-03-10 02:15:46 +0400 |
|---|---|---|
| committer | diosmosis <benakamoorthi@fastmail.fm> | 2014-03-10 02:47:33 +0400 |
| commit | 3d6b51fd6735e0e7306b15cfc1712b7e75dd2623 (patch) | |
| tree | 6e437a370fa59bc2c4ed8f2eac8d8aef2f40357d /tests/PHPUnit/travis.sh | |
| parent | e3313951b25b44c0ac6582fa33d6da0d0ddbe1ba (diff) | |
Allow travis.sh file packaged w/ piwik to execute UI tests.
Diffstat (limited to 'tests/PHPUnit/travis.sh')
| -rwxr-xr-x | tests/PHPUnit/travis.sh | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/tests/PHPUnit/travis.sh b/tests/PHPUnit/travis.sh index c255b255a8..124991376b 100755 --- a/tests/PHPUnit/travis.sh +++ b/tests/PHPUnit/travis.sh @@ -13,22 +13,18 @@ else then touch ../javascript/enable_sqlite phantomjs ../javascript/testrunner.js - else - phpunit --configuration phpunit.xml --testsuite $TEST_SUITE --colors - fi - else - if [ -n "$TEST_DIR" ] - then - if [ "$TEST_DIR" = "UI" ] + elif [ "$TEST_SUITE" = "UITests" ] then echo "" echo "View UI failures (if any) here http://builds-artifacts.piwik.org/ui-tests.master/$TRAVIS_JOB_NUMBER/screenshot-diffs/diffviewer.html" echo "If the new screenshots are valid, then you can copy them over to tests/PHPUnit/UI/expected-ui-screenshots/." echo "" - fi - phpunit --colors $TEST_DIR - else + phantomjs ../lib/screenshot-testing/run-tests.js --store-in-ui-tests-repo --use-github-expected "$PLUGIN_NAME" + else + phpunit --configuration phpunit.xml --testsuite $TEST_SUITE --colors + fi + else phpunit --configuration phpunit.xml --coverage-text --colors fi fi |