Skip to content
This repository was archived by the owner on Apr 20, 2021. It is now read-only.

Commit e45284b

Browse files
committed
Merge branch 'alanpoulain-sf5-compatibility'
2 parents bab9597 + e63859b commit e45284b

3 files changed

Lines changed: 37 additions & 17 deletions

File tree

.travis.yml

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
language: php
22

3+
dist: trusty
4+
35
addons:
46
chrome: stable
57

@@ -10,8 +12,7 @@ cache:
1012
env:
1113
global:
1214
- DISPLAY=:99.0
13-
- CHROME_DRIVER_VERSION=2.36
14-
- SELENIUM_VERSION=3.6.0
15+
- SELENIUM_VERSION=3.9.1
1516
matrix:
1617
- DEPS=high PROFILE=default
1718
- DEPS=low PROFILE=default
@@ -21,31 +22,41 @@ env:
2122
php:
2223
- 5.5
2324
- 5.6
24-
- 7.0
25-
- 7.1
2625
- 7.2
26+
- 7.3
27+
- 7.4
2728
- nightly
2829

2930
matrix:
31+
exclude:
32+
- php: 7.4
33+
env: DEPS=low PROFILE=default
34+
- php: 7.4
35+
env: DEPS=low PROFILE=symfony2
36+
- php: nightly
37+
env: DEPS=low PROFILE=default
38+
- php: nightly
39+
env: DEPS=low PROFILE=symfony2
3040
allow_failures:
3141
- php: nightly
32-
- php: hhvm
33-
- php: hhvm-nightly
3442
fast_finish: true
3543

3644
before_script:
3745
- Xvfb $DISPLAY -extension RANDR &> /dev/null &
3846

39-
- wget "https://chromedriver.storage.googleapis.com/${CHROME_DRIVER_VERSION}/chromedriver_linux64.zip"
40-
- unzip chromedriver_linux64.zip
47+
- LATEST_CHROMEDRIVER_VERSION=`curl http://chromedriver.storage.googleapis.com/LATEST_RELEASE`
48+
- wget --no-verbose https://chromedriver.storage.googleapis.com/$LATEST_CHROMEDRIVER_VERSION/chromedriver_linux64.zip
49+
- unzip chromedriver_linux64.zip -d ~/bin
50+
4151
- wget "https://selenium-release.storage.googleapis.com/${SELENIUM_VERSION%%.[[:digit:]]}/selenium-server-standalone-${SELENIUM_VERSION}.jar" -O selenium.jar
42-
- java -jar -Dwebdriver.chrome.driver=./chromedriver selenium.jar &> /dev/null &
52+
- java -jar selenium.jar &> /dev/null &
4353

4454
- php -S localhost:8080 -t tests/fixtures/www &> /dev/null &
4555
- cp behat.yml{.dist,}
46-
- composer install
56+
- COMPOSER_PATH="/home/travis/.phpenv/versions/$TRAVIS_PHP_VERSION/bin/composer"
57+
- php -d memory_limit=-1 $COMPOSER_PATH install
4758

48-
- test "$DEPS" == "low" || composer update --prefer-lowest
59+
- test "$DEPS" == "high" || php -d memory_limit=-1 $COMPOSER_PATH update --prefer-lowest
4960
- test ${TRAVIS_PHP_VERSION:0:1} -lt 7 || composer update atoum/atoum
5061

5162
script:

behat.yml.dist

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,16 @@ default:
2020
base_url: 'http://localhost:8080'
2121
files_path: 'tests/fixtures/files'
2222
goutte: ~
23-
selenium2: ~
23+
selenium2:
24+
capabilities:
25+
chrome:
26+
switches:
27+
- "--headless"
28+
- "--disable-gpu"
29+
- "--no-sandbox"
30+
extra_capabilities:
31+
"goog:chromeOptions":
32+
w3c: false
2433
browser_name: 'chrome'
2534
sessions:
2635
default:

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
"require": {
99
"php": ">=5.5",
1010
"behat/behat": "^3.0.13",
11-
"behat/mink-extension": "^2.3.1",
11+
"friends-of-behat/mink-extension": "^2.3.1",
1212
"justinrainbow/json-schema": "^5.0",
13-
"symfony/property-access": "^2.3|^3.0|^4.0",
14-
"symfony/http-foundation": "^2.3|^3.0|^4.0",
15-
"symfony/dom-crawler": "^2.4|^3.0|^4.0"
13+
"symfony/property-access": "^2.3|^3.0|^4.0|^5.0",
14+
"symfony/http-foundation": "^2.3|^3.0|^4.0|^5.0",
15+
"symfony/dom-crawler": "^2.4|^3.0|^4.0|^5.0"
1616
},
1717

1818
"require-dev": {
1919
"behat/mink-goutte-driver": "^1.1",
2020
"guzzlehttp/guzzle": "^6.3",
21-
"behat/mink-selenium2-driver": "^1.3",
21+
"behat/mink-selenium2-driver": "^1.4@dev",
2222
"atoum/atoum": "^2.8|^3.0",
2323
"fabpot/goutte": "^3.2"
2424
},

0 commit comments

Comments
 (0)