From bf9be1f664b0d624161579e67ce4852fa802d233 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Sun, 29 Dec 2013 21:14:29 +0100 Subject: [PATCH] Updated the driver for the Mink 2.0 API --- composer.json | 2 +- src/Behat/Mink/Driver/ZombieDriver.php | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index d76186d..85e70ee 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "require": { "php": ">=5.3.1", - "behat/mink": "~1.5@dev", + "behat/mink": "dev-2-architecture-changes", "symfony/process": "~2.1" }, diff --git a/src/Behat/Mink/Driver/ZombieDriver.php b/src/Behat/Mink/Driver/ZombieDriver.php index 8f9727c..a2956fd 100644 --- a/src/Behat/Mink/Driver/ZombieDriver.php +++ b/src/Behat/Mink/Driver/ZombieDriver.php @@ -11,9 +11,7 @@ namespace Behat\Mink\Driver; use Behat\Mink\Driver\NodeJS\Server\ZombieServer; -use Behat\Mink\Element\NodeElement; use Behat\Mink\Exception\DriverException; -use Behat\Mink\Session; /** * Zombie (JS) driver. @@ -22,10 +20,6 @@ */ class ZombieDriver extends CoreDriver { - /** - * @var Session - */ - private $session; private $started = false; private $nativeRefs = array(); private $server = null; @@ -61,14 +55,6 @@ public function getServer() return $this->server; } - /** - * {@inheritdoc} - */ - public function setSession(Session $session) - { - $this->session = $session; - } - /** * {@inheritdoc} */ @@ -344,7 +330,7 @@ public function find($xpath) foreach ($refs as $i => $ref) { $subXpath = sprintf('(%s)[%d]', $xpath, $i + 1); $this->nativeRefs[md5($subXpath)] = $ref; - $elements[] = new NodeElement($subXpath, $this->session); + $elements[] = $subXpath; // first node ref also matches the original xpath if (0 === $i) {