Skip to content

Commit 392b9a3

Browse files
diemoldiemol
authored
Merge branch 'trunk' into renovate/selenium.version
2 parents b9f6252 + e3fadcc commit 392b9a3

File tree

10 files changed

+65
-29
lines changed

10 files changed

+65
-29
lines changed

‎examples/kotlin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<version>1.0.0</version>
1010

1111
<properties>
12-
<kotlin.version>1.9.24</kotlin.version>
12+
<kotlin.version>2.0.0</kotlin.version>
1313

1414
<slf4j.version>2.0.13</slf4j.version>
1515
<logback.version>1.5.6</logback.version>

‎examples/ruby/spec/browsers/chrome_spec.rb

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,25 @@
133133
'download_throughput' => 200,
134134
'upload_throughput' => 200)
135135
end
136+
137+
it 'gets the browser logs' do
138+
@driver = Selenium::WebDriver.for :chrome
139+
@driver.navigate.to 'https://www.selenium.dev/selenium/web/'
140+
sleep 1
141+
logs = @driver.logs.get(:browser)
142+
143+
expect(logs.first.message).to include 'Failed to load resource'
144+
end
145+
146+
it 'sets permissions' do
147+
@driver = Selenium::WebDriver.for :chrome
148+
@driver.navigate.to 'https://www.selenium.dev/selenium/web/'
149+
@driver.add_permission('camera', 'denied')
150+
@driver.add_permissions('clipboard-read' => 'denied', 'clipboard-write' => 'prompt')
151+
expect(permission('camera')).to eq('denied')
152+
expect(permission('clipboard-read')).to eq('denied')
153+
expect(permission('clipboard-write')).to eq('prompt')
154+
end
136155
end
137156

138157
def driver_finder
@@ -142,4 +161,9 @@ def driver_finder
142161
ENV['CHROMEDRIVER_BIN'] = finder.driver_path
143162
ENV['CHROME_BIN'] = finder.browser_path
144163
end
164+
165+
def permission(name)
166+
@driver.execute_async_script('callback = arguments[arguments.length - 1];' \
167+
'callback(navigator.permissions.query({name: arguments[0]}));', name)['state']
168+
end
145169
end

