Merge pull request #113 from stof/update_testsuite

Update the testsuite to use the new mink/driver-testsuite

Author: stof

.travis.yml

@@ -2,7 +2,7 @@ language: php
 
 sudo: false
 
-php: [5.3, 5.4, 5.5, 5.6, 7.0, hhvm]
+php: [5.3, 5.4, 5.5, 5.6, 7.0, 7.1, hhvm]
 
 matrix:
   include:

composer.json

@@ -22,8 +22,8 @@
     },
 
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.7|~3.0",
-        "silex/silex": "~1.2"
+        "mink/driver-testsuite": "dev-master",
+        "symfony/http-kernel": "~2.3|~3.0"
     },
 
     "autoload": {

phpunit.xml.dist

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit colors="true" bootstrap="vendor/behat/mink/driver-testsuite/bootstrap.php">
+<phpunit colors="true" bootstrap="vendor/autoload.php">
     <php>
         <var name="driver_config_factory" value="Behat\Mink\Tests\Driver\BrowserKitConfig::getInstance" />
     </php>
 
     <testsuites>
         <testsuite name="Driver test suite">
             <directory>tests</directory>
-            <directory>vendor/behat/mink/driver-testsuite/tests/Basic</directory>
-            <directory>vendor/behat/mink/driver-testsuite/tests/Form</directory>
+            <directory>vendor/mink/driver-testsuite/tests/Basic</directory>
+            <directory>vendor/mink/driver-testsuite/tests/Form</directory>
         </testsuite>
     </testsuites>
 

tests/BrowserKitConfig.php

@@ -3,6 +3,7 @@
 namespace Behat\Mink\Tests\Driver;
 
 use Behat\Mink\Driver\BrowserKitDriver;
+use Behat\Mink\Tests\Driver\Util\FixturesKernel;
 use Symfony\Component\HttpKernel\Client;
 
 class BrowserKitConfig extends AbstractConfig
@@ -17,7 +18,7 @@ public static function getInstance()
      */
     public function createDriver()
     {
-        $client = new Client(require(__DIR__.'/app.php'));
+        $client = new Client(new FixturesKernel());
 
         return new BrowserKitDriver($client);
     }

tests/Custom/BaseUrlTest.php

@@ -4,6 +4,7 @@
 
 use Behat\Mink\Driver\BrowserKitDriver;
 use Behat\Mink\Session;
+use Behat\Mink\Tests\Driver\Util\FixturesKernel;
 use Symfony\Component\HttpKernel\Client;
 
 /**
@@ -13,7 +14,7 @@ class BaseUrlTest extends \PHPUnit_Framework_TestCase
 {
     public function testBaseUrl()
     {
-        $client = new Client(require(__DIR__.'/../app.php'));
+        $client = new Client(new FixturesKernel());
         $driver = new BrowserKitDriver($client, 'http://localhost/foo/');
         $session = new Session($driver);