Skip to content

Commit dd4d3e7

Browse files
harsha509harsha509
authored
Merge branch 'trunk' into update-python-locators-docs
2 parents 9ccc041 + dc40160 commit dd4d3e7

File tree

30 files changed

+453
-450
lines changed

30 files changed

+453
-450
lines changed

‎.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
deploy:
1010
if: contains(toJson(github.event.commits), '[deploy site]') == true
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-24.04
1212
steps:
1313
- name: Checkout repo
1414
uses: actions/checkout@v4

‎.github/workflows/label-commenter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111

1212
jobs:
1313
comment:
14-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-24.04
1515
steps:
1616
- uses: actions/checkout@v4
1717
- name: Label Commenter

‎.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
test_build:
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-24.04
1414
steps:
1515
- name: Checkout repo
1616
uses: actions/checkout@v4

‎.gitpod.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
tasks:
22
- name: Install Hugo, init submodules and start website
33
init: |
4-
curl -LO https://github.com/gohugoio/hugo/releases/download/v0.110.0/hugo_extended_0.110.0_linux-amd64.deb && \
5-
sudo dpkg -i hugo_extended_0.110.0_linux-amd64.deb && \
6-
sudo rm hugo_extended_0.110.0_linux-amd64.deb
4+
curl -LO https://github.com/gohugoio/hugo/releases/download/v0.125.4/hugo_extended_0.125.4_linux-amd64.deb && \
5+
sudo dpkg -i hugo_extended_0.125.4_linux-amd64.deb && \
6+
sudo rm hugo_extended_0.125.4_linux-amd64.deb
77
command: |
88
cd website_and_docs
9-
hugo server --baseUrl $(gp url 1313) --appendPort=false
9+
hugo server --baseURL $(gp url 1313) --appendPort=false
1010
1111
# List the ports you want to expose and what to do when they are served. See https://www.gitpod.io/docs/config-ports/
1212
ports:

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

Lines changed: 67 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,74 @@
1+
// Licensed to the Software Freedom Conservancy (SFC) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The SFC licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
18+
19+
using System;
120
using Microsoft.VisualStudio.TestTools.UnitTesting;
21+
using OpenQA.Selenium;
22+
using OpenQA.Selenium.Chrome;
23+
using System.Collections.Generic;
224

325
namespace SeleniumDocs.Interactions
426
{
5-
[TestClass]
6-
public class FramesTest : BaseTest
27+
[TestClass]
28+
public class FramesTest
729
{
30+
[TestMethod]
31+
public void TestFrames()
32+
{
33+
WebDriver driver = new ChromeDriver();
34+
driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromMilliseconds(500);
35+
36+
// Navigate to Url
37+
driver.Url= "https://www.selenium.dev/selenium/web/iframes.html";
38+
//switch To IFrame using Web Element
39+
IWebElement iframe = driver.FindElement(By.Id("iframe1"));
40+
//Switch to the frame
41+
driver.SwitchTo().Frame(iframe);
42+
Assert.AreEqual(true, driver.PageSource.Contains("We Leave From Here"));
43+
//Now we can type text into email field
44+
IWebElement emailE = driver.FindElement(By.Id("email"));
45+
emailE.SendKeys("[email protected]");
46+
emailE.Clear();
47+
driver.SwitchTo().DefaultContent();
48+
49+
50+
//switch To IFrame using name or id
51+
driver.FindElement(By.Name("iframe1-name"));
52+
//Switch to the frame
53+
driver.SwitchTo().Frame(iframe);
54+
Assert.AreEqual(true, driver.PageSource.Contains("We Leave From Here"));
55+
IWebElement email = driver.FindElement(By.Id("email"));
56+
//Now we can type text into email field
57+
email.SendKeys("[email protected]");
58+
email.Clear();
59+
driver.SwitchTo().DefaultContent();
60+
61+
62+
//switch To IFrame using index
63+
driver.SwitchTo().Frame(0);
64+
Assert.AreEqual(true, driver.PageSource.Contains("We Leave From Here"));
65+
66+
//leave frame
67+
driver.SwitchTo().DefaultContent();
68+
Assert.AreEqual(true, driver.PageSource.Contains("This page has iframes"));
69+
70+
//quit the browser
71+
driver.Quit();
72+
}
873
}
974
}

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// Licensed to the Software Freedom Conservancy (SFC) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The SFC licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
18+
19+
using System;
20+
using Microsoft.VisualStudio.TestTools.UnitTesting;
21+
using OpenQA.Selenium;
22+
using OpenQA.Selenium.Chrome;
23+
namespace SeleniumDocumentation.SeleniumInteractions
24+
{
25+
[TestClass]
26+
public class InteractionsTest
27+
{
28+
[TestMethod]
29+
public void TestInteractions()
30+
{
31+
WebDriver driver = new ChromeDriver();
32+
driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromMilliseconds(500);
33+
34+
// Navigate to Url
35+
driver.Url="https://www.selenium.dev/";
36+
//GetTitle
37+
String title = driver.Title;
38+
Assert.AreEqual(title, "Selenium");
39+
40+
//GetCurrentURL
41+
String url = driver.Url;
42+
Assert.AreEqual(url, "https://www.selenium.dev/");
43+
44+
//quitting driver
45+
driver.Quit(); //close all windows
46+
}
47+
}
48+
}

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

