tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7096 from open-sausages/pulls/4.0/behat-greenage

Browse Source 
Temporarily restrict php-webdriver to 1.4.3
This commit is contained in:
Chris Joe 2017-06-30 13:07:18 +12:00 committed by GitHub
commit a2aaa66d70
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -69,6 +69,7 @@ before_script:
# Start behat services # Start behat services
- if [[ $BEHAT_TEST ]]; then echo 'SS_BASE_URL=http://localhost:8080/' >> .env; fi - if [[ $BEHAT_TEST ]]; then echo 'SS_BASE_URL=http://localhost:8080/' >> .env; fi
- if [[ $BEHAT_TEST ]]; then mkdir artifacts; fi - if [[ $BEHAT_TEST ]]; then mkdir artifacts; fi
- if [[ $BEHAT_TEST ]]; then cp composer.lock artifacts/; fi
- if [[ $BEHAT_TEST ]]; then sh -e /etc/init.d/xvfb start; sleep 3; fi - if [[ $BEHAT_TEST ]]; then sh -e /etc/init.d/xvfb start; sleep 3; fi
- if [[ $BEHAT_TEST ]]; then (vendor/bin/selenium-server-standalone > artifacts/selenium.log 2>&1 &); fi - if [[ $BEHAT_TEST ]]; then (vendor/bin/selenium-server-standalone > artifacts/selenium.log 2>&1 &); fi
- if [[ $BEHAT_TEST == framework ]]; then (vendor/bin/serve --bootstrap-file tests/behat/serve-bootstrap.php &> artifacts/serve.log &); fi - if [[ $BEHAT_TEST == framework ]]; then (vendor/bin/serve --bootstrap-file tests/behat/serve-bootstrap.php &> artifacts/serve.log &); fi

1
composer.json
View File

@ -30,6 +30,7 @@
"symfony/translation": "^2.8", "symfony/translation": "^2.8",
"symfony/yaml": "~3.2", "symfony/yaml": "~3.2",
"vlucas/phpdotenv": "^2.4", "vlucas/phpdotenv": "^2.4",
"instaclick/php-webdriver": "1.4.3",
"php": ">=5.6.0", "php": ">=5.6.0",
"ext-intl": "*", "ext-intl": "*",