Skip to content

Commit

Permalink
Move behat to vendor-bin
Browse files Browse the repository at this point in the history
  • Loading branch information
phil-davis committed Jan 22, 2019
1 parent 161f1c4 commit 5e61259
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 412 deletions.
13 changes: 10 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ RELEASE_CHANNEL=git
# internal aliases
composer_deps=lib/composer
composer_dev_deps=lib/composer/phpunit
acceptance_test_deps=vendor-bin/behat/vendor
nodejs_deps=build/node_modules
core_vendor=core/vendor

Expand Down Expand Up @@ -191,15 +192,15 @@ test-js-debug: $(nodejs_deps)
NODE_PATH='$(NODE_PREFIX)/node_modules' $(KARMA) start tests/karma.config.js

.PHONY: test-acceptance-api
test-acceptance-api: $(composer_dev_deps)
test-acceptance-api: $(acceptance_test_deps)
./tests/acceptance/run.sh --remote --type api

.PHONY: test-acceptance-cli
test-acceptance-cli: $(composer_dev_deps)
test-acceptance-cli: $(acceptance_test_deps)
./tests/acceptance/run.sh --remote --type cli

.PHONY: test-acceptance-webui
test-acceptance-webui: $(composer_dev_deps)
test-acceptance-webui: $(acceptance_test_deps)
./tests/acceptance/run.sh --remote --type webUI

.PHONY: test-php-style
Expand Down Expand Up @@ -386,3 +387,9 @@ vendor-bin/phpstan/vendor: vendor/bamarni/composer-bin-plugin vendor-bin/phpstan

vendor-bin/phpstan/composer.lock: vendor-bin/phpstan/composer.json
@echo phpstan composer.lock is not up to date.

vendor-bin/behat/vendor: vendor/bamarni/composer-bin-plugin vendor-bin/behat/composer.lock
composer bin behat install --no-progress

vendor-bin/behat/composer.lock: vendor-bin/behat/composer.json
@echo behat composer.lock is not up to date.
9 changes: 1 addition & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,10 @@
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.2",
"behat/behat": "^3.0",
"behat/mink-extension": "^2.2",
"behat/mink-goutte-driver": "^1.2",
"behat/mink-selenium2-driver": "dev-master",
"jakub-onderka/php-console-highlighter": "^0.4",
"jarnaiz/behat-junit-formatter": "^1.3",
"mikey179/vfsStream": "^1.6",
"phpunit/phpunit": "^5.7",
"rdx/behat-variables": "^1.2",
"roave/security-advisories": "dev-master",
"sensiolabs/behat-page-object-extension": "^2.0"
"roave/security-advisories": "dev-master"
},
"require": {
"php": ">=5.6",
Expand Down
Loading

0 comments on commit 5e61259

Please sign in to comment.