Merge pull request #685 from OndraM/feature/saucelabs-w3c

OndraM · web-flow · commit e8561c2fa008 · 2019-11-24T08:05:26.000+01:00
Use W3C protocol on part of Sauce Labs builds
diff --git a/.travis.yml b/.travis.yml
@@ -59,7 +59,6 @@ matrix:
       php: '7.3'
       env:
         - BROWSER_NAME="chrome"
-        - CHROME_HEADLESS="1"
       addons:
         chrome: stable
 
@@ -68,7 +67,6 @@ matrix:
       php: '7.3'
       env:
         - BROWSER_NAME="chrome"
-        - CHROME_HEADLESS="1"
         - CHROMEDRIVER="1"
       addons:
         chrome: stable
@@ -78,15 +76,15 @@ matrix:
       php: '7.3'
       env:
         - BROWSER_NAME="chrome"
-        - CHROME_HEADLESS="1"
         - CHROMEDRIVER="1"
         - DISABLE_W3C_PROTOCOL="1"
       addons:
         chrome: stable
 
     # Saucelabs builds
-    - php: '7.3'
-      env: SAUCELABS=1 BROWSER_NAME="firefox" VERSION="47.0" PLATFORM="Windows 10"
+    - name: 'Sauce Labs, Firefox 47, OSS protocol'
+      php: '7.3'
+      env: SAUCELABS=1 BROWSER_NAME="firefox" VERSION="47.0" PLATFORM="Windows 10" DISABLE_W3C_PROTOCOL="1"
       before_script:
         - php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
         - until $(echo | nc localhost 8000); do sleep 1; echo waiting for PHP server on port 8000...; done; echo "PHP server started"
@@ -95,8 +93,9 @@ matrix:
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
 
-    - php: '7.3'
-      env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="74.0" PLATFORM="Windows 10" # 74 is the last version which don't use W3C WebDriver by default
+    - name: 'Sauce Labs, Chrome 74, OSS protocol'
+      php: '7.3'
+      env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="74.0" PLATFORM="Windows 10" DISABLE_W3C_PROTOCOL="1" # 74 is the last version which don't use W3C WebDriver by default
       before_script:
         - php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
         - until $(echo | nc localhost 8000); do sleep 1; echo waiting for PHP server on port 8000...; done; echo "PHP server started"
@@ -105,8 +104,9 @@ matrix:
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
 
-    - php: '7.3'
-      env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="75.0" PLATFORM="Windows 10"
+    - name: 'Sauce Labs, Chrome latest, W3C protocol'
+      php: '7.3'
+      env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="latest" PLATFORM="Windows 10"
       before_script:
         - php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
         - until $(echo | nc localhost 8000); do sleep 1; echo waiting for PHP server on port 8000...; done; echo "PHP server started"
@@ -115,8 +115,9 @@ matrix:
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
 
