Merge branch 'trunk' into jspecify-net

Author: diemol

.bazelrc

@@ -87,7 +87,6 @@ test --test_env=FIREFOX_NIGHTLY_BINARY
 test --test_env=GITHUB_ACTIONS
 test --test_env=MOZ_HEADLESS
 test --test_env=SELENIUM_BROWSER
-test --test_env=TRAVIS
 test --test_env=PYTHON_VERSION
 test --test_env=SE_AVOID_STATS=true
 

java/test/org/openqa/selenium/ProxySettingTest.java

@@ -110,7 +110,7 @@ public void canConfigureProxyThroughPACFile() throws URISyntaxException, Interru
   @Ignore(SAFARI)
   @NoDriverBeforeTest
   @NoDriverAfterTest
-  @Ignore(value = FIREFOX, travis = true)
+  @Ignore(value = FIREFOX, reason = "Flaky")
   @Ignore(value = CHROME, reason = "Flaky")
   @Ignore(value = EDGE, reason = "Flaky")
   public void canUsePACThatOnlyProxiesCertainHosts()

java/test/org/openqa/selenium/SlowLoadingPageTest.java

@@ -45,7 +45,7 @@ void testShouldBlockUntilIFramesAreLoaded() {
   }
 
   @Test
-  @Ignore(value = CHROME, travis = true, gitHubActions = true)
+  @Ignore(value = CHROME, gitHubActions = true)
   @Ignore(value = EDGE)
   public void testRefreshShouldBlockUntilPageLoads() {
     long start = System.currentTimeMillis();

java/test/org/openqa/selenium/WindowTest.java

@@ -115,7 +115,6 @@ void testSetsThePositionOfTheCurrentWindow() {
   }
 
   @Test
-  @Ignore(value = CHROME, travis = true)
   @Ignore(value = FIREFOX, gitHubActions = true)
   public void testCanMaximizeTheWindow() {
     // Browser window cannot be resized or moved on ANDROID (and most mobile platforms
@@ -159,7 +158,7 @@ public void testCanMaximizeTheWindowFromIframe() {
   }
 
   @Test
-  @Ignore(travis = true, gitHubActions = true)
+  @Ignore(gitHubActions = true)
   public void canMinimizeTheWindow() {
     // Browser window cannot be resized or moved on ANDROID (and most mobile platforms
     // though others aren't defined in org.openqa.selenium.Platform).
@@ -173,7 +172,6 @@ public void canMinimizeTheWindow() {
   }
 
   @Test
-  @Ignore(value = CHROME, travis = true)
   @Ignore(value = FIREFOX, gitHubActions = true)
   @Ignore(SAFARI)
   public void canFullscreenTheWindow() {
@@ -191,7 +189,6 @@ public void canFullscreenTheWindow() {
 
   @SwitchToTopAfterTest
   @Test
-  @Ignore(value = CHROME, travis = true)
   @Ignore(value = FIREFOX, gitHubActions = true)
   @Ignore(SAFARI)
   public void canFullscreenTheWindowFromFrame() {
@@ -208,7 +205,6 @@ public void canFullscreenTheWindowFromFrame() {
 
   @SwitchToTopAfterTest
   @Test
-  @Ignore(value = CHROME, travis = true)
   @Ignore(value = FIREFOX, gitHubActions = true)
   @Ignore(SAFARI)
   public void canFullscreenTheWindowFromIframe() {

java/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java

@@ -133,7 +133,6 @@ public void testMultipleInputs() {
 
   @Test
   @Ignore(IE)
-  @Ignore(value = FIREFOX, travis = true)
   public void testControlClickingOnMultiSelectionList() {
     assumeFalse(
         getEffectivePlatform(driver).is(Platform.MAC), "FIXME: macs don't have CONTROL key");
@@ -163,7 +162,6 @@ public void testControlClickingOnMultiSelectionList() {
 
   @Test
   @Ignore(IE)
-  @Ignore(value = FIREFOX, travis = true)
   public void testControlClickingOnCustomMultiSelectionList() {
     driver.get(pages.selectableItemsPage);
     Keys key = getEffectivePlatform(driver).is(Platform.MAC) ? Keys.COMMAND : Keys.CONTROL;
@@ -196,7 +194,6 @@ public void testControlClickingOnCustomMultiSelectionList() {
 
   @Test
   @Ignore(IE)
-  @Ignore(value = FIREFOX, travis = true)
   public void testControlClickingWithMultiplePointers() {
     driver.get(pages.selectableItemsPage);
 

java/test/org/openqa/selenium/javascript/ClosureTestStatement.java

@@ -18,7 +18,6 @@
 package org.openqa.selenium.javascript;
 
 import static org.junit.jupiter.api.Assertions.fail;
-import static org.openqa.selenium.testing.TestUtilities.isOnTravis;
 
 import com.google.common.base.Stopwatch;
 import java.net.URL;
@@ -60,13 +59,11 @@ public void evaluate() throws Throwable {
 
     WebDriver driver = driverSupplier.get();
 
-    if (!isOnTravis()) {
-      // Attempt to make the window as big as possible.
-      try {
-        driver.manage().window().maximize();
-      } catch (RuntimeException ignored) {
-        // We tried.
-      }
+    // Attempt to make the window as big as possible.
+    try {
+      driver.manage().window().maximize();
+    } catch (RuntimeException ignored) {
+      // We tried.
     }
 
     JavascriptExecutor executor = (JavascriptExecutor) driver;

java/test/org/openqa/selenium/testing/Ignore.java

@@ -35,7 +35,5 @@
 
   String issue() default "";
 
-  boolean travis() default false;
-
   boolean gitHubActions() default false;
 }

java/test/org/openqa/selenium/testing/IgnoreComparator.java

@@ -52,8 +52,7 @@ public boolean shouldIgnore(Stream<Ignore> ignoreList) {
     return ignoreList.anyMatch(
         driver ->
             (ignored.contains(driver.value()) || driver.value() == Browser.ALL)
-                && ((!driver.travis() || TestUtilities.isOnTravis())
-                    || (!driver.gitHubActions() || TestUtilities.isOnGitHubActions()))
+                && (!driver.gitHubActions() || TestUtilities.isOnGitHubActions())
                 && isOpen(driver.issue()));
   }
 

java/test/org/openqa/selenium/testing/TestUtilities.java

@@ -162,10 +162,6 @@ public static boolean isLocal() {
         || Boolean.getBoolean("selenium.browser.grid"));
   }
 
-  public static boolean isOnTravis() {
-    return Boolean.parseBoolean(System.getenv("TRAVIS"));
-  }
-
   public static boolean isOnGitHubActions() {
     return Boolean.parseBoolean(System.getenv("GITHUB_ACTIONS"));
   }

rb/lib/selenium/webdriver/common/platform.rb

@@ -51,9 +51,7 @@ def os
       end
 
       def ci
-        if ENV['TRAVIS']
-          :travis
-        elsif ENV['JENKINS']
+        if ENV['JENKINS']
           :jenkins
         elsif ENV['APPVEYOR']
           :appveyor