EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2413 from NoelDeMartin/MOBILE-3294 

Mobile 3294
main
Juan Leyva 2020-06-17 10:09:16 +02:00 committed by GitHub
parent 9803794eba 7795e4921b
commit e81d40f07e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -43,11 +43,11 @@ jobs:
os: linux
script: npm run build --bailOnLintError true --typeCheckOnLint true
- stage: mirror
if: branch IN (master, integration, desktop) AND repo = moodlehq/moodleapp
if: branch IN (master, integration, desktop) AND repo = moodlehq/moodleapp AND type != cron
os: linux
script: scripts/mirror.sh
- stage: prepare
if: branch =~ /(master|^integration)$/ AND env(PREPARE) IS NOT blank AND env(PREPARE) = 1
if: branch =~ /(master|^integration)$/ AND env(PREPARE) IS NOT blank AND env(PREPARE) = 1 AND type != cron
os: linux
script: scripts/aot.sh
- stage: build
@ -109,17 +109,17 @@ jobs:
name: "End to end tests (mod_forum, mod_messages and mod_comments)"
services:
- docker
if: env(TRAVIS_EVENT_TYPE) = cron
if: type = cron
script: scripts/test_e2e.sh "@app&&@mod_forum" "@app&&@mod_messages" "@app&&@mod_comments"
- stage: test
name: "End to end tests (mod_data, mod_survey, mod_course, core_course and mod_courses)"
services:
- docker
if: env(TRAVIS_EVENT_TYPE) = cron
if: type = cron
script: scripts/test_e2e.sh "@app&&@mod_data" "@app&&@mod_survey" "@app&&@mod_course" "@app&&@core_course" "@app&&@mod_courses"
- stage: test
name: "End to end tests (others)"
services:
- docker
if: env(TRAVIS_EVENT_TYPE) = cron
if: type = cron
script: scripts/test_e2e.sh "@app&&~@mod_forum&&~@mod_messages&&~@mod_comments&&~@mod_data&&~@mod_survey&&~@mod_course&&~@core_course&&~@mod_courses"

6
scripts/test_e2e.sh
View File

@ -41,14 +41,16 @@ $dockercompose pull
$dockercompose up -d
$dockerscripts/moodle-docker-wait-for-db
$dockerscripts/moodle-docker-wait-for-app
$dockercompose exec -T webserver php admin/tool/behat/cli/init.php
$dockercompose exec -T webserver sh -c "php admin/tool/behat/cli/init.php"
notify_on_error_exit "e2e failed initializing behat"
# Run tests
for tags in "$@"
do
print_title "Running e2e tests ($tags)"
$dockercompose exec -T webserver php admin/tool/behat/cli/run.php --tags="$tags"
$dockercompose exec -T webserver sh -c "php admin/tool/behat/cli/run.php --tags=\"$tags\""
notify_on_error_exit "e2e failed on $tags"
done