Skip to content

Commit 8a597e3

Browse files
harsha509harsha509
authored
Merge branch 'trunk' into codeblock-java
2 parents 2a80d72 + 86a3605 commit 8a597e3

File tree

84 files changed

+561
-359
lines changed

Some content is hidden

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

84 files changed

+561
-359
lines changed

‎.github/workflows/js-examples.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
uses: nick-invision/[email protected]
120120
with:
121121
timeout_minutes: 20
122-
max_attempts: 3
122+
max_attempts: 2
123123
command: |
124124
cd examples/javascript
125125
npm test

‎.github/workflows/link-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Setup Node
2828
uses: actions/setup-node@v4
2929
with:
30-
node-version: '22.15.0'
30+
node-version: '22.16.0'
3131
cache: 'npm'
3232
# The action defaults to search for the dependency file (package-lock.json,
3333
# npm-shrinkwrap.json or yarn.lock) in the repository root, and uses its

‎.github/workflows/ruby-examples.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- name: Set up Ruby
5252
uses: ruby/setup-ruby@v1
5353
with:
54-
ruby-version: 3.1
54+
ruby-version: 3.2
5555
bundler-cache: true
5656
- name: Install Gems Nightly non-Windows
5757
if: matrix.release == 'nightly' && matrix.os != 'windows'
@@ -119,7 +119,7 @@ jobs:
119119
- name: Set up Ruby
120120
uses: ruby/setup-ruby@v1
121121
with:
122-
ruby-version: 3.1
122+
ruby-version: 3.2
123123
bundler-cache: true
124124
- name: Install dependencies
125125
working-directory: ./examples/ruby

‎examples/dotnet/SeleniumDocs/BaseTest.cs

Lines changed: 12 additions & 6 deletions
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.32.0.jar";
20+
private const string ServerJarName = "selenium-server-4.33.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));
@@ -33,12 +33,18 @@ public void Cleanup()
3333
}
3434
}
3535

36-
protected void StartDriver(string browserVersion = "stable")
36+
protected void StartDriver(string browserVersion = null)
3737
{
38-
ChromeOptions options = new ChromeOptions
38+
ChromeOptions options = new ChromeOptions();
39+
if (browserVersion != null)
3940
{
40-
BrowserVersion = browserVersion
41-
};
41+
options.BrowserVersion = browserVersion;
42+
string userDataDir = System.IO.Path.Combine(System.IO.Path.GetTempPath(), System.IO.Path.GetRandomFileName());
43+
System.IO.Directory.CreateDirectory(userDataDir);
44+
options.AddArgument($"--user-data-dir={userDataDir}");
45+
options.AddArgument("--no-sandbox");
46+
options.AddArgument("--disable-dev-shm-usage");
47+
}
4248
driver = new ChromeDriver(options);
4349
}
4450

@@ -111,4 +117,4 @@ private async Task EnsureGridIsRunningAsync()
111117
}
112118
}
113119
}
114-
}
120+
}

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

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

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

136136
var cookieCommandSettings = new SetCookieCommandSettings
137137
{
@@ -148,4 +148,4 @@ public async Task SetCookie()
148148
}
149149

150150
}
151-
}
151+
}

‎examples/dotnet/SeleniumDocs/Browsers/ChromeTest.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,12 @@ public void Arguments()
4444
[TestMethod]
4545
public void SetBrowserLocation()
4646
{
47+
string userDataDir = System.IO.Path.Combine(System.IO.Path.GetTempPath(), System.IO.Path.GetRandomFileName());
48+
System.IO.Directory.CreateDirectory(userDataDir);
4749
var options = new ChromeOptions();
50+
options.AddArgument($"--user-data-dir={userDataDir}");
51+
options.AddArgument("--no-sandbox");
52+
options.AddArgument("--disable-dev-shm-usage");
4853

4954
options.BinaryLocation = GetChromeLocation();
5055

@@ -59,6 +64,7 @@ public void InstallExtension()
5964
var extensionFilePath = Path.Combine(baseDir, "../../../Extensions/webextensions-selenium-example.crx");
6065

6166
options.AddExtension(extensionFilePath);
67+
options.AddArgument("--disable-features=DisableLoadExtensionCommandLineSwitch");
6268

6369
driver = new ChromeDriver(options);
6470

@@ -117,7 +123,7 @@ public void LogsLevel()
117123
var service = ChromeDriverService.CreateDefaultService();
118124
service.LogPath = GetLogLocation();
119125

120-
// service.LogLevel = ChromiumDriverLogLevel.Debug
126+
// service.LogLevel = ChromiumDriverLogLevel.Debug
121127

122128
driver = new ChromeDriver(service);
123129

@@ -180,4 +186,4 @@ private static string GetChromeLocation()
180186
return new DriverFinder(options).GetBrowserPath();
181187
}
182188
}
183-
}
189+
}

