Use W3C protocol on some Saucelabs builds

Author: OndraM

.travis.yml

@@ -85,8 +85,9 @@ matrix:
         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 +96,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 +107,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 +118,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"

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')
+            || getenv('BROWSER_NAME') === 'MicrosoftEdge';
     }
 
     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);
+            }
         }
     }
 }

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'));