diff --git a/.bazelrc b/.bazelrc index 6c7bbee315a23..f9221e462e0c5 100644 --- a/.bazelrc +++ b/.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 diff --git a/java/test/org/openqa/selenium/ProxySettingTest.java b/java/test/org/openqa/selenium/ProxySettingTest.java index d3da50ec06243..a4901b0cee546 100644 --- a/java/test/org/openqa/selenium/ProxySettingTest.java +++ b/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() diff --git a/java/test/org/openqa/selenium/SlowLoadingPageTest.java b/java/test/org/openqa/selenium/SlowLoadingPageTest.java index 46165422f846c..22b88b2e81625 100644 --- a/java/test/org/openqa/selenium/SlowLoadingPageTest.java +++ b/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(); diff --git a/java/test/org/openqa/selenium/WindowTest.java b/java/test/org/openqa/selenium/WindowTest.java index 4b3908a6a180e..a3341f22c2d04 100644 --- a/java/test/org/openqa/selenium/WindowTest.java +++ b/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() { diff --git a/java/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java b/java/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java index d2c985681bda5..a32740f9039c2 100644 --- a/java/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java +++ b/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); diff --git a/java/test/org/openqa/selenium/javascript/ClosureTestStatement.java b/java/test/org/openqa/selenium/javascript/ClosureTestStatement.java index 4fa5aac02dc83..05541d382ec18 100644 --- a/java/test/org/openqa/selenium/javascript/ClosureTestStatement.java +++ b/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; diff --git a/java/test/org/openqa/selenium/testing/Ignore.java b/java/test/org/openqa/selenium/testing/Ignore.java index dd6db5de1021d..32b1dd05079e0 100644 --- a/java/test/org/openqa/selenium/testing/Ignore.java +++ b/java/test/org/openqa/selenium/testing/Ignore.java @@ -35,7 +35,5 @@ String issue() default ""; - boolean travis() default false; - boolean gitHubActions() default false; } diff --git a/java/test/org/openqa/selenium/testing/IgnoreComparator.java b/java/test/org/openqa/selenium/testing/IgnoreComparator.java index 635f1bbace33e..749dd47e6e859 100644 --- a/java/test/org/openqa/selenium/testing/IgnoreComparator.java +++ b/java/test/org/openqa/selenium/testing/IgnoreComparator.java @@ -52,8 +52,7 @@ public boolean shouldIgnore(Stream 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())); } diff --git a/java/test/org/openqa/selenium/testing/TestUtilities.java b/java/test/org/openqa/selenium/testing/TestUtilities.java index 21abfa50b8e77..7ec5fca46520d 100644 --- a/java/test/org/openqa/selenium/testing/TestUtilities.java +++ b/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")); } diff --git a/rb/lib/selenium/webdriver/common/platform.rb b/rb/lib/selenium/webdriver/common/platform.rb index 4d326b9fee5ce..dae3fcd72cb03 100644 --- a/rb/lib/selenium/webdriver/common/platform.rb +++ b/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