Skip to content

Commit 5d9fdc0

Browse files
authored
Merge pull request #2538 from seleniumbase/refresh-dependencies-and-examples
Refresh dependencies and examples
2 parents edeb2db + f21e7fb commit 5d9fdc0

20 files changed

+73
-94
lines changed

examples/boilerplates/samples/google_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class GoogleTests(BaseCase):
1111
def test_google_dot_com(self):
1212
if self.headless and self._multithreaded:
1313
self.open_if_not_url("about:blank")
14-
print("Skipping test in headless multi-threaded mode.")
14+
print("\n Skipping test in headless multi-threaded mode.")
1515
self.skip("Skipping test in headless multi-threaded mode.")
1616
self.open("https://google.com/ncr")
1717
self.assert_title_contains("Google")

examples/boilerplates/samples/test_page_objects.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class MyTests(BaseCase):
3636
def test_page_objects(self):
3737
if self.headless and self._multithreaded:
3838
self.open_if_not_url("about:blank")
39-
print("Skipping test in headless multi-threaded mode.")
39+
print("\n Skipping test in headless multi-threaded mode.")
4040
self.skip("Skipping test in headless multi-threaded mode.")
4141
search_term = "SeleniumBase.io Docs"
4242
expected_text = "SeleniumBase"

examples/github_test.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ class GitHubTests(BaseCase):
66
def test_github(self):
77
if self.headless or self.page_load_strategy == "none":
88
self.open_if_not_url("about:blank")
9-
message = "Unsupported mode for this test."
10-
print("\n " + message)
11-
self.skip(message)
9+
print("\n Unsupported mode for this test.")
10+
self.skip("Unsupported mode for this test.")
1211
self.open("https://github.com/seleniumbase/SeleniumBase")
1312
self.click_if_visible('[data-action="click:signup-prompt#dismiss"]')
1413
self.highlight("div.Layout-main")

examples/proxy_test.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,10 @@
55

66
class ProxyTests(BaseCase):
77
def test_proxy(self):
8-
if self.headless:
8+
if self.headless or self.recorder_mode or self.browser == "safari":
99
self.open_if_not_url("about:blank")
10-
print("Skipping test in Headless Mode.")
11-
self.skip("Skipping test in Headless Mode.")
12-
elif self.recorder_mode:
13-
self.open_if_not_url("about:blank")
14-
print("Skipping test in Recorder Mode.")
15-
self.skip("Skipping test in Recorder Mode.")
16-
elif self.browser == "safari":
17-
self.open_if_not_url("about:blank")
18-
print("Skipping test for using Safari.")
19-
self.skip("Skipping test for using Safari.")
10+
print("\n Unsupported mode for this test.")
11+
self.skip("Unsupported mode for this test.")
2012
settings.SKIP_JS_WAITS = True
2113
if not self.page_load_strategy == "none" and not self.undetectable:
2214
# This page takes too long to load otherwise

examples/rate_limiting_test.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,10 @@ def print_item(self, item):
1010
print(item)
1111

1212
def test_rate_limited_printing(self):
13-
if self._multithreaded:
13+
if self._multithreaded or self.recorder_mode:
1414
self.open_if_not_url("about:blank")
15-
print("Skipping test in multi-threaded mode.")
16-
self.skip("Skipping test in multi-threaded mode.")
17-
if self.recorder_mode:
18-
self.open_if_not_url("about:blank")
19-
print("Skipping test in Recorder Mode.")
20-
self.skip("Skipping test in Recorder Mode.")
15+
print("\n Unsupported mode for this test.")
16+
self.skip("Unsupported mode for this test.")
2117
message = "Running rate-limited print() on the command line"
2218
self.open("data:text/html,<p>%s</p>" % message)
2319
print("\n%s:" % message)

examples/shadow_root_test.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,10 @@
66

77
class ShadowRootTest(BaseCase):
88
def test_shadow_root(self):
9-
if self.recorder_mode:
9+
if self.recorder_mode or not self.is_chromium():
1010
self.open_if_not_url("about:blank")
11-
message = "Skipping test in Recorder Mode."
12-
print(message)
13-
self.skip(message)
14-
elif not self.is_chromium():
15-
self.open_if_not_url("about:blank")
16-
message = "This test is only for Chromium browsers!"
17-
print(message)
18-
self.skip(message)
11+
print("\n Unsupported mode for this test.")
12+
self.skip("Unsupported mode for this test.")
1913
self.open("https://seleniumbase.io/other/shadow_dom")
2014
print("")
2115
self.click("button.tab_1")

examples/test_apple_site.py

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,14 @@ def test_apple_developer_site_webdriver_instructions(self):
88
self.demo_mode = True
99
self.demo_sleep = 0.5
1010
self.message_duration = 2.0
11+
if self.is_chromium() and not self.disable_csp:
12+
self.get_new_driver(browser=self.browser, disable_csp=True)
1113
if self.headless:
12-
if self._multithreaded:
14+
if self._multithreaded or self.undetectable or self.recorder_mode:
1315
self.open_if_not_url("about:blank")
14-
print("Skipping test in headless multi-threaded mode.")
15-
self.skip("Skipping test in headless multi-threaded mode.")
16-
elif self.undetectable:
17-
self.open_if_not_url("about:blank")
18-
print("Skipping test in headless undetectable mode.")
19-
self.skip("Skipping test in headless undetectable mode.")
20-
elif self.recorder_mode:
21-
self.open_if_not_url("about:blank")
22-
print("Skipping test in headless Recorder Mode.")
23-
self.skip("Skipping test in headless Recorder Mode.")
24-
elif self.browser == "chrome" or self.browser == "edge":
16+
print("\n Unsupported mode for this test.")
17+
self.skip("Unsupported mode for this test.")
18+
elif self.is_chromium():
2519
self.get_new_driver(browser=self.browser, headless2=True)
2620
self.open("https://developer.apple.com/search/")
2721
title = "Testing with WebDriver in Safari"

examples/test_canvas.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def test_click_with_offset(self):
3737
self.open("https://seleniumbase.io/canvas/")
3838
if self.undetectable:
3939
self.open_if_not_url("about:blank")
40-
print("Skip this test in undetectable mode.")
40+
print("\n Skip this test in undetectable mode.")
4141
self.skip("Skip this test in undetectable mode.")
4242
self.assert_title_contains("Canvas")
4343
self.highlight("canvas")

examples/test_chromedriver.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88

99
class ChromedriverTests(BaseCase):
1010
def test_chromedriver_matches_chrome(self):
11+
self.open("about:blank")
1112
if self.browser != "chrome":
12-
self.open_if_not_url("data:,")
1313
print("\n This test is only for Chrome!")
14-
print(' (Run with: "--browser=chrome")')
1514
self.skip("This test is only for Chrome!")
1615
chrome_version = self.get_chrome_version()
1716
major_chrome_version = chrome_version.split(".")[0]

examples/test_hack_search.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ class HackingTests(BaseCase):
1010
def test_hack_search(self):
1111
if self.headless:
1212
self.open_if_not_url("about:blank")
13-
print("\n This test is not for Headless Mode.")
14-
self.skip('Do not use "--headless" with this test.')
13+
print("\n Skipping test in headless mode.")
14+
self.skip('Skipping test in headless mode.')
1515
self.open("https://google.com/ncr")
1616
self.hide_elements("iframe")
1717
self.assert_element('[title="Search"]')

0 commit comments

Comments
 (0)