Skip to content

Commit

Permalink
Merge pull request #812 from ezsystems/EZP-29419-fastest
Browse files Browse the repository at this point in the history
EZP-30098 [Travis] Implement solution for running tests in threads based on fastest
  • Loading branch information
Łukasz Serwatka committed Apr 11, 2019
2 parents 37cb561 + 1a64034 commit 6dd9e29
Show file tree
Hide file tree
Showing 9 changed files with 383 additions and 293 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -7,7 +7,7 @@ matrix:
- php: 7.1
env:
- COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/selenium.yml"
- BEHAT_OPTS="--profile=adminui --suite=adminui --no-interaction -vv"
- TEST_CMD="./bin/.travis/get_behat_features.sh adminui | bin/fastest -o -v \"bin/behat {} --suite=adminui --no-interaction -vv --strict\""
- SYMFONY_ENV=behat
- SYMFONY_DEBUG=1

Expand Down Expand Up @@ -44,8 +44,8 @@ install:
# Install packages if needed
- if [ "${PHPUNIT_CONFIG}" != '' ]; then travis_retry composer install --prefer-dist --no-interaction --no-suggest ; fi
# Prepare Behat environment if needed
- if [ "${BEHAT_OPTS}" != "" ]; then ./.travis/prepare_ezplatform.sh ; fi
- if [ "${TEST_CMD}" != "" ]; then ./.travis/prepare_ezplatform.sh ; fi

script:
- if [ "${PHPUNIT_CONFIG}" != '' ]; then ./vendor/bin/phpunit -c "${PHPUNIT_CONFIG}"; fi
- if [ "${BEHAT_OPTS}" != "" ]; then cd "$HOME/build/ezplatform"; docker-compose exec --user www-data app sh -c "./bin/behat $BEHAT_OPTS" ; fi
- if [ "${TEST_CMD}" != "" ]; then cd "$HOME/build/ezplatform"; docker-compose exec --user www-data app sh -c "${TEST_CMD}" ; fi
9 changes: 3 additions & 6 deletions behat_suites.yml
Expand Up @@ -5,11 +5,10 @@ default:
Behat\MinkExtension:
files_path: '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/src/lib/Behat/TestFiles/'

adminui:
suites:
adminui:
paths:
- '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/features'
- '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/features'
filters:
tags: "@common"
contexts:
Expand All @@ -35,10 +34,8 @@ adminui:
- EzSystems\EzPlatformAdminUi\Behat\BusinessContext\DashboardContext
- EzSystems\RepositoryForms\Behat\Context\ContentTypeContext
- EzSystems\RepositoryForms\Behat\Context\FieldTypeFormContext

adminuimodules:
suites:
default:

adminuimodules:
paths:
- '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/features'
filters:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -36,7 +36,7 @@
"fix-cs": "@php ./vendor/bin/php-cs-fixer fix -v --show-progress=estimating"
},
"extra": {
"_ezplatform_branch_for_behat_tests": "2.3",
"_ezplatform_branch_for_behat_tests": "EZP-29419-fastest",
"branch-alias": {
"dev-tmp_ci_branch": "2.3.x-dev",
"dev-master": "1.3.x-dev"
Expand Down
264 changes: 0 additions & 264 deletions features/ContentCreation.feature

This file was deleted.

0 comments on commit 6dd9e29

Please sign in to comment.