Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion java/test/org/openqa/selenium/ProxySettingTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion java/test/org/openqa/selenium/SlowLoadingPageTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 1 addition & 5 deletions java/test/org/openqa/selenium/WindowTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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).
Expand All @@ -173,7 +172,6 @@ public void canMinimizeTheWindow() {
}

@Test
@Ignore(value = CHROME, travis = true)
@Ignore(value = FIREFOX, gitHubActions = true)
@Ignore(SAFARI)
public void canFullscreenTheWindow() {
Expand All @@ -191,7 +189,6 @@ public void canFullscreenTheWindow() {

@SwitchToTopAfterTest
@Test
@Ignore(value = CHROME, travis = true)
@Ignore(value = FIREFOX, gitHubActions = true)
@Ignore(SAFARI)
public void canFullscreenTheWindowFromFrame() {
Expand All @@ -208,7 +205,6 @@ public void canFullscreenTheWindowFromFrame() {

@SwitchToTopAfterTest
@Test
@Ignore(value = CHROME, travis = true)
@Ignore(value = FIREFOX, gitHubActions = true)
@Ignore(SAFARI)
public void canFullscreenTheWindowFromIframe() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -196,7 +194,6 @@ public void testControlClickingOnCustomMultiSelectionList() {

@Test
@Ignore(IE)
@Ignore(value = FIREFOX, travis = true)
public void testControlClickingWithMultiplePointers() {
driver.get(pages.selectableItemsPage);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions java/test/org/openqa/selenium/testing/Ignore.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,5 @@

String issue() default "";

boolean travis() default false;

boolean gitHubActions() default false;
}
3 changes: 1 addition & 2 deletions java/test/org/openqa/selenium/testing/IgnoreComparator.java
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}

Expand Down
4 changes: 0 additions & 4 deletions java/test/org/openqa/selenium/testing/TestUtilities.java
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}
Expand Down
4 changes: 1 addition & 3 deletions rb/lib/selenium/webdriver/common/platform.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,7 @@ def os
end

def ci
if ENV['TRAVIS']
:travis
elsif ENV['JENKINS']
if ENV['JENKINS']
:jenkins
elsif ENV['APPVEYOR']
:appveyor
Expand Down