Skip to content

Commit d64bcf5

Browse files
diemoldiemol
authored
Merge branch 'trunk' into wait-using-monotonic-clock
2 parents cafbd3f + 49fa97d commit d64bcf5

86 files changed

Lines changed: 1549 additions & 2699 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci-ruby.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
java-version: 11
3939
- uses: ruby/setup-ruby@v1
4040
with:
41-
ruby-version: 2.6
41+
ruby-version: 2.7
4242
- uses: actions/cache@v2
4343
with:
4444
path: |
@@ -67,7 +67,7 @@ jobs:
6767
java-version: 11
6868
- uses: ruby/setup-ruby@v1
6969
with:
70-
ruby-version: 2.6
70+
ruby-version: 2.7
7171
- uses: actions/cache@v2
7272
with:
7373
path: |
@@ -100,7 +100,7 @@ jobs:
100100
java-version: 11
101101
- uses: ruby/setup-ruby@v1
102102
with:
103-
ruby-version: 2.6
103+
ruby-version: 2.7
104104
- uses: actions/cache@v2
105105
with:
106106
path: |
@@ -129,7 +129,7 @@ jobs:
129129
- uses: actions/checkout@v2
130130
- uses: ruby/setup-ruby@v1
131131
with:
132-
ruby-version: 2.6
132+
ruby-version: 2.7
133133
- uses: actions/cache@v2
134134
with:
135135
path: |
@@ -151,7 +151,7 @@ jobs:
151151
- uses: actions/checkout@v2
152152
- uses: ruby/setup-ruby@v1
153153
with:
154-
ruby-version: 2.6
154+
ruby-version: 2.7
155155
- uses: actions/cache@v2
156156
with:
157157
path: |
@@ -172,7 +172,7 @@ jobs:
172172
strategy:
173173
fail-fast: false
174174
matrix:
175-
ruby: [ '2.6', 'jruby-9.3.0.0' ]
175+
ruby: [ '2.7', '3.1' ]
176176
steps:
177177
- uses: actions/checkout@v2
178178
- uses: ruby/setup-ruby@v1

‎common/src/web/webComponents.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
constructor() {
1313
super();
1414
this.attachShadow({ mode: 'open' }).innerHTML = `
15-
<div><input type="checkbox"/></div>
15+
<div><input type="checkbox"/>
16+
<a href="simpleTest.html">Example Link</a>
17+
</div>
1618
`;
1719
}
1820
});

‎java/src/org/openqa/selenium/Platform.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ public Platform family() {
4949
public Platform family() {
5050
return WINDOWS;
5151
}
52+
@Override
53+
public String toString() {
54+
return "Windows XP";
55+
}
5256
},
5357

5458
/**
@@ -59,6 +63,10 @@ public Platform family() {
5963
public Platform family() {
6064
return WINDOWS;
6165
}
66+
@Override
67+
public String toString() {
68+
return "Windows Vista";
69+
}
6270
},
6371

6472
/**
@@ -69,27 +77,43 @@ public Platform family() {
6977
public Platform family() {
7078
return WINDOWS;
7179
}
80+
@Override
81+
public String toString() {
82+
return "Windows 8";
83+
}
7284
},
7385

7486
WIN8_1("windows 8.1", "win8.1") {
7587
@Override
7688
public Platform family() {
7789
return WINDOWS;
7890
}
91+
@Override
92+
public String toString() {
93+
return "Windows 8.1";
94+
}
7995
},
8096

8197
WIN10("windows 10", "win10") {
8298
@Override
8399
public Platform family() {
84100
return WINDOWS;
85101
}
102+
@Override
103+
public String toString() {
104+
return "Windows 10";
105+
}
86106
},
87107

88108
WIN11("windows 11", "win11") {
89109
@Override
90110
public Platform family() {
91111
return WINDOWS;
92112
}
113+
@Override
114+
public String toString() {
115+
return "Windows 11";
116+
}
93117
},
94118

95119
MAC("mac", "darwin", "macOS", "mac os x", "os x") {

‎java/src/org/openqa/selenium/grid/security/BasicAuthenticationFilter.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ public HttpHandler apply(HttpHandler next) {
4242
return req -> {
4343
Require.nonNull("Request", req);
4444

45-
if (!isAuthorized(req.getHeader("Authorization"))) {
46-
LOG.info("Unauthorized request to " + req);
45+
String auth = req.getHeader("Authorization");
46+
if (!isAuthorized(auth)) {
47+
if (auth != null) {
48+
LOG.info("Unauthorized request to " + req);
49+
}
4750
return new HttpResponse()
4851
.setStatus(HttpURLConnection.HTTP_UNAUTHORIZED)
4952
.addHeader("WWW-Authenticate", "Basic realm=\"selenium-server\"");

‎java/test/org/openqa/selenium/remote/DesiredCapabilitiesTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
package org.openqa.selenium.remote;
1919

20-
import static org.assertj.core.api.Assertions.assertThat;
21-
2220
import com.google.common.collect.ImmutableMap;
2321

2422
import org.junit.Test;
@@ -34,6 +32,8 @@
3432
import java.util.concurrent.ConcurrentHashMap;
3533
import java.util.logging.Level;
3634

35+
import static org.assertj.core.api.Assertions.assertThat;
36+
3737
@Category(UnitTests.class)
3838
public class DesiredCapabilitiesTest {
3939

@@ -97,7 +97,7 @@ public void shouldAutomaticallyConvertPlatformFromStringToEnum() {
9797
DesiredCapabilities caps = new DesiredCapabilities();
9898
caps.setCapability(CapabilityType.PLATFORM, "windows 7");
9999
assertThat(caps.getCapability(CapabilityType.PLATFORM)).isEqualTo(Platform.VISTA);
100-
caps.setCapability(CapabilityType.PLATFORM, "WIN8_1");
100+
caps.setCapability(CapabilityType.PLATFORM, "win8.1");
101101
assertThat(caps.getCapability(CapabilityType.PLATFORM)).isEqualTo(Platform.WIN8_1);
102102
}
103103

‎javascript/grid-ui/BUILD.bazel‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ _RUNTIME_DEPS = [
1212
"@npm//@emotion/styled",
1313
"@npm//@mui/icons-material",
1414
"@npm//@mui/material",
15-
"@npm//@mui/styles",
1615
"@npm//@novnc/novnc",
17-
"@npm//clsx",
1816
"@npm//graphql",
1917
"@npm//graphql.macro",
2018
"@npm//pretty-ms",

0 commit comments

Comments
 (0)