‎examples/dotnet/SeleniumDocs/Extensions/webextensions-selenium-example.crx

89 Bytes
Binary file not shown.

‎examples/dotnet/SeleniumDocs/Interactions/PrintOptionsTest.cs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ public void TestOrientation()
1616
PrintOptions printOptions = new PrintOptions();
1717
printOptions.Orientation = PrintOrientation.Landscape;
1818
PrintOrientation currentOrientation = printOptions.Orientation;
19+
driver.Quit();
1920
}
2021

2122
[TestMethod]
@@ -26,7 +27,8 @@ public void TestRange()
2627
PrintOptions printOptions = new PrintOptions();
2728
printOptions.AddPageRangeToPrint("1-3"); // add range of pages
2829
printOptions.AddPageToPrint(5); // add individual page
29-
}
30+
driver.Quit();
31+
}
3032

3133
[TestMethod]
3234
public void TestSize()
@@ -35,6 +37,7 @@ public void TestSize()
3537
driver.Navigate().GoToUrl("https://www.selenium.dev/");
3638
PrintOptions printOptions = new PrintOptions();
3739
PrintOptions.PageSize currentDimensions = printOptions.PageDimensions;
40+
driver.Quit();
3841
}
3942

4043
[TestMethod]
@@ -45,6 +48,7 @@ public void TestBackgrounds()
4548
PrintOptions printOptions = new PrintOptions();
4649
printOptions.OutputBackgroundImages = true;
4750
bool currentBackgrounds = printOptions.OutputBackgroundImages;
51+
driver.Quit();
4852
}
4953

5054
[TestMethod]
@@ -54,6 +58,7 @@ public void TestMargins()
5458
driver.Navigate().GoToUrl("https://www.selenium.dev/");
5559
PrintOptions printOptions = new PrintOptions();
5660
PrintOptions.Margins currentMargins = printOptions.PageMargins;
61+
driver.Quit();
5762
}
5863

5964

@@ -65,6 +70,7 @@ public void TestScale()
6570
PrintOptions printOptions = new PrintOptions();
6671
printOptions.ScaleFactor = 0.5;
6772
double currentScale = printOptions.ScaleFactor;
73+
driver.Quit();
6874
}
6975

7076
[TestMethod]
@@ -75,16 +81,18 @@ public void TestShrinkToFit()
7581
PrintOptions printOptions = new PrintOptions();
7682
printOptions.ShrinkToFit = true;
7783
bool currentShrinkToFit = printOptions.ShrinkToFit;
84+
driver.Quit();
7885
}
7986

8087
[TestMethod]
81-
public void PrintWithPrintsPageTest()
88+
public void PrintWithPrintsPageTest()
8289
{
8390
WebDriver driver = new ChromeDriver();
8491
driver.Navigate().GoToUrl("https://www.selenium.dev/");
8592
PrintOptions printOptions = new PrintOptions();
8693
PrintDocument printedPage = driver.Print(printOptions);
8794
Assert.IsTrue(printedPage.AsBase64EncodedString.StartsWith("JVBER"));
95+
driver.Quit();
8896
}
8997
}
90-
}
98+
}

‎examples/dotnet/SeleniumDocs/SeleniumDocs.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.7.1" />
1111
<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
1212
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
13-
<PackageReference Include="Selenium.Support" Version="4.31.0" />
14-
<PackageReference Include="Selenium.WebDriver" Version="4.31.0" />
13+
<PackageReference Include="Selenium.Support" Version="4.33.0" />
14+
<PackageReference Include="Selenium.WebDriver" Version="4.33.0" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎examples/java/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ repositories {
1010
}
1111

