diff options
| author | Aleksander Machniak <alec@alec.pl> | 2021-07-04 11:40:22 +0300 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2021-07-04 11:40:22 +0300 |
| commit | 035407ae579c317e75cb3bb0d92588d76c3b2757 (patch) | |
| tree | dc040554d0c8e9855b02d8992261ff2ee486a32a /.github | |
| parent | c5010fcd5bcd7514810ca24b7896001275450172 (diff) | |
GA: Attempt to fix browser tests
Diffstat (limited to '.github')
| -rwxr-xr-x | .github/run.sh (renamed from .github/setup.sh) | 8 | ||||
| -rw-r--r-- | .github/workflows/browser_tests.yml | 11 |
2 files changed, 9 insertions, 10 deletions
diff --git a/.github/setup.sh b/.github/run.sh index 7a66f87f7..ab67e274c 100755 --- a/.github/setup.sh +++ b/.github/run.sh @@ -28,3 +28,11 @@ php tests/Browser/install.php $CHROMEVERSION wget https://repo1.maven.org/maven2/com/icegreen/greenmail-standalone/$GMV/greenmail-standalone-$GMV.jar \ && (sudo java $GMARGS -jar greenmail-standalone-$GMV.jar &) \ && sleep 5 + +# Run tests +echo "TESTS_MODE: DESKTOP" \ +&& TESTS_MODE=desktop vendor/bin/phpunit -c tests/Browser/phpunit.xml \ +&& echo "TESTS_MODE: PHONE" \ +&& TESTS_MODE=phone vendor/bin/phpunit -c tests/Browser/phpunit.xml \ +&& echo "TESTS_MODE: TABLET" \ +&& TESTS_MODE=tablet vendor/bin/phpunit -c tests/Browser/phpunit.xml diff --git a/.github/workflows/browser_tests.yml b/.github/workflows/browser_tests.yml index d461f7e4e..7a4f2e878 100644 --- a/.github/workflows/browser_tests.yml +++ b/.github/workflows/browser_tests.yml @@ -37,12 +37,10 @@ jobs: - name: Setup composer run: | cp composer.json-dist composer.json - composer require "kolab/net_ldap3:~1.1.1" --no-update composer require "laravel/dusk:~6.9.0" --no-update - name: Fix PHPUnit for PHP8 run: composer config platform.php 7.4 - if: matrix.php >= 8 - name: Install dependencies run: composer install --prefer-dist --no-interaction --no-progress @@ -57,11 +55,4 @@ jobs: npm install --force -g uglify-js - name: Execute tests - run: | - .github/setup.sh - && echo "TESTS_MODE: DESKTOP" - && TESTS_MODE=desktop vendor/bin/phpunit -c tests/Browser/phpunit.xml - && echo "TESTS_MODE: PHONE" - && TESTS_MODE=phone vendor/bin/phpunit -c tests/Browser/phpunit.xml - && echo "TESTS_MODE: TABLET" - && TESTS_MODE=tablet vendor/bin/phpunit -c tests/Browser/phpunit.xml + run: .github/run.sh |