‎website_and_docs/content/documentation/grid/advanced_features/customize_node.en.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,23 +95,26 @@ public class DecoratedLoggingNode extends Node {
9595

9696
private Node node;
9797

98-
protected DecoratedLoggingNode(Tracer tracer, NodeId nodeId, URI uri, Secret registrationSecret) {
99-
super(tracer, nodeId, uri, registrationSecret);
98+
protected DecoratedLoggingNode(Tracer tracer, NodeId nodeId, URI uri, Secret registrationSecret, Duration sessionTimeout) {
99+
super(tracer, nodeId, uri, registrationSecret, sessionTimeout);
100100
}
101101

102102
public static Node create(Config config) {
103103
LoggingOptions loggingOptions = new LoggingOptions(config);
104104
BaseServerOptions serverOptions = new BaseServerOptions(config);
105105
URI uri = serverOptions.getExternalUri();
106106
SecretOptions secretOptions = new SecretOptions(config);
107+
NodeOptions nodeOptions = new NodeOptions(config);
108+
Duration sessionTimeout = nodeOptions.getSessionTimeout();
107109

108110
// Refer to the foot notes for additional context on this line.
109111
Node node = LocalNodeFactory.create(config);
110112

111113
DecoratedLoggingNode wrapper = new DecoratedLoggingNode(loggingOptions.getTracer(),
112-
node.getId(),
113-
uri,
114-
secretOptions.getRegistrationSecret());
114+
node.getId(),
115+
uri,
116+
secretOptions.getRegistrationSecret(),
117+
sessionTimeout);
115118
wrapper.node = node;
116119
return wrapper;
117120
}

‎website_and_docs/content/documentation/grid/advanced_features/customize_node.ja.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,23 +100,26 @@ public class DecoratedLoggingNode extends Node {
100100

101101
private Node node;
102102

103-
protected DecoratedLoggingNode(Tracer tracer, NodeId nodeId, URI uri, Secret registrationSecret) {
104-
super(tracer, nodeId, uri, registrationSecret);
103+
protected DecoratedLoggingNode(Tracer tracer, NodeId nodeId, URI uri, Secret registrationSecret, Duration sessionTimeout) {
104+
super(tracer, nodeId, uri, registrationSecret, sessionTimeout);
105105
}
106106

107107
public static Node create(Config config) {
108108
LoggingOptions loggingOptions = new LoggingOptions(config);
109109
BaseServerOptions serverOptions = new BaseServerOptions(config);
110110
URI uri = serverOptions.getExternalUri();
111111
SecretOptions secretOptions = new SecretOptions(config);
112+
NodeOptions nodeOptions = new NodeOptions(config);
113+
Duration sessionTimeout = nodeOptions.getSessionTimeout();
112114

113115
// Refer to the foot notes for additional context on this line.
114116
Node node = LocalNodeFactory.create(config);
115117

116118
DecoratedLoggingNode wrapper = new DecoratedLoggingNode(loggingOptions.getTracer(),
117-
node.getId(),
118-
uri,
119-
secretOptions.getRegistrationSecret());
119+
node.getId(),
120+
uri,
121+
secretOptions.getRegistrationSecret(),
122+
sessionTimeout);
120123
wrapper.node = node;
121124
return wrapper;
122125
}

‎website_and_docs/content/documentation/grid/advanced_features/customize_node.pt-br.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,23 +90,26 @@ public class DecoratedLoggingNode extends Node {
9090

9191
private Node node;
9292

93-
protected DecoratedLoggingNode(Tracer tracer, NodeId nodeId, URI uri, Secret registrationSecret) {
94-
super(tracer, nodeId, uri, registrationSecret);
93+
protected DecoratedLoggingNode(Tracer tracer, NodeId nodeId, URI uri, Secret registrationSecret, Duration sessionTimeout) {
94+
super(tracer, nodeId, uri, registrationSecret, sessionTimeout);
9595
}
9696

9797
public static Node create(Config config) {
9898
LoggingOptions loggingOptions = new LoggingOptions(config);
9999
BaseServerOptions serverOptions = new BaseServerOptions(config);
100100
URI uri = serverOptions.getExternalUri();
101101
SecretOptions secretOptions = new SecretOptions(config);
102+
NodeOptions nodeOptions = new NodeOptions(config);
103+
Duration sessionTimeout = nodeOptions.getSessionTimeout();
102104

103105
// Refer to the foot notes for additional context on this line.
104106
Node node = LocalNodeFactory.create(config);
105107

106108
DecoratedLoggingNode wrapper = new DecoratedLoggingNode(loggingOptions.getTracer(),
107-
node.getId(),
108-
uri,
109-
secretOptions.getRegistrationSecret());
109+
node.getId(),
110+
uri,
111+
secretOptions.getRegistrationSecret(),
112+
sessionTimeout);
110113
wrapper.node = node;
111114
return wrapper;
112115
}

‎website_and_docs/content/documentation/grid/advanced_features/customize_node.zh-cn.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,23 +100,26 @@ public class DecoratedLoggingNode extends Node {
100100

101101
private Node node;
102102

103-
protected DecoratedLoggingNode(Tracer tracer, NodeId nodeId, URI uri, Secret registrationSecret) {
104-
super(tracer, nodeId, uri, registrationSecret);
103+
protected DecoratedLoggingNode(Tracer tracer, NodeId nodeId, URI uri, Secret registrationSecret, Duration sessionTimeout) {
104+
super(tracer, nodeId, uri, registrationSecret, sessionTimeout);
105105
}
106106

107107
public static Node create(Config config) {
108108
LoggingOptions loggingOptions = new LoggingOptions(config);
109109
BaseServerOptions serverOptions = new BaseServerOptions(config);
110110
URI uri = serverOptions.getExternalUri();
111111
SecretOptions secretOptions = new SecretOptions(config);
112+
NodeOptions nodeOptions = new NodeOptions(config);
113+
Duration sessionTimeout = nodeOptions.getSessionTimeout();
112114

113115
// Refer to the foot notes for additional context on this line.
114116
Node node = LocalNodeFactory.create(config);
115117

116118
DecoratedLoggingNode wrapper = new DecoratedLoggingNode(loggingOptions.getTracer(),
117-
node.getId(),
118-
uri,
119-
secretOptions.getRegistrationSecret());
119+
node.getId(),
120+
uri,
121+
secretOptions.getRegistrationSecret(),
122+
sessionTimeout);
120123
wrapper.node = node;
121124
return wrapper;
122125
}

‎website_and_docs/content/documentation/webdriver/browsers/chrome.en.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ You can simulate various network conditions.
428428
{{< badge-code >}}
429429
{{< /tab >}}
430430
{{< tab header="Ruby" >}}
431-
{{< badge-code >}}
431+
{{< gh-codeblock path="/examples/ruby/spec/browsers/chrome_spec.rb#L141" >}}
432432
{{< /tab >}}
433433
{{< tab header="JavaScript" >}}
434434
{{< badge-code >}}
@@ -451,7 +451,7 @@ You can simulate various network conditions.
451451
{{< badge-code >}}
452452
{{< /tab >}}
453453
{{< tab header="Ruby" >}}
454-
{{< badge-code >}}
454+
{{< gh-codeblock path="/examples/ruby/spec/browsers/chrome_spec.rb#L149-L150" >}}
455455
{{< /tab >}}
456456
{{< tab header="JavaScript" >}}
457457
{{< badge-code >}}

‎website_and_docs/content/documentation/webdriver/browsers/chrome.ja.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ please refer to the
434434
{{< badge-code >}}
435435
{{< /tab >}}
436436
{{< tab header="Ruby" >}}
437-
{{< badge-code >}}
437+
{{< gh-codeblock path="/examples/ruby/spec/browsers/chrome_spec.rb#L141" >}}
438438
{{< /tab >}}
439439
{{< tab header="JavaScript" >}}
440440
{{< badge-code >}}
@@ -457,7 +457,7 @@ please refer to the
457457
{{< badge-code >}}
458458
{{< /tab >}}
459459
{{< tab header="Ruby" >}}
460-
{{< badge-code >}}
460+
{{< gh-codeblock path="/examples/ruby/spec/browsers/chrome_spec.rb#L149-L150" >}}
461461
{{< /tab >}}
462462
{{< tab header="JavaScript" >}}
463463
{{< badge-code >}}

‎website_and_docs/content/documentation/webdriver/browsers/chrome.pt-br.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ please refer to the
431431
{{< badge-code >}}
432432
{{< /tab >}}
433433
{{< tab header="Ruby" >}}
434-
{{< badge-code >}}
434+
{{< gh-codeblock path="/examples/ruby/spec/browsers/chrome_spec.rb#L141" >}}
435435
{{< /tab >}}
436436
{{< tab header="JavaScript" >}}
437437
{{< badge-code >}}
@@ -454,7 +454,7 @@ please refer to the
454454
{{< badge-code >}}
455455
{{< /tab >}}
456456
{{< tab header="Ruby" >}}
457-
{{< badge-code >}}
457+
{{< gh-codeblock path="/examples/ruby/spec/browsers/chrome_spec.rb#L149-L150" >}}
458458
{{< /tab >}}
459459
{{< tab header="JavaScript" >}}
460460
{{< badge-code >}}

‎website_and_docs/content/documentation/webdriver/browsers/chrome.zh-cn.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ please refer to the
430430
{{< badge-code >}}
431431
{{< /tab >}}
432432
{{< tab header="Ruby" >}}
433-
{{< badge-code >}}
433+
{{< gh-codeblock path="/examples/ruby/spec/browsers/chrome_spec.rb#L141" >}}
434434
{{< /tab >}}
435435
{{< tab header="JavaScript" >}}
436436
{{< badge-code >}}
@@ -453,7 +453,7 @@ please refer to the
453453
{{< badge-code >}}
454454
{{< /tab >}}
455455
{{< tab header="Ruby" >}}
456-
{{< badge-code >}}
456+
{{< gh-codeblock path="/examples/ruby/spec/browsers/chrome_spec.rb#L149-L150" >}}
457457
{{< /tab >}}
458458
{{< tab header="JavaScript" >}}
459459
{{< badge-code >}}

0 commit comments

Comments
 (0)