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

Merge pull request #151 from dhensby/pulls/phpunit-bump

Browse Source 
Bump PHPUnit dep
This commit is contained in:
Damian Mooyman 2017-03-24 15:25:29 +13:00 committed by GitHub
commit c61b66882b
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -14,11 +14,16 @@ matrix:
include: include:
- php: 5.6 - php: 5.6
env: PHPUNIT_TEST=1 env: PHPUNIT_TEST=1
- php: 7.0
env: PHPUNIT_TEST=1
- php: 7.1
env: PHPUNIT_TEST=1
before_script: before_script:
- composer validate
- composer install --dev --prefer-dist - composer install --dev --prefer-dist
- composer require silverstripe/config:1.0.x-dev silverstripe/framework:4.0.x-dev --prefer-dist - composer require silverstripe/config:1.0.x-dev silverstripe/framework:4.0.x-dev --prefer-dist
- pyrus install pear/PHP_CodeSniffer - "if [ \"$PHPCS_TEST\" = \"1\" ]; then pyrus install pear/PHP_CodeSniffer; fi"
- phpenv rehash - phpenv rehash

2
composer.json
View File

@ -18,7 +18,7 @@
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.3",
"phpunit/phpunit": "~4.8", "phpunit/phpunit": "^4.8 || ^5.7",
"behat/behat": "~2.5.0", "behat/behat": "~2.5.0",
"behat/mink": "~1.6.0", "behat/mink": "~1.6.0",
"behat/mink-extension": "~1.3.0", "behat/mink-extension": "~1.3.0",

4
tests/Context/SilverStripeContextTest.php
View File

@ -64,8 +64,8 @@ class SilverStripeContextTest extends \PHPUnit_Framework_TestCase
->getMock(); ->getMock();
$sessionMock = $this->getMockBuilder('Behat\Mink\Session') $sessionMock = $this->getMockBuilder('Behat\Mink\Session')
->setConstructorArgs(array( ->setConstructorArgs(array(
$this->getMock('Behat\Mink\Driver\DriverInterface'), $this->getMockBuilder('Behat\Mink\Driver\DriverInterface')->getMock(),
$this->getMock('Behat\Mink\Selector\SelectorsHandler') $this->getMockBuilder('Behat\Mink\Selector\SelectorsHandler')->getMock()
)) ))
->setMethods(array('getPage')) ->setMethods(array('getPage'))
->getMock(); ->getMock();