-    - php: '7.3'
-      env: SAUCELABS=1 BROWSER_NAME="MicrosoftEdge" VERSION="16.16299" PLATFORM="Windows 10"
+    - name: 'Sauce Labs, Edge latest, W3C protocol'
+      php: '7.3'
+      env: SAUCELABS=1 BROWSER_NAME="MicrosoftEdge" VERSION="latest" PLATFORM="Windows 10"
       before_script:
         - php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
         - until $(echo | nc localhost 8000); do sleep 1; echo waiting for PHP server on port 8000...; done; echo "PHP server started"
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
@@ -358,6 +358,7 @@ public function isSelected()
     public function sendKeys($value)
     {
         $local_file = $this->fileDetector->getLocalFile($value);
+
         if ($local_file === null) {
             if ($this->isW3cCompliant) {
                 $params = [
@@ -370,22 +371,18 @@ public function sendKeys($value)
                     ':id' => $this->id,
                 ];
             }
-
-            $this->executor->execute(DriverCommand::SEND_KEYS_TO_ELEMENT, $params);
-
-            return $this;
-        }
-
-        if ($this->isW3cCompliant) {
-            $params = [
-                'text' => $local_file,
-                ':id' => $this->id,
-            ];
         } else {
-            $params = [
-                'value' => WebDriverKeys::encode($this->upload($local_file)),
-                ':id' => $this->id,
-            ];
+            if ($this->isW3cCompliant) {
+                $params = [
+                    'text' => $local_file,
+                    ':id' => $this->id,
+                ];
+            } else {
+                $params = [
+                    'value' => WebDriverKeys::encode($this->upload($local_file)),
+                    ':id' => $this->id,
+                ];
+            }
         }
 
         $this->executor->execute(DriverCommand::SEND_KEYS_TO_ELEMENT, $params);
diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
@@ -26,6 +26,8 @@ class FileUploadTest extends WebDriverTestCase
     /**
      * @group exclude-edge
      * https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/6052385/
+     * @group exclude-saucelabs
+     * W3C protocol does not support remote file upload: https://github.com/w3c/webdriver/issues/1355
      */
     public function testShouldUploadAFile()
     {
diff --git a/tests/functional/WebDriverAlertTest.php b/tests/functional/WebDriverAlertTest.php
@@ -25,12 +25,6 @@ class WebDriverAlertTest extends WebDriverTestCase
 {
     protected function setUp()
     {
-        if (getenv('CHROME_HEADLESS') === '1') {
-            // Alerts in headless mode should be available in next Chrome version (61), see:
-            // https://bugs.chromium.org/p/chromium/issues/detail?id=718235
-            $this->markTestSkipped('Alerts not yet supported by headless Chrome');
-        }
-
         parent::setUp();
 
         $this->driver->get($this->getTestPageUrl('alert.html'));
diff --git a/tests/functional/WebDriverCheckboxesTest.php b/tests/functional/WebDriverCheckboxesTest.php
@@ -20,6 +20,7 @@
 /**
  * @covers \Facebook\WebDriver\WebDriverCheckboxes
  * @covers \Facebook\WebDriver\AbstractWebDriverCheckboxOrRadio
+ * @group exclude-edge
  */
 class WebDriverCheckboxesTest extends WebDriverTestCase
 {
diff --git a/tests/functional/WebDriverRadiosTest.php b/tests/functional/WebDriverRadiosTest.php
@@ -21,6 +21,7 @@
 /**
  * @covers \Facebook\WebDriver\WebDriverRadios
  * @covers \Facebook\WebDriver\AbstractWebDriverCheckboxOrRadio
+ * @group exclude-edge
  */
 class WebDriverRadiosTest extends WebDriverTestCase
 {
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
@@ -112,9 +112,8 @@ public static function isSauceLabsBuild()
     public static function isW3cProtocolBuild()
     {
         return getenv('GECKODRIVER') === '1'
-            || (getenv('BROWSER_NAME') === 'chrome'
-                && getenv('DISABLE_W3C_PROTOCOL') !== '1'
-                && !self::isSauceLabsBuild());
+            || (getenv('BROWSER_NAME') === 'chrome' && getenv('DISABLE_W3C_PROTOCOL') !== '1')
+            || (self::isSauceLabsBuild() && getenv('DISABLE_W3C_PROTOCOL') !== '1');
     }
 
     public static function skipForW3cProtocol($message = 'Not supported by W3C specification')
@@ -153,12 +152,32 @@ protected function setUpSauceLabs()
         $this->desiredCapabilities->setBrowserName(getenv('BROWSER_NAME'));
         $this->desiredCapabilities->setVersion(getenv('VERSION'));
         $this->desiredCapabilities->setPlatform(getenv('PLATFORM'));
-        $this->desiredCapabilities->setCapability('name', get_class($this) . '::' . $this->getName());
-        $this->desiredCapabilities->setCapability('tags', [get_class($this)]);
+        $name = get_class($this) . '::' . $this->getName();
+        $tags = [get_class($this)];
 
         if (getenv('TRAVIS_JOB_NUMBER')) {
-            $this->desiredCapabilities->setCapability('tunnel-identifier', getenv('TRAVIS_JOB_NUMBER'));
-            $this->desiredCapabilities->setCapability('build', getenv('TRAVIS_JOB_NUMBER'));
+            $tunnelIdentifier = getenv('TRAVIS_JOB_NUMBER');
+            $build = getenv('TRAVIS_JOB_NUMBER');
+        }
+
+        if (!getenv('DISABLE_W3C_PROTOCOL')) {
+            $sauceOptions = [
+                'name' => $name,
+                'tags' => $tags,
+            ];
+            if (isset($tunnelIdentifier, $build)) {
+                $sauceOptions['tunnelIdentifier'] = $tunnelIdentifier;
+                $sauceOptions['build'] = $build;
+            }
+            $this->desiredCapabilities->setCapability('sauce:options', (object) $sauceOptions);
+        } else {
+            $this->desiredCapabilities->setCapability('name', $name);
+            $this->desiredCapabilities->setCapability('tags', $tags);
+
+            if (isset($tunnelIdentifier, $build)) {
+                $this->desiredCapabilities->setCapability('tunnel-identifier', $tunnelIdentifier);
+                $this->desiredCapabilities->setCapability('build', $build);
+            }
         }
     }
 }
diff --git a/tests/functional/WebDriverTimeoutsTest.php b/tests/functional/WebDriverTimeoutsTest.php
@@ -26,6 +26,9 @@
  */
 class WebDriverTimeoutsTest extends WebDriverTestCase
 {
+    /**
+     * @group exclude-saucelabs
+     */
     public function testShouldFailGettingDelayedElementWithoutWait()
     {
         $this->driver->get($this->getTestPageUrl('delayed_element.html'));

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ class FileUploadTest extends WebDriverTestCase`
`26`	`26`	`/**`
`27`	`27`	`* @group exclude-edge`
`28`	`28`	`* https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/6052385/`
	`29`	`+ * @group exclude-saucelabs`
	`30`	`+ * W3C protocol does not support remote file upload: https://github.com/w3c/webdriver/issues/1355`
`29`	`31`	`*/`
`30`	`32`	`public function testShouldUploadAFile()`
`31`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,6 @@ class WebDriverAlertTest extends WebDriverTestCase`
`25`	`25`	`{`
`26`	`26`	`protected function setUp()`
`27`	`27`	`{`
`28`		`- if (getenv('CHROME_HEADLESS') === '1') {`
`29`		`- // Alerts in headless mode should be available in next Chrome version (61), see:`
`30`		`- // https://bugs.chromium.org/p/chromium/issues/detail?id=718235`
`31`		`- $this->markTestSkipped('Alerts not yet supported by headless Chrome');`
`32`		`- }`
`33`		`-`
`34`	`28`	`parent::setUp();`
`35`	`29`
`36`	`30`	`$this->driver->get($this->getTestPageUrl('alert.html'));`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`/**`
`21`	`21`	`* @covers \Facebook\WebDriver\WebDriverCheckboxes`
`22`	`22`	`* @covers \Facebook\WebDriver\AbstractWebDriverCheckboxOrRadio`
	`23`	`+ * @group exclude-edge`
`23`	`24`	`*/`
`24`	`25`	`class WebDriverCheckboxesTest extends WebDriverTestCase`
`25`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`/**`
`22`	`22`	`* @covers \Facebook\WebDriver\WebDriverRadios`
`23`	`23`	`* @covers \Facebook\WebDriver\AbstractWebDriverCheckboxOrRadio`
	`24`	`+ * @group exclude-edge`
`24`	`25`	`*/`
`25`	`26`	`class WebDriverRadiosTest extends WebDriverTestCase`
`26`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,9 @@`
`26`	`26`	`*/`
`27`	`27`	`class WebDriverTimeoutsTest extends WebDriverTestCase`
`28`	`28`	`{`
	`29`	`+ /**`
	`30`	`+ * @group exclude-saucelabs`
	`31`	`+ */`
`29`	`32`	`public function testShouldFailGettingDelayedElementWithoutWait()`
`30`	`33`	`{`
`31`	`34`	`$this->driver->get($this->getTestPageUrl('delayed_element.html'));`