Skip to content

Commit e49c40d

Browse files
authored
Merge branch 'trunk' into expand_options_example_page
2 parents a5a3a58 + 9b3fc36 commit e49c40d

File tree

5 files changed

+56
-4
lines changed

5 files changed

+56
-4
lines changed

Diff for: examples/python/tests/interactions/test_alerts.py

+48
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()

Diff for: examples/ruby/spec/browsers/chrome_spec.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@
115115

116116
def driver_finder
117117
options = Selenium::WebDriver::Options.chrome(browser_version: 'stable')
118-
finder = Selenium::WebDriver::DriverFinder.new(options, Selenium::WebDriver::Chrome::Service)
118+
service = Selenium::WebDriver::Service.chrome
119+
finder = Selenium::WebDriver::DriverFinder.new(options, service)
119120
ENV['CHROMEDRIVER_BIN'] = finder.driver_path
120121
ENV['CHROME_BIN'] = finder.browser_path
121122
end

Diff for: examples/ruby/spec/browsers/edge_spec.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@
115115

116116
def driver_finder
117117
options = Selenium::WebDriver::Options.edge(browser_version: 'stable')
118-
finder = Selenium::WebDriver::DriverFinder.new(options, Selenium::WebDriver::Edge::Service)
118+
service = Selenium::WebDriver::Service.edge
119+
finder = Selenium::WebDriver::DriverFinder.new(options, service)
119120
ENV['EDGEDRIVER_BIN'] = finder.driver_path
120121
ENV['EDGE_BIN'] = finder.browser_path
121122
end

Diff for: examples/ruby/spec/browsers/firefox_spec.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@
122122

123123
def driver_finder
124124
options = Selenium::WebDriver::Options.firefox(browser_version: 'stable')
125-
finder = Selenium::WebDriver::DriverFinder.new(options, Selenium::WebDriver::Firefox::Service)
125+
service = Selenium::WebDriver::Service.firefox
126+
finder = Selenium::WebDriver::DriverFinder.new(options, service)
126127
ENV['GECKODRIVER_BIN'] = finder.driver_path
127128
ENV['FIREFOX_BIN'] = finder.browser_path
128129
end

Diff for: examples/ruby/spec/drivers/service_spec.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333

3434
def driver_finder
3535
options = Selenium::WebDriver::Options.chrome(browser_version: 'stable')
36-
finder = Selenium::WebDriver::DriverFinder.new(options, Selenium::WebDriver::Chrome::Service)
36+
service = Selenium::WebDriver::Service.chrome
37+
finder = Selenium::WebDriver::DriverFinder.new(options, service)
3738
ENV['CHROMEDRIVER_BIN'] = finder.driver_path
3839
ENV['CHROME_BIN'] = finder.browser_path
3940
end

0 commit comments

Comments
 (0)