Skip to content

Commit 4984152

Browse files
pmartinez1pmartinez1
authored
Merge branch 'trunk' into update-python-locators-docs
2 parents 1aac7de + e1fa2da commit 4984152

File tree

78 files changed

+854
-185
lines changed

Some content is hidden

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

78 files changed

+854
-185
lines changed

‎.github/workflows/dotnet-examples.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ jobs:
4848
if: matrix.release == 'stable'
4949
uses: actions/setup-dotnet@v4
5050
with:
51-
dotnet-version: 6.x
51+
dotnet-version: 8.x
5252
- name: Set up .Net Nightly
5353
if: matrix.release == 'nightly'
5454
uses: actions/setup-dotnet@v4
5555
with:
56-
dotnet-version: 6.x
56+
dotnet-version: 8.x
5757
source-url: https://nuget.pkg.github.com/seleniumhq/index.json
5858
env:
5959
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

‎examples/dotnet/SeleniumDocs/BaseTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class BaseTest
1717
protected IWebDriver driver;
1818
protected Uri GridUrl;
1919
private Process _webserverProcess;
20-
private const string ServerJarName = "selenium-server-4.23.0.jar";
20+
private const string ServerJarName = "selenium-server-4.25.0.jar";
2121
private static readonly string BaseDirectory = AppContext.BaseDirectory;
2222
private const string RelativePathToGrid = "../../../../../";
2323
private readonly string _examplesDirectory = Path.GetFullPath(Path.Combine(BaseDirectory, RelativePathToGrid));

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

Lines changed: 7 additions & 7 deletions
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.V127.Network;
8-
using OpenQA.Selenium.DevTools.V127.Performance;
7+
using OpenQA.Selenium.DevTools.V129.Network;
8+
using OpenQA.Selenium.DevTools.V129.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("127");
19+
StartDriver("129");
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.V127.DevToolsSessionDomains>();
112+
var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V129.DevToolsSessionDomains>();
113113

114-
await domains.Performance.Enable(new OpenQA.Selenium.DevTools.V127.Performance.EnableCommandSettings());
114+
await domains.Performance.Enable(new OpenQA.Selenium.DevTools.V129.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.V127.DevToolsSessionDomains>();
134-
await domains.Network.Enable(new OpenQA.Selenium.DevTools.V127.Network.EnableCommandSettings());
133+
var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V129.DevToolsSessionDomains>();
134+
await domains.Network.Enable(new OpenQA.Selenium.DevTools.V129.Network.EnableCommandSettings());
135135

136136
var cookieCommandSettings = new SetCookieCommandSettings
137137
{

‎examples/dotnet/SeleniumDocs/SeleniumDocs.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<GenerateProgramFile>false</GenerateProgramFile>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
1010
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.7.1" />
11-
<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
12-
<PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
13-
<PackageReference Include="Selenium.Support" Version="4.24.0" />
14-
<PackageReference Include="Selenium.WebDriver" Version="4.24.0" />
11+
<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
12+
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
13+
<PackageReference Include="Selenium.Support" Version="4.25.0" />
14+
<PackageReference Include="Selenium.WebDriver" Version="4.25.0" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎examples/java/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repositories {
1010
}
1111

1212
dependencies {
13-
testImplementation 'org.seleniumhq.selenium:selenium-java:4.24.0'
13+
testImplementation 'org.seleniumhq.selenium:selenium-java:4.25.0'
1414
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.11.0'
1515
}
1616

‎examples/java/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎examples/java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<maven.compiler.source>11</maven.compiler.source>
1414
<maven.compiler.target>11</maven.compiler.target>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
<selenium.version>4.24.0</selenium.version>
16+
<selenium.version>4.25.0</selenium.version>
1717
</properties>
1818

1919
<repositories>

‎examples/java/src/test/java/dev/selenium/elements/LocatorsTest.java

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,44 @@
11
package dev.selenium.elements;
2-
2+
import org.openqa.selenium.By;
3+
import org.openqa.selenium.support.pagefactory.ByAll;
4+
import org.openqa.selenium.support.pagefactory.ByChained;
35
import dev.selenium.BaseTest;
6+
import java.util.List;
7+
8+
import org.openqa.selenium.WebDriver;
9+
import org.openqa.selenium.WebElement;
10+
import org.openqa.selenium.chrome.ChromeDriver;
411

512
public class LocatorsTest extends BaseTest {
613

14+
15+
public void ByAllTest() {
16+
// Create instance of ChromeDriver
17+
WebDriver driver = new ChromeDriver();
18+
// Navigate to Url
19+
driver.get("https://www.selenium.dev/selenium/web/login.html");
20+
21+
// get both logins
22+
By example = new ByAll(By.id("password-field"), By.id("username-field"));
23+
List<WebElement> login_inputs = driver.findElements(example);
24+
25+
//send them both input
26+
login_inputs.get(0).sendKeys("username");
27+
login_inputs.get(1).sendKeys("password");
28+
}
29+
30+
public String ByChainedTest() {
31+
// Create instance of ChromeDriver
32+
WebDriver driver = new ChromeDriver();
33+
// Navigate to Url
34+
driver.get("https://www.selenium.dev/selenium/web/login.html");
35+
36+
// Find username-field inside of login-form
37+
By example = new ByChained(By.id("login-form"), By.id("username-field"));
38+
WebElement username_input = driver.findElement(example);
39+
40+
//return placeholder text
41+
String placeholder = username_input.getAttribute("placeholder");
42+
return placeholder;
43+
}
744
}

‎examples/javascript/package-lock.json

Lines changed: 8 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/javascript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"license": "Apache-2.0",
99
"dependencies": {
1010
"assert": "2.1.0",
11-
"selenium-webdriver": "4.24.0"
11+
"selenium-webdriver": "4.25.0"
1212
},
1313
"devDependencies": {
1414
"mocha": "10.7.3"

0 commit comments

Comments
 (0)