Simplify builds

Author: OndraM

.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,7 +76,6 @@ matrix:
       php: '7.3'
       env:
         - BROWSER_NAME="chrome"
-        - CHROME_HEADLESS="1"
         - CHROMEDRIVER="1"
         - DISABLE_W3C_PROTOCOL="1"
       addons:

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

tests/functional/WebDriverTestCase.php

@@ -113,7 +113,7 @@ public static function isW3cProtocolBuild()
     {
         return getenv('GECKODRIVER') === '1'
             || (getenv('BROWSER_NAME') === 'chrome' && getenv('DISABLE_W3C_PROTOCOL') !== '1')
-            || getenv('BROWSER_NAME') === 'MicrosoftEdge';
+            || (self::isSauceLabsBuild() && getenv('DISABLE_W3C_PROTOCOL') !== '1');
     }
 
     public static function skipForW3cProtocol($message = 'Not supported by W3C specification')