added facebook/php-webdriver to composer.json

Behat · Dec 21, 2011 · 1f31834 · 1f31834
1 parent d71acd1
commit 1f31834
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,8 @@
     "recommend": {
         "fabpot/goutte":                 "*",
         "behat/sahi-client":             ">=1.0.1",
-        "alexandresalome/php-selenium":  "*"
+        "alexandresalome/php-selenium":  "*",
+        "facebook/php-webdriver":        "*"
     },
 
     "autoload": {
@@ -88,6 +89,32 @@
                 }
             }
         },
+        "facebook/php-webdriver": {
+            "package": {
+                "name":    "facebook/php-webdriver",
+                "version": "master-dev",
+                "dist": {
+                    "url":  "https://github.com/facebook/php-webdriver/zipball/master",
+                    "type": "zip"
+                },
+                "source": {
+                    "url":       "git://github.com/facebook/php-webdriver.git",
+                    "type":      "git",
+                    "reference": "master"
+                },
+                "autoload": {
+                    "psr-0": {
+                        "WebDriverBase":         ".",
+                        "WebDriver":             ".",
+                        "WebDriverContainer":    ".",
+                        "WebDriverSession":      ".",
+                        "WebDriverElement":      ".",
+                        "WebDriverEnvironment":  ".",
+                        "WebDriverSimpleItem":   "."
+                    }
+                }
+            }
+        },
         "zendframework/zend-registry": {
             "package": {
                 "name":       "zendframework/zend-registry",

diff --git a/src/Behat/Mink/Driver/Selenium2Driver.php b/src/Behat/Mink/Driver/Selenium2Driver.php
@@ -10,7 +10,7 @@
 use Selenium\Client as SeleniumClient,
     Selenium\Locator as SeleniumLocator,
     Selenium\Exception as SeleniumException,
-    \WebDriver as WebDriver;
+    WebDriver as WebDriver;
 
 /*
  * This file is part of the Behat\Mink.
@@ -42,7 +42,7 @@ class Selenium2Driver implements DriverInterface
     /**
      * The WebDriver instance
      * @var WebDriver
-     */ 
+     */
     private $webDriver;
 
     /**
@@ -54,6 +54,16 @@ class Selenium2Driver implements DriverInterface
      */
     public function __construct($browserName = 'firefox', $desiredCapabilities = null, $wdHost = 'http://localhost:4444/wd/hub')
     {
+        // load WD exceptions if not loaded
+        if (!class_exists('IndexOutOfBoundsWebDriverError')) {
+            $wdReflection = new \ReflectionClass('WebDriver');
+            $libPath = dirname($wdReflection->getFilename());
+
+            if (file_exists($path = $libPath.'/WebDriverExceptions.php')) {
+                require_once($path);
+            }
+        }
+
         $this->setBrowserName($browserName);
         $this->setDesiredCapabilities($desiredCapabilities);
         $this->setWebDriver( new WebDriver($wdHost) );