Skip to content

Commit

Permalink
Move Behat dependencies to own composer.json
Browse files Browse the repository at this point in the history
  • Loading branch information
MKodde committed Mar 26, 2024
1 parent a9db1bb commit 86ff65c
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 937 deletions.
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/config/openconext/samlstepupproviders_parameters.yaml
/config/openconext/global_view_parameters.yaml
/vendor/
/tests/vendor/
/composer.phar
/cache.properties
.idea/
Expand All @@ -26,7 +27,3 @@ npm-debug.log
yarn-error.log
/app/
/web/

###> friends-of-behat/symfony-extension ###
/behat.yml
###< friends-of-behat/symfony-extension ###
3 changes: 2 additions & 1 deletion ci/docker/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
docker compose up gateway selenium haproxy ssp mariadb -d

docker-compose exec -T gateway bash -c '
composer install --prefer-dist -n -o --no-scripts && \
cd tests && composer install --prefer-dist -n -o --no-scripts && \
cd ../ && composer install --prefer-dist -n -o --no-scripts && \
composer frontend-install && \
./bin/console assets:install --env=smoketest --verbose && \
./bin/console cache:clear --env=smoketest && \
Expand Down
2 changes: 1 addition & 1 deletion ci/qa/behat
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

cd $(dirname $0)/../../

./vendor/bin/behat --config=ci/qa/behat.yml --format=progress --tags=~@selenium $1
./tests/vendor/bin/behat --config=ci/qa/behat.yml --format=progress --tags=~@selenium $1
2 changes: 1 addition & 1 deletion ci/qa/behat-selenium
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

cd $(dirname $0)/../../

./vendor/bin/behat --config=ci/qa/behat.yml --format=progress --tags=selenium
./tests/vendor/bin/behat --config=ci/qa/behat.yml --format=progress --tags=selenium
13 changes: 1 addition & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
"description": "The SURFnet Step-up Gateway sits between a SAML Service Provider and Identity Provider and can provide a certain Level of Assurance by performing second-factor authentication.",
"autoload": {
"psr-4": {
"Surfnet\\": "src\\Surfnet",
"Surfnet\\StepupGateway\\Behat\\": [
"tests/features/bootstrap",
"tests/src"
]
"Surfnet\\": "src\\Surfnet"
},
"classmap": [
"src/Kernel.php"
Expand Down Expand Up @@ -53,12 +49,6 @@
"webmozart/assert": "^1.2"
},
"require-dev": {
"behat/behat": "^3.6",
"behat/mink": "^1.9",
"behat/mink-browserkit-driver": "^2.1",
"behat/mink-selenium2-driver": "^1.7",
"friends-of-behat/symfony-extension": "^2.4",
"friends-of-behat/mink-extension": "^2.7",
"malukenho/docheader": "^0.1.8 || ^1.0.0",
"matthiasnoback/symfony-config-test": "^4",
"mockery/mockery": "^1.0",
Expand All @@ -72,7 +62,6 @@
"sebastian/exporter": "^4.0",
"sebastian/phpcpd": "^6.0",
"squizlabs/php_codesniffer": "^3.4",
"symfony/browser-kit": "6.4.*",
"symfony/phpunit-bridge": "^3.0",
"symfony/web-profiler-bundle": "6.4.*"
},
Expand Down
Loading

0 comments on commit 86ff65c

Please sign in to comment.