Skip to content

Commit 30934ab

Browse files
committed
Update example tests
1 parent 6ee416d commit 30934ab

9 files changed

+39
-32
lines changed

examples/nth_child_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class NthChildSelectorTests(BaseCase):
66
def test_locate_rows_with_colors(self):
77
self.open("https://xkcd.com/color/rgb/")
88
tbody = "center > table tbody"
9-
if not (self.headless or self.headless2 or self.xvfb):
9+
if self.headed:
1010
self.demo_mode = True
1111
self.demo_sleep = 0.5
1212
self.message_duration = 2.0

examples/offline_examples/test_demo_page.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,21 @@ def test_demo_page(self):
4848

4949
# Verify that a slider control updates a progress bar
5050
self.assert_element('progress[value="50"]')
51-
self.press_right_arrow("#myslider", times=5)
51+
self.set_value("input#mySlider", "100")
5252
self.assert_element('progress[value="100"]')
5353

5454
# Verify that a "select" option updates a meter bar
5555
self.assert_element('meter[value="0.25"]')
5656
self.select_option_by_text("#mySelect", "Set to 75%")
5757
self.assert_element('meter[value="0.75"]')
5858

59-
# Assert an element located inside an iFrame
59+
# Assert an element located inside an iframe
6060
self.assert_false(self.is_element_visible("img"))
6161
self.switch_to_frame("#myFrame1")
6262
self.assert_true(self.is_element_visible("img"))
6363
self.switch_to_default_content()
6464

65-
# Assert text located inside an iFrame
65+
# Assert text located inside an iframe
6666
self.assert_false(self.is_text_visible("iFrame Text"))
6767
self.switch_to_frame("#myFrame2")
6868
self.assert_true(self.is_text_visible("iFrame Text"))
@@ -89,7 +89,7 @@ def test_demo_page(self):
8989
self.assert_true(self.is_selected("#checkBox3"))
9090
self.assert_true(self.is_selected("#checkBox4"))
9191

92-
# Verify that clicking an iFrame checkbox selects it
92+
# Verify that clicking an iframe checkbox selects it
9393
self.assert_false(self.is_element_visible(".fBox"))
9494
self.switch_to_frame("#myFrame3")
9595
self.assert_true(self.is_element_visible(".fBox"))

examples/raw_parameter_script.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,10 @@
7777
sb._crumbs = False
7878
sb._final_debug = False
7979
sb.use_wire = False
80-
sb.visual_baseline = False
80+
sb.enable_3d_apis = False
8181
sb.window_size = None
8282
sb.maximize_option = False
83+
sb.visual_baseline = False
8384
sb._disable_beforeunload = False
8485
sb.save_screenshot_after_test = False
8586
sb.no_screenshot_after_test = False
@@ -104,7 +105,7 @@
104105
sb._dash_initialized = False
105106
sb.message_duration = None
106107
sb.binary_location = None
107-
sb.enable_3d_apis = False
108+
sb.driver_version = None
108109
sb.block_images = False
109110
sb.do_not_track = False
110111
sb.external_pdf = False

examples/test_apple_site.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
class AppleTests(BaseCase):
66
def test_apple_developer_site_webdriver_instructions(self):
7-
if not (self.headless or self.headless2 or self.xvfb):
7+
if self.headed:
88
self.demo_mode = True
99
self.demo_sleep = 0.5
1010
self.message_duration = 2.0

examples/test_demo_site.py

+6-5
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,21 @@ def test_demo_site(self):
4343

4444
# Verify that a slider control updates a progress bar
4545
self.assert_element('progress[value="50"]')
46-
self.press_right_arrow("#myslider", times=5)
46+
self.set_value("input#mySlider", "100")
4747
self.assert_element('progress[value="100"]')
4848

4949
# Verify that a "select" option updates a meter bar
5050
self.assert_element('meter[value="0.25"]')
5151
self.select_option_by_text("#mySelect", "Set to 75%")
5252
self.assert_element('meter[value="0.75"]')
5353

54-
# Assert an element located inside an iFrame
54+
# Assert an element located inside an iframe
5555
self.assert_false(self.is_element_visible("img"))
5656
self.switch_to_frame("#myFrame1")
5757
self.assert_true(self.is_element_visible("img"))
5858
self.switch_to_default_content()
5959

60-
# Assert text located inside an iFrame
60+
# Assert text located inside an iframe
6161
self.assert_false(self.is_text_visible("iFrame Text"))
6262
self.switch_to_frame("#myFrame2")
6363
self.assert_true(self.is_text_visible("iFrame Text"))
@@ -84,7 +84,7 @@ def test_demo_site(self):
8484
self.assert_true(self.is_selected("#checkBox3"))
8585
self.assert_true(self.is_selected("#checkBox4"))
8686

