add web driver manager with selenium

pyd · Nov 13, 2018 · 66a2dfe · 66a2dfe
1 parent b3ffec8
commit 66a2dfe
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/src/web/driver/selenium/Manager.php b/src/web/driver/selenium/Manager.php
@@ -1,6 +1,10 @@
 <?php
 namespace pyd\testkit\web\driver\selenium;
 
+use pyd\testkit\web\Driver;
+use pyd\testkit\web\RemoteDriver;
+
+
 /**
  * Manage - create/destroy - the 'webdriver client' instance used to talk with
  * the selenium server.
@@ -17,7 +21,7 @@ class Manager extends \yii\base\BaseObject implements \pyd\testkit\web\driver\Ma
     public $url = 'http://localhost:4444/wd/hub';
 
     protected $desiredCapabilities;
-    
+
     public $connectionTimeout;
 
     public $requestTimeout;
@@ -39,6 +43,9 @@ public function setDesiredCapabilities(\DesiredCapabilities $dc)
      */
     public function getDriver()
     {
+        if (!$this->driverIsReady()) {
+            $this->createDriver();
+        }
         return $this->driver;
     }
 
@@ -65,26 +72,23 @@ public function driverIsReady()
      * 
      * @throws \yii\base\InvalidCallException
      */
-    protected function createDriver()
+    private function createDriver()
     {
-        try {
-            $driverClass = $this->driverClass;
-            $this->driver = $driverClass::create(
-                    $this->url,
-                    $this->desiredCapabilities,
-                    $this->connectionTimeout,
-                    $this->requestTimeout);
-        } catch (\WebDriverCurlException $e) {
-            throw new \yii\base\InvalidCallException("Cannot create web driver: " . $e->getMessage());
+        if (null === $this->desiredCapabilities) {
+            $this->desiredCapabilities = \DesiredCapabilities::firefox();
         }
+
+        $this->driver = RemoteDriver::create($this->url, $this->desiredCapabilities, $this->connectionTimeout, $this->requestTimeout);
     }
 
     /**
      * Close web driver session and destroy driver instance.
      */
     protected function destroyDriver()
     {
-        $this->driver->quit();
+        if ($this->driverIsReady()) {
+            $this->driver->quit();
+        }
         $this->driver = null;
     }
 }
diff --git a/src/web/driver/selenium/ManagerEventObserver.php b/src/web/driver/selenium/ManagerEventObserver.php
@@ -63,11 +63,8 @@ public function onSetUp(\pyd\testkit\events\SetUp $event)
     {
         if ($this->driverRequired) {
 
-            if (!$this->driverIsReady()) {
-                $this->createDriver();
-            } else if (!$this->shareDriver) {
+            if (!$this->shareDriver) {
                 $this->destroyDriver();
-                $this->createDriver();
             } else if ($this->clearCookies) {
                 $this->getDriver()->cookies()->deleteAll();
             }
@@ -85,11 +82,7 @@ public function onSetUp(\pyd\testkit\events\SetUp $event)
     public function onEndTestCase(\pyd\testkit\events\EndTestCase $event)
     {
         if ($this->driverRequired) {
-
-            if ($this->driverIsReady()) {
-                $this->destroyDriver();
-            }
-
+            $this->destroyDriver();
             $this->shareDriver = null;
             $this->clearCookies = null;
             $this->driverRequired = null;