Skip to content

Commit 1e7c007

Browse files
authored
Merge branch 'trunk' into renovate/selenium-webdriver-4.x
2 parents c558a2f + fc1ed22 commit 1e7c007

File tree

14 files changed

+55
-34
lines changed

14 files changed

+55
-34
lines changed

examples/ruby/spec/browsers/chrome_spec.rb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,15 @@
135135
end
136136
end
137137

138+
it 'gets the browser logs' do
139+
@driver = Selenium::WebDriver.for :chrome
140+
@driver.navigate.to 'https://www.selenium.dev/selenium/web/'
141+
sleep 1
142+
logs = @driver.logs.get(:browser)
143+
144+
expect(logs.first.message).to include 'Failed to load resource'
145+
end
146+
138147
def driver_finder
139148
options = Selenium::WebDriver::Options.chrome(browser_version: 'stable')
140149
service = Selenium::WebDriver::Service.chrome

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/selenium_manager.en.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ Let's consider an example. A Selenium binding asks Selenium Manager to resolve c
159159

160160
Selenium Manager includes two additional arguments two handle the cache, namely:
161161

162-
- `--clear-cache`: To remove the cache folder.
163-
- `--clear-metadata`: To remove the metadata file.
162+
- `--clear-cache`: To remove the cache folder (equivalent to the environment variable `SE_CLEAR_CACHE=true`).
163+
- `--clear-metadata`: To remove the metadata file (equivalent to the environment variable `SE_CLEAR_METADATA=true`).
164164

165165
## Versioning
166166
Selenium Manager follows the same versioning schema as Selenium. Nevertheless, we use the major version 0 for Selenium Manager releases because it is still in beta. For example, the Selenium Manager binaries shipped with Selenium 4.12.0 corresponds to version 0.4.12.

website_and_docs/content/documentation/selenium_manager.ja.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ Let's consider an example. A Selenium binding asks Selenium Manager to resolve c
159159

160160
Selenium Manager includes two additional arguments two handle the cache, namely:
161161

162-
- `--clear-cache`: To remove the cache folder.
163-
- `--clear-metadata`: To remove the metadata file.
162+
- `--clear-cache`: To remove the cache folder (equivalent to the environment variable `SE_CLEAR_CACHE=true`).
163+
- `--clear-metadata`: To remove the metadata file (equivalent to the environment variable `SE_CLEAR_METADATA=true`).
164164

165165
## Versioning
166166
Selenium Manager follows the same versioning schema as Selenium. Nevertheless, we use the major version 0 for Selenium Manager releases because it is still in beta. For example, the Selenium Manager binaries shipped with Selenium 4.12.0 corresponds to version 0.4.12.

website_and_docs/content/documentation/selenium_manager.pt-br.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ Let's consider an example. A Selenium binding asks Selenium Manager to resolve c
159159

160160
Selenium Manager includes two additional arguments two handle the cache, namely:
161161

162-
- `--clear-cache`: To remove the cache folder.
163-
- `--clear-metadata`: To remove the metadata file.
162+
- `--clear-cache`: To remove the cache folder (equivalent to the environment variable `SE_CLEAR_CACHE=true`).
163+
- `--clear-metadata`: To remove the metadata file (equivalent to the environment variable `SE_CLEAR_METADATA=true`).
164164

165165
## Versioning
166166
Selenium Manager follows the same versioning schema as Selenium. Nevertheless, we use the major version 0 for Selenium Manager releases because it is still in beta. For example, the Selenium Manager binaries shipped with Selenium 4.12.0 corresponds to version 0.4.12.

website_and_docs/content/documentation/selenium_manager.zh-cn.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ Let's consider an example. A Selenium binding asks Selenium Manager to resolve c
159159

160160
Selenium Manager includes two additional arguments two handle the cache, namely:
161161

162-
- `--clear-cache`: To remove the cache folder.
163-
- `--clear-metadata`: To remove the metadata file.
162+
- `--clear-cache`: To remove the cache folder (equivalent to the environment variable `SE_CLEAR_CACHE=true`).
163+
- `--clear-metadata`: To remove the metadata file (equivalent to the environment variable `SE_CLEAR_METADATA=true`).
164164

165165
## Versioning
166166
Selenium Manager follows the same versioning schema as Selenium. Nevertheless, we use the major version 0 for Selenium Manager releases because it is still in beta. For example, the Selenium Manager binaries shipped with Selenium 4.12.0 corresponds to version 0.4.12.

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

Lines changed: 1 addition & 1 deletion
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#L142" >}}
432432
{{< /tab >}}
433433
{{< tab header="JavaScript" >}}
434434
{{< badge-code >}}

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

Lines changed: 1 addition & 1 deletion
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#L142" >}}
438438
{{< /tab >}}
439439
{{< tab header="JavaScript" >}}
440440
{{< badge-code >}}

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

Lines changed: 1 addition & 1 deletion
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#L142" >}}
435435
{{< /tab >}}
436436
{{< tab header="JavaScript" >}}
437437
{{< badge-code >}}

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

Lines changed: 1 addition & 1 deletion
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#L142" >}}
434434
{{< /tab >}}
435435
{{< tab header="JavaScript" >}}
436436
{{< badge-code >}}

website_and_docs/layouts/partials/announcement-banner.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<div class="row g-0 justify-content-center">
77
<div class="alert alert-{{ $color }} col-12 fade show mb-0 p-0 -bg-{{ $color }}" role="alert">
88
<h4 class="alert-heading text-center m-0">
9-
Selenium Conf 2024 Call for Proposals is now open! Submissions close 30 April.
10-
<a href="https://2024.seleniumconf.in/submit-a-proposal/?utm_medium=referral&utm_source=selenium.dev&utm_campaign=CFP-launch&utm_content=cfp-page" target='_blank' aria-pressed="true">Learn more & submit</a>
9+
Registrations open for Selenium Conf 2024 online - live on 21 June.
10+
<a href="https://2024.seleniumconf.in/?utm_medium=referral&utm_source=selenium.dev&utm_campaign=registration" target='_blank' aria-pressed="true"> Register now!</a>
1111
</h4>
1212
</div>
1313
</div>

0 commit comments

Comments
 (0)