Skip to content

Commit b808fae

Browse files
diemoldiemol
authored
Merge branch 'trunk' into development-sponsors
2 parents e3a490d + a852596 commit b808fae

Some content is hidden

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

48 files changed

+622
-471
lines changed

‎.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup Hugo
1818
uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f
1919
with:
20-
hugo-version: '0.110.0'
20+
hugo-version: ' 0.125.4'
2121
extended: true
2222
- name: Build
2323
run: chmod +x build-site.sh && ./build-site.sh

‎.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup Hugo
1818
uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f
1919
with:
20-
hugo-version: '0.110.0'
20+
hugo-version: '0.125.4'
2121
extended: true
2222
- name: Build
2323
run: chmod +x build-site.sh && ./build-site.sh

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This is the repository used to build and publish the official Selenium [website]
1111
We use [Hugo](https://gohugo.io/) and the [Docsy theme](https://www.docsy.dev/)
1212
to build and render the site. You will need the **extended**
1313
Sass/SCSS version of the Hugo binary to work on this site. We recommend
14-
to use Hugo 0.110.0.
14+
to use Hugo 0.125.4
1515

1616
Steps needed to have this working locally and work on it:
1717

‎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.19.1.jar";
20+
private const string ServerJarName = "selenium-server-4.20.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/Interactions/NavigationTest.cs

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,43 @@
1+
using System;
12
using Microsoft.VisualStudio.TestTools.UnitTesting;
3+
using OpenQA.Selenium;
4+
using OpenQA.Selenium.Chrome;
25

3-
namespace SeleniumDocs.Interactions
6+
namespace SeleniumDocumentation.SeleniumInteractions
47
{
58
[TestClass]
6-
public class NavigationTest : BaseTest
9+
public class NavigationTest
710
{
11+
[TestMethod]
12+
public void TestNavigationCommands()
13+
{
14+
IWebDriver driver = new ChromeDriver();
15+
driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromMilliseconds(500);
16+
17+
//Convenient
18+
driver.Url = "https://selenium.dev";
19+
//Longer
20+
driver.Navigate().GoToUrl("https://selenium.dev");
21+
var title = driver.Title;
22+
Assert.AreEqual("Selenium", title);
23+
24+
//Back
25+
driver.Navigate().Back();
26+
title = driver.Title;
27+
Assert.AreEqual("Selenium", title);
28+
29+
//Forward
30+
driver.Navigate().Forward();
31+
title = driver.Title;
32+
Assert.AreEqual("Selenium", title);
33+
34+
//Refresh
35+
driver.Navigate().Refresh();
36+
title = driver.Title;
37+
Assert.AreEqual("Selenium", title);
38+
39+
//Quit the browser
40+
driver.Quit();
41+
}
842
}
9-
}
43+
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.openqa.selenium.logging.LoggingPreferences;
2525
import org.openqa.selenium.remote.service.DriverFinder;
2626

27+
2728
public class ChromeTest extends BaseTest {
2829
@AfterEach
2930
public void clearProperties() {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.openqa.selenium.logging.LoggingPreferences;
2525
import org.openqa.selenium.remote.service.DriverFinder;
2626

27+
2728
public class EdgeTest extends BaseTest {
2829
@AfterEach
2930
public void clearProperties() {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.openqa.selenium.firefox.GeckoDriverService;
2222
import org.openqa.selenium.remote.service.DriverFinder;
2323

24+
2425
public class FirefoxTest extends BaseTest {
2526
private FirefoxDriver driver;
2627

‎examples/python/tests/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def server_old(request):
130130
os.path.abspath(__file__)
131131
)
132132
),
133-
"selenium-server-4.19.1.jar",
133+
"selenium-server-4.20.0.jar",
134134
)
135135

136136
def wait_for_server(url, timeout):
@@ -188,7 +188,7 @@ def server():
188188
)
189189
)
190190
),
191-
"selenium-server-4.19.1.jar",
191+
"selenium-server-4.20.0.jar",
192192
)
193193

194194
args = [

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,50 @@
11
from selenium import webdriver
2+
from selenium.webdriver.common.by import By
3+
from selenium.webdriver.support.ui import WebDriverWait
24

5+
global url
6+
url = "https://www.selenium.dev/documentation/webdriver/interactions/alerts/"
7+
8+
9+
def test_alert_popup():
10+
driver = webdriver.Chrome()
11+
driver.get(url)
12+
element = driver.find_element(By.LINK_TEXT, "See an example alert")
13+
element.click()
14+
15+
wait = WebDriverWait(driver, timeout=2)
16+
alert = wait.until(lambda d : d.switch_to.alert)
17+
text = alert.text
18+
alert.accept()
19+
assert text == "Sample alert"
20+
21+
driver.quit()
22+
23+
def test_confirm_popup():
24+
driver = webdriver.Chrome()
25+
driver.get(url)
26+
element = driver.find_element(By.LINK_TEXT, "See a sample confirm")
27+
driver.execute_script("arguments[0].click();", element)
28+
29+
wait = WebDriverWait(driver, timeout=2)
30+
alert = wait.until(lambda d : d.switch_to.alert)
31+
text = alert.text
32+
alert.dismiss()
33+
assert text == "Are you sure?"
34+
35+
driver.quit()
36+
37+
def test_prompt_popup():
38+
driver = webdriver.Chrome()
39+
driver.get(url)
40+
element = driver.find_element(By.LINK_TEXT, "See a sample prompt")
41+
driver.execute_script("arguments[0].click();", element)
42+
43+
wait = WebDriverWait(driver, timeout=2)
44+
alert = wait.until(lambda d : d.switch_to.alert)
45+
alert.send_keys("Selenium")
46+
text = alert.text
47+
alert.accept()
48+
assert text == "What is your tool of choice?"
49+
50+
driver.quit()

0 commit comments

Comments
 (0)