Skip to content

Commit b8b73c1

Browse files
barancevbarancev
committed
[java] Run browsers in xvfb instead of headless
1 parent b7ef89b commit b8b73c1

4 files changed

Lines changed: 19 additions & 14 deletions

File tree

‎.github/workflows/java.yml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,14 @@ jobs:
115115
java-version: '11'
116116
- name: Setup Chrome and chromedriver
117117
uses: ./.github/actions/setup-chrome
118+
- name: Start XVFB
119+
run: Xvfb :99 &
118120
- name: Run browser tests in Chrome
119121
uses: ./.github/actions/bazel-test
120122
with:
121123
query: attr(tags, chrome, tests(//java/client/...)) except attr(tags, remote, tests(//java/client/...))
124+
env:
125+
DISPLAY: :99
122126

123127
firefox_tests:
124128
needs: small_tests
@@ -144,10 +148,14 @@ jobs:
144148
java-version: '11'
145149
- name: Setup Firefox and geckodriver
146150
uses: ./.github/actions/setup-firefox
151+
- name: Start XVFB
152+
run: Xvfb :99 &
147153
- name: Run browser tests in Firefox
148154
uses: ./.github/actions/bazel-test
149155
with:
150156
query: attr(tags, firefox, tests(//java/client/...)) except attr(tags, remote, tests(//java/client/...))
157+
env:
158+
DISPLAY: :99
151159

152160

153161
server_tests:
@@ -176,9 +184,11 @@ jobs:
176184
uses: ./.github/actions/setup-chrome
177185
- name: Setup Firefox and geckodriver
178186
uses: ./.github/actions/setup-firefox
187+
- name: Start XVFB
188+
run: Xvfb :99 &
179189
- name: Run server tests
180-
env:
181-
MOZ_HEADLESS: 1
182190
uses: ./.github/actions/bazel-test
183191
with:
184192
query: tests(//java/server/...) except attr(tags, 'lint|ie|edge|edgehtml|safari', tests(//java/server/...))
193+
env:
194+
DISPLAY: :99

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public void testSetsThePositionOfTheCurrentWindow() {
119119
}
120120

121121
@Test
122-
@Ignore(value = CHROME, travis = true, gitHubActions = true)
122+
@Ignore(value = CHROME, travis = true)
123123
@Ignore(EDGE)
124124
public void testCanMaximizeTheWindow() {
125125
// Browser window cannot be resized or moved on ANDROID (and most mobile platforms
@@ -132,7 +132,7 @@ public void testCanMaximizeTheWindow() {
132132

133133
@SwitchToTopAfterTest
134134
@Test
135-
@Ignore(value = CHROME, travis = true, gitHubActions = true)
135+
@Ignore(value = CHROME, travis = true)
136136
@Ignore(EDGE)
137137
public void testCanMaximizeTheWindowFromFrame() {
138138
// Browser window cannot be resized or moved on ANDROID (and most mobile platforms
@@ -148,7 +148,7 @@ public void testCanMaximizeTheWindowFromFrame() {
148148

149149
@SwitchToTopAfterTest
150150
@Test
151-
@Ignore(value = CHROME, travis = true, gitHubActions = true)
151+
@Ignore(value = CHROME, travis = true)
152152
@Ignore(EDGE)
153153
public void testCanMaximizeTheWindowFromIframe() {
154154
// Browser window cannot be resized or moved on ANDROID (and most mobile platforms
@@ -175,7 +175,7 @@ public void canMinimizeTheWindow() {
175175
}
176176

177177
@Test
178-
@Ignore(value = CHROME, travis = true, gitHubActions = true)
178+
@Ignore(value = CHROME, travis = true)
179179
@Ignore(SAFARI)
180180
@Ignore(EDGE)
181181
public void canFullscreenTheWindow() {
@@ -189,7 +189,7 @@ public void canFullscreenTheWindow() {
189189

190190
@SwitchToTopAfterTest
191191
@Test
192-
@Ignore(value = CHROME, travis = true, gitHubActions = true)
192+
@Ignore(value = CHROME, travis = true)
193193
@Ignore(SAFARI)
194194
@Ignore(EDGE)
195195
public void canFullscreenTheWindowFromFrame() {
@@ -206,7 +206,7 @@ public void canFullscreenTheWindowFromFrame() {
206206

207207
@SwitchToTopAfterTest
208208
@Test
209-
@Ignore(value = CHROME, travis = true, gitHubActions = true)
209+
@Ignore(value = CHROME, travis = true)
210210
@Ignore(SAFARI)
211211
@Ignore(EDGE)
212212
public void canFullscreenTheWindowFromIframe() {

‎java/client/test/org/openqa/selenium/testing/drivers/TestChromeDriver.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ private static ChromeDriverService getService() {
6565

6666
private static ChromeOptions chromeWithCustomCapabilities(Capabilities originalCapabilities) {
6767
ChromeOptions options = new ChromeOptions();
68-
if (Boolean.parseBoolean(System.getenv("GITHUB_ACTIONS"))) {
69-
options.setHeadless(true);
70-
}
7168
options.addArguments("disable-extensions", "disable-infobars", "disable-breakpad", "disable-dev-shm-usage", "no-sandbox");
7269
Map<String, Object> prefs = new HashMap<>();
7370
prefs.put("exit_type", "None");

‎java/client/test/org/openqa/selenium/testing/drivers/WebDriverBuilder.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,7 @@ static void addShutdownAction(Runnable action) {
6666
.setLegacy(true)
6767
.setHeadless(Boolean.parseBoolean(System.getProperty("webdriver.firefox.headless", "false"))))
6868
.put(Browser.MARIONETTE, original -> new FirefoxOptions(original)
69-
.setHeadless(
70-
Boolean.parseBoolean(System.getProperty("webdriver.firefox.headless", "false")) ||
71-
Boolean.parseBoolean(System.getenv("GITHUB_ACTIONS")))
69+
.setHeadless(Boolean.parseBoolean(System.getProperty("webdriver.firefox.headless", "false")))
7270
)
7371
.put(Browser.IE, original -> {
7472
InternetExplorerOptions options = new InternetExplorerOptions(original);

0 commit comments

Comments
 (0)