‎examples/java/src/test/java/dev/selenium/interactions/AlertsTest.java

Lines changed: 89 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,92 @@
1-
package dev.selenium.interactions;
1+
// Licensed to the Software Freedom Conservancy (SFC) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The SFC licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
217

3-
import dev.selenium.BaseTest;
18+
import org.junit.jupiter.api.Test;
19+
import org.openqa.selenium.*;
20+
import org.openqa.selenium.chrome.ChromeDriver;
21+
import org.openqa.selenium.chrome.ChromeOptions;
22+
import org.openqa.selenium.support.ui.ExpectedConditions;
23+
import org.openqa.selenium.support.ui.WebDriverWait;
424

5-
public class AlertsTest extends BaseTest {
25+
import java.time.Duration;
626

7-
}
27+
import static org.junit.jupiter.api.Assertions.assertEquals;
28+
29+
public class AlertsTest {
30+
31+
@Test
32+
public void testForAlerts() throws Exception {
33+
34+
ChromeOptions chromeOptions = new ChromeOptions();
35+
chromeOptions.addArguments("disable-search-engine-choice-screen");
36+
WebDriver driver = new ChromeDriver(chromeOptions);
37+
38+
driver.manage().timeouts().implicitlyWait(Duration.ofMillis(500));
39+
driver.manage().window().maximize();
40+
//Navigate to Url
41+
driver.get("https://www.selenium.dev/documentation/webdriver/interactions/alerts/");
42+
43+
//Simple Alert
44+
//Click the link to activate the alert
45+
JavascriptExecutor js = (JavascriptExecutor) driver;
46+
//execute js for alert
47+
js.executeScript("alert('Sample Alert');");
48+
WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(30));
49+
//Wait for the alert to be displayed and store it in a variable
50+
wait.until(ExpectedConditions.alertIsPresent());
51+
52+
Alert alert = driver.switchTo().alert();
53+
//Store the alert text in a variable and verify it
54+
String text = alert.getText();
55+
assertEquals(text, "Sample Alert");
56+
//Press the OK button
57+
alert.accept();
58+
59+
//Confirm
60+
//execute js for confirm
61+
js.executeScript("confirm('Are you sure?');");
62+
//Wait for the alert to be displayed
63+
wait = new WebDriverWait(driver, Duration.ofSeconds(30));
64+
wait.until(ExpectedConditions.alertIsPresent());
65+
66+
67+
alert = driver.switchTo().alert();
68+
//Store the alert text in a variable and verify it
69+
text = alert.getText();
70+
assertEquals(text, "Are you sure?");
71+
//Press the Cancel button
72+
alert.dismiss();
73+
74+
//Prompt
75+
//execute js for prompt
76+
js.executeScript("prompt('What is your name?');");
77+
//Wait for the alert to be displayed and store it in a variable
78+
wait = new WebDriverWait(driver, Duration.ofSeconds(30));
79+
wait.until(ExpectedConditions.alertIsPresent());
80+
81+
alert = driver.switchTo().alert();
82+
//Store the alert text in a variable and verify it
83+
text = alert.getText();
84+
assertEquals(text, "What is your name?");
85+
//Type your message
86+
alert.sendKeys("Selenium");
87+
//Press the OK button
88+
alert.accept();
89+
//quit the browser
90+
driver.quit();
91+
}
92+
}

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ In the Hub-Node mode, the Distributor URL is the Hub server address.
5454
```shell
5555
cURL --request DELETE 'http://localhost:4444/se/grid/distributor/node/<node-id>' --header 'X-REGISTRATION-SECRET: <secret> '
5656
```
57-
In the fully distributed mode, the URL is the Distributor server address.
57+
In the fully distributed mode, the URL is the Router server address.
5858
```shell
59-
cURL --request DELETE 'http://localhost:5553/se/grid/distributor/node/<node-id>' --header 'X-REGISTRATION-SECRET: <secret>'
59+
cURL --request DELETE 'http://localhost:4444/se/grid/distributor/node/<node-id>' --header 'X-REGISTRATION-SECRET: <secret>'
6060
```
6161
If no registration secret has been configured while setting up the Grid, then use
6262
```shell
63-
cURL --request DELETE 'http://<Distributor-URL>/se/grid/distributor/node/<node-id>' --header 'X-REGISTRATION-SECRET;'
63+
cURL --request DELETE 'http://<Router-URL>/se/grid/distributor/node/<node-id>' --header 'X-REGISTRATION-SECRET;'
6464
```
6565

