Fix the tests

FriendsOfBehat · Jan 15, 2020 · 8a7611e · 8a7611e
1 parent 88bfed6
commit 8a7611e
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 vendor
 composer.lock
 /phpunit.xml
+/.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     },
 
     "require-dev": {
-        "mink/driver-testsuite": "dev-master",
+        "friends-of-behat/mink-driver-testsuite": "dev-master",
         "symfony/http-kernel": "^4.4|^5.0"
     },
 

diff --git a/src/BrowserKitDriver.php b/src/BrowserKitDriver.php
@@ -12,7 +12,7 @@
 
 use Behat\Mink\Exception\DriverException;
 use Behat\Mink\Exception\UnsupportedDriverActionException;
-use Symfony\Component\BrowserKit\Client;
+use Symfony\Component\BrowserKit\AbstractBrowser;
 use Symfony\Component\BrowserKit\Cookie;
 use Symfony\Component\BrowserKit\Exception\BadMethodCallException;
 use Symfony\Component\BrowserKit\Response;
@@ -23,7 +23,7 @@
 use Symfony\Component\DomCrawler\Field\InputFormField;
 use Symfony\Component\DomCrawler\Field\TextareaFormField;
 use Symfony\Component\DomCrawler\Form;
-use Symfony\Component\HttpKernel\Client as HttpKernelClient;
+use Symfony\Component\HttpKernel\HttpKernelBrowser;
 
 /**
  * Symfony2 BrowserKit driver.
@@ -46,23 +46,23 @@ class BrowserKitDriver extends CoreDriver
     /**
      * Initializes BrowserKit driver.
      *
-     * @param Client      $client  BrowserKit client instance
+     * @param AbstractBrowser      $client  BrowserKit client instance
      * @param string|null $baseUrl Base URL for HttpKernel clients
      */