87-
# Verify that clicking an iFrame checkbox selects it
87+
# Verify that clicking an iframe checkbox selects it
8888
self.assert_false(self.is_element_visible(".fBox"))
8989
self.switch_to_frame("#myFrame3")
9090
self.assert_true(self.is_element_visible(".fBox"))
@@ -113,6 +113,7 @@ def test_demo_site(self):
113113
self.highlight("h2")
114114

115115
# Actions with Demo Mode enabled
116-
self.activate_demo_mode()
116+
if self.headed:
117+
self.activate_demo_mode()
117118
self.type("input", "Have a Nice Day!")
118119
self.assert_text("SeleniumBase", "h2")

examples/test_geolocation.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ def test_geolocation(self):
3737
self.click("span.geolocate")
3838
self.assert_url_contains("48.87645/2.26340")
3939
self.save_screenshot_to_logs()
40-
if not (self.headless or self.headless2 or self.xvfb):
40+
if self.headed:
4141
self.sleep(2.5)

examples/test_verify_chromedriver.py

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1+
import sys
12
from seleniumbase import BaseCase
23
BaseCase.main(__name__, __file__)
34

45

56
class ChromedriverTests(BaseCase):
6-
def test_fail_if_using_an_old_chromedriver(self):
7+
def test_fail_if_versions_dont_match(self):
78
self.open("data:,")
89
if self.browser != "chrome":
910
self.open_if_not_url("data:,")
1011
print("\n This test is only for Chrome!")
11-
print(" (Run with: '--browser=chrome')")
12+
print(" (Run with: '--chrome')")
1213
self.skip("This test is only for Chrome!")
1314
chrome_version = self.get_chrome_version()
1415
major_chrome_version = chrome_version.split(".")[0]
1516
chromedriver_version = self.get_chromedriver_version()
1617
major_chromedriver_version = chromedriver_version.split(".")[0]
17-
install_sb = "sbase install chromedriver %s" % major_chrome_version
18-
if (
19-
int(major_chromedriver_version) < 73
20-
and int(major_chrome_version) >= 73
21-
):
22-
message = (
23-
'Your version of chromedriver: "%s"\n '
24-
'is too old for your version of Chrome: "%s"\n'
25-
"You should upgrade chromedriver "
26-
"to receive important bug fixes!\n"
27-
'Run this command to upgrade: "%s"'
28-
% (chromedriver_version, chrome_version, install_sb)
29-
)
30-
raise Exception(message) # chromedriver is out-of-date
18+
install_sb = "sbase get chromedriver %s" % major_chrome_version
19+
arg_join = " ".join(sys.argv)
20+
message = (
21+
'Your version of chromedriver: "%s"\n '
22+
'does not match your version of Chrome: "%s"\n'
23+
'Run this command to fix that: "%s"'
24+
% (chromedriver_version, chrome_version, install_sb)
25+
)
26+
if "--driver-version=" in arg_join or "--driver-version=" in arg_join:
27+
if int(major_chromedriver_version) != int(major_chrome_version):
28+
print("\nWarning -> " + message)
29+
elif int(major_chromedriver_version) != int(major_chrome_version):
30+
raise Exception(message)

examples/upgrade_chromedriver.py

+5
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,8 @@ def test_upgrade_chromedriver(self, testdir):
9292
# Print the final installed versions of chromedriver and Chrome
9393
testdir = self.print_versions_of_chromedriver_and_chrome(testdir)
9494
testdir.inline_run("--headless", "-s")
95+
96+
97+
if __name__ == "__main__":
98+
from pytest import main
99+
main([__file__])

examples/user_agent_test.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def test_user_agent(self):
1919
else:
2020
# User-agent was overridden using: --agent=STRING
2121
print("\n\nUser-Agent override: %s" % user_agent_detected)
22-
if not (self.headless or self.headless2 or self.xvfb):
22+
if self.headed:
2323
self.sleep(2.75)
2424

2525
# Now change the user-agent using "execute_cdp_cmd()"
@@ -46,7 +46,7 @@ def test_user_agent(self):
4646
self.highlight("#ua_string")
4747
user_agent_detected = self.get_text("#ua_string")
4848
print("\nUser-Agent override: %s" % user_agent_detected)
49-
if not (self.headless or self.headless2 or self.xvfb):
49+
if self.headed:
5050
self.sleep(2.75)
5151
finally:
5252
# Reset the user-agent back to the original

0 commit comments

Comments
 (0)