6666
### Drain Node
@@ -75,13 +75,13 @@ In the Hub-Node mode, the Distributor URL is the Hub server address.
7575
```shell
7676
cURL --request POST 'http://localhost:4444/se/grid/distributor/node/<node-id>/drain' --header 'X-REGISTRATION-SECRET: <secret> '
7777
```
78-
In the fully distributed mode, the URL is the Distributor server address.
78+
In the fully distributed mode, the URL is the Router server address.
7979
```shell
80-
cURL --request POST 'http://localhost:5553/se/grid/distributor/node/<node-id>/drain' --header 'X-REGISTRATION-SECRET: <secret>'
80+
cURL --request POST 'http://localhost:4444/se/grid/distributor/node/<node-id>/drain' --header 'X-REGISTRATION-SECRET: <secret>'
8181
```
8282
If no registration secret has been configured while setting up the Grid, then use
8383
```shell
84-
cURL --request POST 'http://<Distributor-URL>/se/grid/distributor/node/<node-id>/drain' --header 'X-REGISTRATION-SECRET;'
84+
cURL --request POST 'http://<Router-URL>/se/grid/distributor/node/<node-id>/drain' --header 'X-REGISTRATION-SECRET;'
8585
```
8686

8787
## Node
@@ -159,14 +159,14 @@ In the Hub-Node mode, the Queue URL is the Hub server address.
159159
cURL --request DELETE 'http://localhost:4444/se/grid/newsessionqueue/queue' --header 'X-REGISTRATION-SECRET: <secret>'
160160
```
161161

162-
In the fully distributed mode, the Queue URL is New Session Queue server address.
162+
In the fully distributed mode, the Queue URL is Router server address.
163163
```shell
164-
cURL --request DELETE 'http://localhost:5559/se/grid/newsessionqueue/queue' --header 'X-REGISTRATION-SECRET: <secret>'
164+
cURL --request DELETE 'http://localhost:4444/se/grid/newsessionqueue/queue' --header 'X-REGISTRATION-SECRET: <secret>'
165165
```
166166

167167
If no registration secret has been configured while setting up the Grid, then use
168168
```shell
169-
cURL --request DELETE 'http://<URL>/se/grid/newsessionqueue/queue' --header 'X-REGISTRATION-SECRET;'
169+
cURL --request DELETE 'http://<Router-URL>/se/grid/newsessionqueue/queue' --header 'X-REGISTRATION-SECRET;'
170170
```
171171

172172
### Get New Session Queue Requests
@@ -183,6 +183,6 @@ In the Hub-Node mode, the Queue URL is the Hub server address.
183183
cURL --request GET 'http://localhost:4444/se/grid/newsessionqueue/queue'
184184
```
185185

