diff --git a/composer.json b/composer.json index 4eb74b2..b5b7efd 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "require": { "php": ">=5.3.1", - "behat/mink": "~1.5.0@dev", + "behat/mink": "dev-2-architecture-changes", "alexandresalome/php-selenium": "~1.0.1@dev", "symfony/dom-crawler": "~2.0" }, diff --git a/src/Behat/Mink/Driver/SeleniumDriver.php b/src/Behat/Mink/Driver/SeleniumDriver.php index daf0785..42998b7 100644 --- a/src/Behat/Mink/Driver/SeleniumDriver.php +++ b/src/Behat/Mink/Driver/SeleniumDriver.php @@ -2,9 +2,7 @@ namespace Behat\Mink\Driver; -use Behat\Mink\Element\NodeElement; use Behat\Mink\Exception\UnsupportedDriverActionException; -use Behat\Mink\Session; use Selenium\Client as SeleniumClient; use Selenium\Exception as SeleniumException; use Selenium\Locator as SeleniumLocator; @@ -37,13 +35,6 @@ class SeleniumDriver extends CoreDriver */ private $timeout = 60000; - /** - * The current session - * - * @var \Behat\Mink\Session - */ - private $session; - /** * The selenium browser instance * @@ -80,14 +71,6 @@ public function getBrowser() return $this->browser; } - /** - * @see Behat\Mink\Driver\DriverInterface::setSession() - */ - public function setSession(Session $session) - { - $this->session = $session; - } - /** * @see Behat\Mink\Driver\DriverInterface::start() */ @@ -238,7 +221,7 @@ public function find($xpath) $elements = array(); foreach ($nodes as $i => $node) { - $elements[] = new NodeElement(sprintf('(%s)[%d]', $xpath, $i + 1), $this->session); + $elements[] = sprintf('(%s)[%d]', $xpath, $i + 1); } return $elements;