Improve code coverage

Author: OndraM

lib/Remote/RemoteTargetLocator.php

@@ -25,17 +25,11 @@
  */
 class RemoteTargetLocator implements WebDriverTargetLocator
 {
-    /**
-     * @var ExecuteMethod
-     */
+    /** @var ExecuteMethod */
     protected $executor;
-    /**
-     * @var WebDriver
-     */
+    /** @var WebDriver */
     protected $driver;
-    /**
-     * @var bool
-     */
+    /** @var bool */
     protected $isW3cCompliant;
 
     public function __construct($executor, $driver, $isW3cCompliant = false)

tests/functional/RemoteTargetLocatorTest.php

@@ -55,9 +55,6 @@ public function testShouldSwitchToWindow()
         $this->assertNotSame($originalWindowHandle, $this->driver->getWindowHandle());
     }
 
-    /**
-     * @cover ::activeElement
-     */
     public function testActiveElement()
     {
         $this->driver->get($this->getTestPageUrl('index.html'));
@@ -72,9 +69,6 @@ public function testActiveElement()
         $this->assertSame('test_name', $activeElement->getAttribute('name'));
     }
 
-    /**
-     * @cover ::frame
-     */
     public function testShouldSwitchToFrameByItsId()
     {
         $parentPage = 'This is the host page which contains an iFrame';
@@ -98,9 +92,6 @@ public function testShouldSwitchToFrameByItsId()
         $this->assertContains($parentPage, $this->driver->getPageSource());
     }
 
-    /**
-     * @cover ::frame
-     */
     public function testShouldSwitchToFrameByElement()
     {
         $this->driver->get($this->getTestPageUrl('page_with_frame.html'));
@@ -112,7 +103,6 @@ public function testShouldSwitchToFrameByElement()
     }
 
     /**
-     * @cover ::frame
      * @group exclude-saucelabs
      */
     public function testShouldNotAcceptStringAsFrameIdInW3cMode()
@@ -130,7 +120,6 @@ public function testShouldNotAcceptStringAsFrameIdInW3cMode()
     }
 
     /**
-     * @cover ::frame
      * @group exclude-saucelabs
      */
     public function testShouldAcceptStringAsFrameIdInJsonWireMode()

tests/functional/RemoteWebDriverTest.php

@@ -62,9 +62,18 @@ public function testShouldGetPageSource()
 
     /**
      * @covers ::getSessionID
+     * @covers ::isW3cCompliant
      */
     public function testShouldGetSessionId()
     {
+        // This tests is intentionally included in another test, to not slow down build.
+        // @TODO Remove following in 2.0
+        if (self::isW3cProtocolBuild()) {
+            $this->assertTrue($this->driver->isW3cCompliant());
+        } else {
+            $this->assertFalse($this->driver->isW3cCompliant());
+        }
+
         $sessionId = $this->driver->getSessionID();
 
         $this->assertInternalType('string', $sessionId);
@@ -171,13 +180,17 @@ public function testShouldExecuteScriptAndDoNotBlockExecution()
         $this->assertSame('Test by ID', $element->getText());
 
         $start = microtime(true);
-        $this->driver->executeScript('
+        $scriptResult = $this->driver->executeScript('
             setTimeout(
                 function(){document.getElementById("id_test").innerHTML = "Text changed by script";},
                 250
-            )');
+            );
+            return "returned value";
+            ');
         $end = microtime(true);
 
+        $this->assertSame('returned value', $scriptResult);
+
         $this->assertLessThan(250, $end - $start, 'executeScript() should not block execution');
 
         // If we wait, the script should be executed and its value changed
@@ -199,18 +212,20 @@ public function testShouldExecuteAsyncScriptAndWaitUntilItIsFinished()
         $this->assertSame('Test by ID', $element->getText());
 
         $start = microtime(true);
-        $this->driver->executeAsyncScript(
+        $scriptResult = $this->driver->executeAsyncScript(
             'var callback = arguments[arguments.length - 1];
             setTimeout(
                 function(){
                     document.getElementById("id_test").innerHTML = "Text changed by script";
-                    callback();
+                    callback("returned value");
                  },
                 250
             );'
         );
         $end = microtime(true);
 
+        $this->assertSame('returned value', $scriptResult);
+
         $this->assertGreaterThan(
             0.250,
             $end - $start,
@@ -222,6 +237,31 @@ function(){
         $this->assertSame('Text changed by script', $element->getText());
     }
 
+    /**
+     * @covers ::executeScript
+     * @covers ::prepareScriptArguments
+     * @group exclude-saucelabs
+     */
+    public function testShouldExecuteScriptWithParamsAndReturnValue()
+    {
+        $this->driver->manage()->timeouts()->setScriptTimeout(1);
+
+        $this->driver->get($this->getTestPageUrl('index.html'));
+
+        $element1 = $this->driver->findElement(WebDriverBy::id('id_test'));
+        $element2 = $this->driver->findElement(WebDriverBy::className('test_class'));
+
+        $scriptResult = $this->driver->executeScript(
+            'var element1 = arguments[0];
+            var element2 = arguments[1];
+            return "1: " + element1.innerText + ", 2: " + element2.innerText;
+            ',
+            [$element1, $element2]
+        );
+
+        $this->assertSame('1: Test by ID, 2: Test by Class', $scriptResult);
+    }
+
     /**
      * @covers ::takeScreenshot
      */