186-
In the fully distributed mode, the Queue URL is New Session Queue server address.
186+
In the fully distributed mode, the Queue URL is Router server address.
187187
```shell
188-
cURL --request GET 'http://localhost:5559/se/grid/newsessionqueue/queue'
188+
cURL --request GET 'http://localhost:4444/se/grid/newsessionqueue/queue'

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ cURL --request DELETE 'http://localhost:4444/se/grid/distributor/node/<node-id>'
5858
完全分散モードでは、ディストリビューター URL は ディストリビューターのアドレスになります。
5959

6060
```shell
61-
cURL --request DELETE 'http://localhost:5553/se/grid/distributor/node/<node-id>' --header 'X-REGISTRATION-SECRET: <secret>'
61+
cURL --request DELETE 'http://localhost:4444/se/grid/distributor/node/<node-id>' --header 'X-REGISTRATION-SECRET: <secret>'
6262
```
6363

6464
Grid の設定時に登録用の secret を設定していない場合は次のようにします:
6565

6666
```shell
67-
cURL --request DELETE 'http://<Distributor-URL>/se/grid/distributor/node/<node-id>' --header 'X-REGISTRATION-SECRET;'
67+
cURL --request DELETE 'http://<Router-URL>/se/grid/distributor/node/<node-id>' --header 'X-REGISTRATION-SECRET;'
6868
```
6969

7070
### ノードのドレイン
@@ -84,13 +84,13 @@ cURL --request POST 'http://localhost:4444/se/grid/distributor/node/<node-id>/dr
8484
完全分散モードでは、ディストリビューター URL は ディストリビューターのアドレスになります。
8585

8686
```shell
87-
cURL --request POST 'http://localhost:5553/se/grid/distributor/node/<node-id>/drain' --header 'X-REGISTRATION-SECRET: <secret>'
87+
cURL --request POST 'http://localhost:4444/se/grid/distributor/node/<node-id>/drain' --header 'X-REGISTRATION-SECRET: <secret>'
8888
```
8989

9090
Grid の設定時に登録用の secret を設定していない場合は次のようにします:
9191

9292
```shell
93-
cURL --request POST 'http://<Distributor-URL>/se/grid/distributor/node/<node-id>/drain' --header 'X-REGISTRATION-SECRET;'
93+
cURL --request POST 'http://<Router-URL>/se/grid/distributor/node/<node-id>/drain' --header 'X-REGISTRATION-SECRET;'
9494
```
9595

9696
## ノード
@@ -178,13 +178,13 @@ cURL --request DELETE 'http://localhost:4444/se/grid/newsessionqueue/queue' --he
178178
完全分散モードでは、キューの URL は 新規セッションキューのアドレスになります。
179179

180180
```shell
181-
cURL --request DELETE 'http://localhost:5559/se/grid/newsessionqueue/queue' --header 'X-REGISTRATION-SECRET: <secret>'
181+
cURL --request DELETE 'http://localhost:4444/se/grid/newsessionqueue/queue' --header 'X-REGISTRATION-SECRET: <secret>'
182182
```
183183

184184
Grid の設定時に登録用の secret を設定していない場合は次のようにします:
185185

186186
```shell
187-
cURL --request DELETE 'http://<URL>/se/grid/newsessionqueue/queue' --header 'X-REGISTRATION-SECRET;'
187+
cURL --request DELETE 'http://<Router-URL>/se/grid/newsessionqueue/queue' --header 'X-REGISTRATION-SECRET;'
188188
```
189189

190190
### 新規セッションリクエストの取得
@@ -204,5 +204,5 @@ cURL --request GET 'http://localhost:4444/se/grid/newsessionqueue/queue'
204204
完全分散モードでは、キューの URL は 新規セッションキューのアドレスになります。
205205

206206
```shell
207-
cURL --request GET 'http://localhost:5559/se/grid/newsessionqueue/queue'
207+
cURL --request GET 'http://localhost:4444/se/grid/newsessionqueue/queue'
208208
```

0 commit comments

Comments
 (0)