-    public function __construct(Client $client, $baseUrl = null)
+    public function __construct(AbstractBrowser $client, $baseUrl = null)
     {
         $this->client = $client;
         $this->client->followRedirects(true);
 
-        if ($baseUrl !== null && $client instanceof HttpKernelClient) {
+        if ($baseUrl !== null && $client instanceof HttpKernelBrowser) {
             $client->setServerParameter('SCRIPT_FILENAME', parse_url($baseUrl, PHP_URL_PATH));
         }
     }
 
     /**
      * Returns BrowserKit HTTP client instance.
      *
-     * @return Client
+     * @return AbstractBrowser
      */
     public function getClient()
     {
@@ -874,9 +874,13 @@ private function getFilteredCrawler($xpath)
      */
     private function getCrawler()
     {
-        $crawler = $this->client->getCrawler();
+        try {
+            $crawler = $this->client->getCrawler();
 
-        if (null === $crawler) {
+            if (null === $crawler) {
+                throw new DriverException('Unable to access the response content before visiting a page');
+            }
+        } catch (BadMethodCallException $exception) {
             throw new DriverException('Unable to access the response content before visiting a page');
         }
 

diff --git a/tests/Custom/BaseUrlTest.php b/tests/Custom/BaseUrlTest.php
@@ -6,7 +6,7 @@
 use Behat\Mink\Session;
 use Behat\Mink\Tests\Driver\Util\FixturesKernel;
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpKernel\Client;
+use Symfony\Component\HttpKernel\HttpKernelBrowser;
 
 /**
  * @group functional
@@ -15,7 +15,7 @@ class BaseUrlTest extends TestCase
 {
     public function testBaseUrl()
     {
-        $client = new Client(new FixturesKernel());
+        $client = new HttpKernelBrowser(new FixturesKernel());
         $driver = new BrowserKitDriver($client, 'http://localhost/foo/');
         $session = new Session($driver);
 

diff --git a/tests/Custom/ErrorHandlingTest.php b/tests/Custom/ErrorHandlingTest.php
@@ -3,6 +3,7 @@
 namespace Behat\Mink\Tests\Driver\Custom;
 
 use Behat\Mink\Driver\BrowserKitDriver;
+use Behat\Mink\Exception\DriverException;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\BrowserKit\AbstractBrowser;
 use Symfony\Component\BrowserKit\Client;
@@ -26,50 +27,49 @@ public function testGetClient()
     }
 
     /**
-     * @expectedException \Behat\Mink\Exception\DriverException
-     * @expectedExceptionMessage Unable to access the response before visiting a page
-     *
      * Looks like we have to mark these tests as "legacy", otherwise we get deprecation errors.
      * Although the deprecations are handled, there's no way to avoid the deprecation message here.
      * @group legacy
      */
     public function testGetResponseHeaderWithoutVisit()
     {
+        $this->expectException(DriverException::class);
+        $this->expectExceptionMessage('Unable to access the response before visiting a page');
+
         $this->getDriver()->getResponseHeaders();
     }
 
     /**
-     * @expectedException \Behat\Mink\Exception\DriverException
-     * @expectedExceptionMessage Unable to access the response content before visiting a page
-     *
      * Looks like we have to mark these tests as "legacy", otherwise we get deprecation errors.
      * Although the deprecations are handled, there's no way to avoid the deprecation message here.
      * @group legacy
      */
     public function testFindWithoutVisit()
     {
+        $this->expectException(DriverException::class);
+        $this->expectExceptionMessage('Unable to access the response content before visiting a page');
+
         $this->getDriver()->find('//html');
     }
 
     /**
-     * @expectedException \Behat\Mink\Exception\DriverException
-     * @expectedExceptionMessage Unable to access the request before visiting a page
-     *
      * Looks like we have to mark these tests as "legacy", otherwise we get deprecation errors.
      * Although the deprecations are handled, there's no way to avoid the deprecation message here.
      * @group legacy
      */
     public function testGetCurrentUrlWithoutVisit()
     {
+        $this->expectException(DriverException::class);
+        $this->expectExceptionMessage('Unable to access the request before visiting a page');
+
         $this->getDriver()->getCurrentUrl();
     }
 
-    /**
-     * @expectedException \Behat\Mink\Exception\DriverException
-     * @expectedExceptionMessage The selected node has an invalid form attribute (foo)
-     */
     public function testNotMatchingHtml5FormId()
     {
+        $this->expectException(DriverException::class);
+        $this->expectExceptionMessage('The selected node has an invalid form attribute (foo)');
+
         $html = <<<'HTML'
 <html>
 <body>
@@ -88,12 +88,11 @@ public function testNotMatchingHtml5FormId()
         $driver->setValue('//input[./@name="test"]', 'bar');
     }
 
-    /**
-     * @expectedException \Behat\Mink\Exception\DriverException
-     * @expectedExceptionMessage The selected node has an invalid form attribute (foo)
-     */
     public function testInvalidHtml5FormId()
     {
+        $this->expectException(DriverException::class);
+        $this->expectExceptionMessage('The selected node has an invalid form attribute (foo)');
+
         $html = <<<'HTML'
 <html>
 <body>
@@ -113,12 +112,11 @@ public function testInvalidHtml5FormId()
         $driver->setValue('//input[./@name="test"]', 'bar');
     }
 
-    /**
-     * @expectedException \Behat\Mink\Exception\DriverException
-     * @expectedExceptionMessage The selected node does not have a form ancestor.
-     */
     public function testManipulateInputWithoutForm()
     {
+        $this->expectException(DriverException::class);
+        $this->expectExceptionMessage('The selected node does not have a form ancestor.');
+
         $html = <<<'HTML'
 <html>
 <body>
@@ -139,12 +137,11 @@ public function testManipulateInputWithoutForm()
         $driver->setValue('//input[./@name="test"]', 'bar');
     }
 
-    /**
-     * @expectedException \Behat\Mink\Exception\DriverException
-     * @expectedExceptionMessage Behat\Mink\Driver\BrowserKitDriver supports clicking on links and submit or reset buttons only. But "div" provided
-     */
     public function testClickOnUnsupportedElement()
     {
+        $this->expectException(DriverException::class);
+        $this->expectExceptionMessage('Behat\Mink\Driver\BrowserKitDriver supports clicking on links and submit or reset buttons only. But "div" provided');
+
         $html = <<<'HTML'
 <html>
 <body>