1212
dependencies {
13-
testImplementation 'org.seleniumhq.selenium:selenium-java:4.31.0'
14-
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.12.1'
13+
testImplementation 'org.seleniumhq.selenium:selenium-java:4.33.0'
14+
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.12.2'
1515
}
1616

1717
test {

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

59 Bytes
Binary file not shown.

‎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.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎examples/java/gradlew

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
118118

119119

120120
# Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
213213
set -- \
214214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215215
-classpath "$CLASSPATH" \
216-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217217
"$@"
218218

219219
# Stop when "xargs" is not available.

‎examples/java/gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

‎examples/java/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<maven.compiler.source>17</maven.compiler.source>
1414
<maven.compiler.target>17</maven.compiler.target>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
<selenium.version>4.31.0</selenium.version>
16+
<selenium.version>4.33.0</selenium.version>
1717
</properties>
1818

1919
<repositories>
@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>org.junit.jupiter</groupId>
4242
<artifactId>junit-jupiter-engine</artifactId>
43-
<version>5.12.1</version>
43+
<version>5.12.2</version>
4444
<scope>test</scope>
4545
</dependency>
4646
<dependency>

‎examples/java/src/test/java/dev/selenium/bidi/cdp/CdpApiTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import org.openqa.selenium.chrome.ChromeOptions;
1717
import org.openqa.selenium.devtools.DevTools;
1818
import org.openqa.selenium.devtools.HasDevTools;
19-
import org.openqa.selenium.devtools.v134.browser.Browser;
20-
import org.openqa.selenium.devtools.v134.network.Network;
21-
import org.openqa.selenium.devtools.v134.network.model.Headers;
19+
import org.openqa.selenium.devtools.v137.browser.Browser;
20+
import org.openqa.selenium.devtools.v137.network.Network;
21+
import org.openqa.selenium.devtools.v137.network.model.Headers;
2222
import org.openqa.selenium.support.ui.WebDriverWait;
2323

2424
public class CdpApiTest extends BaseTest {
@@ -27,7 +27,7 @@ public class CdpApiTest extends BaseTest {
2727
@BeforeEach
2828
public void createSession() {
2929
ChromeOptions options = getDefaultChromeOptions();
30-
options.setBrowserVersion("134");
30+
options.setBrowserVersion("136");
3131
driver = new ChromeDriver(options);
3232
wait = new WebDriverWait(driver, Duration.ofSeconds(10));
3333
}

‎examples/java/src/test/java/dev/selenium/bidi/cdp/NetworkTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
import org.openqa.selenium.devtools.DevTools;
2222
import org.openqa.selenium.devtools.HasDevTools;
2323
import org.openqa.selenium.devtools.NetworkInterceptor;
24-
import org.openqa.selenium.devtools.v134.browser.Browser;
25-
import org.openqa.selenium.devtools.v134.network.Network;
26-
import org.openqa.selenium.devtools.v134.performance.Performance;
27-
import org.openqa.selenium.devtools.v134.performance.model.Metric;
24+
import org.openqa.selenium.devtools.v137.browser.Browser;
25+
import org.openqa.selenium.devtools.v137.network.Network;
26+
import org.openqa.selenium.devtools.v137.performance.Performance;
27+
import org.openqa.selenium.devtools.v137.performance.model.Metric;
2828
import org.openqa.selenium.remote.http.*;
2929
import org.openqa.selenium.support.ui.WebDriverWait;
3030

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public void extensionOptions() {
6363
File extensionFilePath = new File(path.toUri());
6464

6565
options.addExtensions(extensionFilePath);
66+
options.addArguments("--disable-features=DisableLoadExtensionCommandLineSwitch");
6667

6768
driver = new ChromeDriver(options);
6869
driver.get("https://www.selenium.dev/selenium/web/blank.html");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public void fullPageScreenshot() throws Exception {
192192

193193
@Test
194194
public void setContext() {
195-
driver = startFirefoxDriver();
195+
driver = startFirefoxDriver(new FirefoxOptions().addArguments("-remote-allow-system-access"));
196196

197197
((HasContext) driver).setContext(FirefoxCommandContext.CHROME);
198198
driver.executeScript("console.log('Inside Chrome context');");

0 commit comments

Comments
 (0)