Skip to content

Commit 3729158

Browse files
harsha509harsha509
authored
Merge branch 'trunk' into renovate/kotlin-monorepo
2 parents 149a43f + 47280ab commit 3729158

Some content is hidden

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

46 files changed

+355
-501
lines changed

‎examples/dotnet/SeleniumDocs/BiDi/CDP/NetworkTest.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
using OpenQA.Selenium;
55
using OpenQA.Selenium.DevTools;
66
using System.Linq;
7-
using OpenQA.Selenium.DevTools.V130.Network;
8-
using OpenQA.Selenium.DevTools.V130.Performance;
7+
using OpenQA.Selenium.DevTools.V131.Network;
8+
using OpenQA.Selenium.DevTools.V131.Performance;
99

1010

1111
namespace SeleniumDocs.BiDi.CDP
@@ -16,7 +16,7 @@ public class NetworkTest : BaseTest
1616
[TestInitialize]
1717
public void Startup()
1818
{
19-
StartDriver("130");
19+
StartDriver("131");
2020
}
2121

2222
[TestMethod]
@@ -109,9 +109,9 @@ public async Task PerformanceMetrics()
109109
driver.Url = "https://www.selenium.dev/selenium/web/frameset.html";
110110

111111
var session = ((IDevTools)driver).GetDevToolsSession();
112-
var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V130.DevToolsSessionDomains>();
112+
var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V131.DevToolsSessionDomains>();
113113

