Merge pull request #297 from stof/timeout

Improve the timeout handling

Author: stof

src/Selenium2Driver.php

@@ -299,15 +299,13 @@ public function start()
     {
         try {
             $this->wdSession = $this->webDriver->session($this->browserName, $this->desiredCapabilities);
-            $this->applyTimeouts();
         } catch (\Exception $e) {
             throw new DriverException('Could not open connection: '.$e->getMessage(), 0, $e);
         }
 
-        if (!$this->wdSession) {
-            throw new DriverException('Could not connect to a Selenium 2 / WebDriver server');
-        }
         $this->started = true;
+
+        $this->applyTimeouts();
     }
 
     /**

tests/Custom/TimeoutTest.php

@@ -9,6 +9,24 @@ class TimeoutTest extends TestCase
 {
     use ExpectException;
 
+    /**
+     * @after
+     */
+    protected function resetSessions()
+    {
+        $session = $this->getSession();
+
+        // Stop the session instead of only resetting it, as timeouts are not reset (they are configuring the session itself)
+        if ($session->isStarted()) {
+            $session->stop();
+        }
+
+        // Reset the array of timeouts to avoid impacting other tests
+        $session->getDriver()->setTimeouts(array());
+
+        parent::resetSessions();
+    }
+
     public function testInvalidTimeoutSettingThrowsException()
     {
         $this->expectException('\Behat\Mink\Exception\DriverException');