114-
await domains.Performance.Enable(new OpenQA.Selenium.DevTools.V130.Performance.EnableCommandSettings());
114+
await domains.Performance.Enable(new OpenQA.Selenium.DevTools.V131.Performance.EnableCommandSettings());
115115
var metricsResponse =
116116
await session.SendCommand<GetMetricsCommandSettings, GetMetricsCommandResponse>(
117117
new GetMetricsCommandSettings()
@@ -130,8 +130,8 @@ await session.SendCommand<GetMetricsCommandSettings, GetMetricsCommandResponse>(
130130
public async Task SetCookie()
131131
{
132132
var session = ((IDevTools)driver).GetDevToolsSession();
133-
var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V130.DevToolsSessionDomains>();
134-
await domains.Network.Enable(new OpenQA.Selenium.DevTools.V130.Network.EnableCommandSettings());
133+
var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V131.DevToolsSessionDomains>();
134+
await domains.Network.Enable(new OpenQA.Selenium.DevTools.V131.Network.EnableCommandSettings());
135135

136136
var cookieCommandSettings = new SetCookieCommandSettings
137137
{

‎examples/java/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ repositories {
1111

1212
dependencies {
1313
testImplementation 'org.seleniumhq.selenium:selenium-java:4.27.0'
14-
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.11.3'
14+
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.11.4'
1515
}
1616

1717
test {

‎examples/java/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>org.junit.jupiter</groupId>
4242
<artifactId>junit-jupiter-engine</artifactId>
43-
<version>5.11.3</version>
43+
<version>5.11.4</version>
4444
<scope>test</scope>
4545
</dependency>
4646
<dependency>

‎examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java

-15
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,6 @@ public void setup() {
2727
driver = new FirefoxDriver(options);
2828
}
2929

30-
@Test
31-
public void jsErrors() {
32-
CopyOnWriteArrayList<ConsoleLogEntry> logs = new CopyOnWriteArrayList<>();
33-
34-
try (LogInspector logInspector = new LogInspector(driver)) {
35-
logInspector.onConsoleEntry(logs::add);
36-
}
37-
38-
driver.get("https://www.selenium.dev/selenium/web/bidi/logEntryAdded.html");
39-
driver.findElement(By.id("consoleLog")).click();
40-
41-
new WebDriverWait(driver, Duration.ofSeconds(5)).until(_d -> !logs.isEmpty());
42-
Assertions.assertEquals("Hello, world!", logs.get(0).getText());
43-
}
44-
4530
@Test
4631
void testListenToConsoleLog() throws ExecutionException, InterruptedException, TimeoutException {
4732
try (LogInspector logInspector = new LogInspector(driver)) {

‎examples/java/src/test/java/dev/selenium/browsers/FirefoxTest.java

+12
Original file line numberDiff line numberDiff line change
@@ -205,4 +205,16 @@ public void setContext() {
205205

206206
driver.quit();
207207
}
208+
209+
@Test
210+
public void firefoxProfile() {
211+
FirefoxProfile profile = new FirefoxProfile();
212+
FirefoxOptions options = new FirefoxOptions();
213+
profile.setPreference("javascript.enabled", "False");
214+
options.setProfile(profile);
215+
216+
driver = new FirefoxDriver(options);
217+
218+
driver.quit();
219+
}
208220
}

‎examples/kotlin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<slf4j.version>2.0.16</slf4j.version>
1515
<logback.version>1.5.12</logback.version>
1616

17-
<junit5.version>5.11.3</junit5.version>
17+
<junit5.version>5.11.4</junit5.version>
1818
<wdm.version>5.2.3</wdm.version>
1919

2020
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>

‎examples/python/tests/browsers/test_firefox.py

+14
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,17 @@ def test_set_context(firefox_driver):
151151

152152
# Check if the context is back to content
153153
assert driver.execute("GET_CONTEXT")["value"] == "content"
154+
155+
156+
def test_firefox_profile():
157+
from selenium.webdriver.firefox.options import Options
158+
from selenium.webdriver.firefox.firefox_profile import FirefoxProfile
159+
160+
options = Options()
161+
firefox_profile = FirefoxProfile()
162+
firefox_profile.set_preference("javascript.enabled", False)
163+
options.profile = firefox_profile
164+
165+
driver = webdriver.Firefox(options=options)
166+
167+
driver.quit()

‎examples/python/tests/elements/test_information.py

+45
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,47 @@
11
from selenium import webdriver
2+
from selenium.webdriver.common.by import By
23

4+
import pytest
5+
6+
7+
def test_informarion():
8+
# Initialize WebDriver
9+
driver = webdriver.Chrome()
10+
driver.implicitly_wait(0.5)
11+
12+
driver.get("https://www.selenium.dev/selenium/web/inputs.html")
13+
14+
# isDisplayed
15+
is_email_visible = driver.find_element(By.NAME, "email_input").is_displayed()
16+
assert is_email_visible == True
17+
18+
# isEnabled
19+
is_enabled_button = driver.find_element(By.NAME, "button_input").is_enabled()
20+
assert is_enabled_button == True
21+
22+
# isSelected
23+
is_selected_check = driver.find_element(By.NAME, "checkbox_input").is_selected()
24+
assert is_selected_check == True
25+
26+
# TagName
27+
tag_name_inp = driver.find_element(By.NAME, "email_input").tag_name
28+
assert tag_name_inp == "input"
29+
30+
# GetRect
31+
rect = driver.find_element(By.NAME, "range_input").rect
32+
assert rect["x"] == 10
33+
34+
# CSS Value
35+
css_value = driver.find_element(By.NAME, "color_input").value_of_css_property(
36+
"font-size"
37+
)
38+
assert css_value == "13.3333px"
39+
40+
# GetText
41+
text = driver.find_element(By.TAG_NAME, "h1").text
42+
assert text == "Testing Inputs"
43+
44+
# FetchAttributes
45+
email_txt = driver.find_element(By.NAME, "email_input")
46+
value_info = email_txt.get_attribute("value")
47+
assert value_info == "admin@localhost"

‎examples/python/tests/interactions/test_virtual_authenticator.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def test_virtual_authenticator_options():
4848
assert len(options.to_dict()) == 6
4949

5050

51-
def test_create_authenticator(driver):
51+
def test_add_authenticator(driver):
5252
# Create virtual authenticator options
5353
options = VirtualAuthenticatorOptions()
5454
options.protocol = VirtualAuthenticatorOptions.Protocol.U2F
@@ -93,7 +93,7 @@ def test_create_and_add_resident_key(driver):
9393
privatekey = urlsafe_b64decode(BASE64__ENCODED_PK)
9494
sign_count = 0
9595

96-
# create a resident credential using above parameters
96+
# create a resident credential using above parameters
9797
resident_credential = Credential.create_resident_credential(credential_id, rp_id, user_handle, privatekey, sign_count)
9898

9999
# add the credential created to virtual authenticator

‎examples/ruby/Gemfile.lock

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ GEM
44
ast (2.4.2)
55
base64 (0.2.0)
66
diff-lcs (1.5.1)
7-
json (2.7.5)
7+
json (2.9.0)
88
language_server-protocol (3.17.0.3)
99
logger (1.6.1)
1010
parallel (1.26.3)
11-
parser (3.3.5.0)
11+
parser (3.3.6.0)
1212
ast (~> 2.4.1)
1313
racc
1414
racc (1.8.1)
1515
rainbow (3.1.1)
1616
rake (13.2.1)
17-
regexp_parser (2.9.2)
17+
regexp_parser (2.9.3)
1818
rexml (3.3.9)
1919
rspec (3.13.0)
2020
rspec-core (~> 3.13.0)
@@ -29,19 +29,19 @@ GEM
2929
diff-lcs (>= 1.2.0, < 2.0)
3030
rspec-support (~> 3.13.0)
3131
rspec-support (3.13.0)
32-
rubocop (1.68.0)
32+
rubocop (1.69.2)
3333
json (~> 2.3)
3434
language_server-protocol (>= 3.17.0)
3535
parallel (~> 1.10)
3636
parser (>= 3.3.0.2)
3737
rainbow (>= 2.2.2, < 4.0)
38-
regexp_parser (>= 2.4, < 3.0)
39-
rubocop-ast (>= 1.32.2, < 2.0)
38+
regexp_parser (>= 2.9.3, < 3.0)
39+
rubocop-ast (>= 1.36.2, < 2.0)
4040
ruby-progressbar (~> 1.7)
41-
unicode-display_width (>= 2.4.0, < 3.0)
42-
rubocop-ast (1.33.0)
41+
unicode-display_width (>= 2.4.0, < 4.0)
42+
rubocop-ast (1.36.2)
4343
parser (>= 3.3.1.0)
44-
rubocop-rspec (3.2.0)
44+
rubocop-rspec (3.3.0)
4545
rubocop (~> 1.61)
4646
ruby-progressbar (1.13.0)
4747
rubyzip (2.3.2)

‎website_and_docs/content/documentation/webdriver/bidi/w3c/log.en.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Listen to the `console.log` events and register callbacks to process the event.
1616
{{< tabpane text=true >}}
1717
{{< tab header="Java" >}}
1818
{{< badge-version version="4.8" >}}
19-
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L31-L38" >}}
19+
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L33-L39" >}}
2020
{{< /tab >}}
2121
{{< tab header="Ruby" >}}
2222
{{< badge-code >}}
@@ -36,7 +36,7 @@ and register callbacks to process the exception details.
3636

3737
{{< tabpane text=true >}}
3838
{{< tab header="Java" >}}
39-
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L70-L77" >}}
39+
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L73-L78" >}}
4040
{{< /tab >}}
4141
{{< tab header="Ruby" >}}
4242
{{< badge-code >}}
@@ -56,7 +56,7 @@ Listen to all JS logs at all levels and register callbacks to process the log.
5656
{{< tabpane text=true >}}
5757
{{< tab header="Java" >}}
5858
{{< badge-version version="4.8" >}}
59-
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L52-L59" >}}
59+
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L55-L60" >}}
6060
{{< /tab >}}
6161
{{< tab header="Ruby" >}}
6262
{{< badge-code >}}

‎website_and_docs/content/documentation/webdriver/bidi/w3c/log.ja.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Listen to the `console.log` events and register callbacks to process the event.
2222
{{< tabpane text=true >}}
2323
{{< tab header="Java" >}}
2424
{{< badge-version version="4.8" >}}
25-
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L31-L38" >}}
25+
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L33-L39" >}}
2626
{{< /tab >}}
2727
{{< tab header="Ruby" >}}
2828
{{< badge-code >}}
@@ -42,7 +42,7 @@ and register callbacks to process the exception details.
4242

4343
{{< tabpane text=true >}}
4444
{{< tab header="Java" >}}
45-
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L70-L77" >}}
45+
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L73-L78" >}}
4646
{{< /tab >}}
4747
{{< tab header="Ruby" >}}
4848
{{< badge-code >}}
@@ -62,7 +62,7 @@ Listen to all JS logs at all levels and register callbacks to process the log.
6262
{{< tabpane text=true >}}
6363
{{< tab header="Java" >}}
6464
{{< badge-version version="4.8" >}}
65-
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L52-L59" >}}
65+
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L55-L60" >}}
6666
{{< /tab >}}
6767
{{< tab header="Ruby" >}}
6868
{{< badge-code >}}

‎website_and_docs/content/documentation/webdriver/bidi/w3c/log.pt-br.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Listen to the `console.log` events and register callbacks to process the event.
2222
{{< tabpane text=true >}}
2323
{{< tab header="Java" >}}
2424
{{< badge-version version="4.8" >}}
25-
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L31-L38" >}}
25+
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L33-L39" >}}
2626
{{< /tab >}}
2727
{{< tab header="Ruby" >}}
2828
{{< badge-code >}}
@@ -42,7 +42,7 @@ and register callbacks to process the exception details.
4242

4343
{{< tabpane text=true >}}
4444
{{< tab header="Java" >}}
45-
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L70-L77" >}}
45+
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L73-L78" >}}
4646
{{< /tab >}}
4747
{{< tab header="Ruby" >}}
4848
{{< badge-code >}}
@@ -62,7 +62,7 @@ Listen to all JS logs at all levels and register callbacks to process the log.
6262
{{< tabpane text=true >}}
6363
{{< tab header="Java" >}}
6464
{{< badge-version version="4.8" >}}
65-
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L52-L59" >}}
65+
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L55-L60" >}}
6666
{{< /tab >}}
6767
{{< tab header="Ruby" >}}
6868
{{< badge-code >}}

‎website_and_docs/content/documentation/webdriver/bidi/w3c/log.zh-cn.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ Listen to the `console.log` events and register callbacks to process the event.
2222

2323
{{< tabpane text=true >}}
2424
{{< tab header="Java" >}}
25-
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L31-L38" >}}
25+
{{< badge-version version="4.8" >}}
26+
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L33-L39" >}}
2627
{{< /tab >}}
2728
{{< tab header="Ruby" >}}
2829
{{< badge-code >}}
2930
{{< /tab >}}
3031
{{< tab header="JavaScript" >}}
31-
{{< badge-version version="4.8" >}}
3232
{{< gh-codeblock path="/examples/javascript/test/bidirectional/logInspector.spec.js#L23-37" >}}
3333
{{< /tab >}}
3434
{{< tab header="Kotlin" >}}
@@ -43,13 +43,12 @@ and register callbacks to process the exception details.
4343

4444
{{< tabpane text=true >}}
4545
{{< tab header="Java" >}}
46-
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L70-L77" >}}
46+
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L73-L78" >}}
4747
{{< /tab >}}
4848
{{< tab header="Ruby" >}}
4949
{{< badge-code >}}
5050
{{< /tab >}}
5151
{{< tab header="JavaScript" >}}
52-
{{< badge-version version="4.8" >}}
5352
{{< gh-codeblock path="/examples/javascript/test/bidirectional/logInspector.spec.js#L44-54" >}}
5453
{{< /tab >}}
5554
{{< tab header="Kotlin" >}}
@@ -63,7 +62,8 @@ Listen to all JS logs at all levels and register callbacks to process the log.
6362

6463
{{< tabpane text=true >}}
6564
{{< tab header="Java" >}}
66-
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L52-L59" >}}
65+
{{< badge-version version="4.8" >}}
66+
{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LogTest.java#L55-L60" >}}
6767
{{< /tab >}}
6868
{{< tab header="Ruby" >}}
6969
{{< badge-code >}}

0 commit comments

Comments
 (0)