Merge pull request #1194 from seleniumbase/safari-optimizations-and-test-updates

Safari optimizations and test updates

Author: mdmintz

examples/basic_test.py

@@ -1,5 +1,5 @@
 """
-Add an item to a shopping cart, and verify.
+Add an item to a shopping cart; verify; remove item; verify.
 """
 from seleniumbase import BaseCase
 
@@ -15,4 +15,6 @@ def test_basics(self):
         self.click("#shopping_cart_container a")
         self.assert_exact_text("YOUR CART", "span.title")
         self.assert_text("Backpack", "div.cart_item")
+        self.click('button:contains("Remove")')  # HTML innerText
+        self.assert_text_not_visible("Backpack", "div.cart_item")
         self.js_click("a#logout_sidebar_link")

examples/migration/protractor/example_test.py

@@ -13,10 +13,10 @@ def test_todo_list(self):
         # Verify that the todos are listed
         todos = self.find_visible_elements(todo_selector)
         self.assert_equal(len(todos), 2)
-        self.assert_equal(todos[1].text, "build an AngularJS app")
+        self.assert_equal(todos[1].text.strip(), "build an AngularJS app")
         # Verify adding a new todo
         self.type('[ng-model="todoList.todoText"]', "write a protractor test")
         self.click('[value="add"]')
         todos = self.find_visible_elements(todo_selector)
         self.assert_equal(len(todos), 3)
-        self.assert_equal(todos[2].text, "write a protractor test")
+        self.assert_equal(todos[2].text.strip(), "write a protractor test")

examples/offline_examples/demo_page.html

@@ -81,7 +81,7 @@
                 margin: 2px;
             }
             h1 {
-                font-size: 25px;
+                font-size: 24px;
                 color:#0066AA;
             }
             h2 {

examples/offline_examples/handle_alert_test.py

@@ -5,8 +5,6 @@
 @pytest.mark.offline  # Can be run with: "pytest -m offline"
 class OfflineTests(BaseCase):
     def test_alerts(self):
-        if self.browser == "safari":
-            self.skip("This test doesn't run on Safari! (alert issues)")
         self.open("data:,")
         self.execute_script('window.alert("ALERT!!!");')
         self.sleep(1)  # Not needed (Lets you see the alert pop up)

examples/raw_parameter_script.py

@@ -29,7 +29,7 @@
     pure_python = True
 
 if pure_python:
-    sb = MyTestClass("test_basics")
+    sb = MyTestClass("test_swag_labs")
     sb.browser = "chrome"
     sb.headless = False
     sb.headed = False
@@ -101,7 +101,7 @@
 
     sb.setUp()
     try:
-        sb.test_basics()
+        sb.test_swag_labs()
     finally:
         sb.tearDown()
         del sb

examples/swag_labs_suite.py

@@ -72,7 +72,7 @@ def test_swag_labs_basic_flow(self, username):
         self.click("button#finish")
         self.assert_exact_text("THANK YOU FOR YOUR ORDER", "h2")
         self.assert_element("img.pony_express")
-        self.click("#shopping_cart_container")
+        self.click("#shopping_cart_container a")
         self.assert_element_absent("div.inventory_item_name")
         self.click("button#continue-shopping")
         self.assert_element_absent("span.shopping_cart_badge")

examples/test_show_file_choosers.py

@@ -21,7 +21,8 @@ def test_show_file_choosers(self):
         my_file = "screenshot.png"
         file_path = os.path.join(dir_name, "example_logs/%s" % my_file)
         self.choose_file(choose_file_selector, file_path)
-        seen_path = "%s\\%s" % ("C:\\fakepath", my_file)
-        self.assert_attribute(choose_file_selector, "value", seen_path)
+        if self.browser != "safari":
+            seen_path = "%s\\%s" % ("C:\\fakepath", my_file)
+            self.assert_attribute(choose_file_selector, "value", seen_path)
         self.demo_mode = True
         self.assert_element(uploaded_image)

examples/user_agent_test.py

@@ -14,12 +14,13 @@ def test_user_agent(self):
             print("\n\nUser-Agent override = %s\n" % user_agent_detected)
         self.sleep(3)
 
+        if not self.is_chromium():
+            # Skip the rest of the test if not using a Chromium browser
+            msg = "\n* execute_cdp_cmd() is only for Chromium browsers"
+            print(msg)
+            self.skip(msg)
         try:
             # Now change the user-agent using "execute_cdp_cmd()"
-            if not self.is_chromium():
-                msg = "\n* execute_cdp_cmd() is only for Chromium browsers"
-                print(msg)
-                self.skip(msg)
             print("--------------------------")
             self.driver.execute_cdp_cmd(
                 "Network.setUserAgentOverride", {

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "2.4.4"
+__version__ = "2.4.5"

seleniumbase/fixtures/base_case.py

@@ -44,6 +44,7 @@ def test_anything(self):
     ElementClickInterceptedException as ECI_Exception,
     ElementNotInteractableException as ENI_Exception,
     MoveTargetOutOfBoundsException,
+    NoSuchElementException,
     NoSuchWindowException,
     StaleElementReferenceException,
     WebDriverException,
@@ -364,6 +365,8 @@ def click(
             self.wait_for_angularjs(timeout=settings.MINI_TIMEOUT)
             if self.driver.current_url != pre_action_url:
                 self.__ad_block_as_needed()
+        if self.browser == "safari":
+            time.sleep(0.02)
         if self.demo_mode:
             if self.driver.current_url != pre_action_url:
                 self.__demo_mode_pause_if_active()
@@ -4866,14 +4869,26 @@ def choose_file(
         if type(abs_path) is int or type(abs_path) is float:
             abs_path = str(abs_path)
         try:
-            element.send_keys(abs_path)
+            if self.browser == "safari":
+                try:
+                    element.send_keys(abs_path)
+                except NoSuchElementException:
+                    pass  # May get this error on Safari even if upload works.
+            else:
+                element.send_keys(abs_path)
         except (StaleElementReferenceException, ENI_Exception):
             self.wait_for_ready_state_complete()
             time.sleep(0.16)
             element = self.wait_for_element_present(
                 selector, by=by, timeout=timeout
             )
-            element.send_keys(abs_path)
+            if self.browser == "safari":
+                try:
+                    element.send_keys(abs_path)
+                except NoSuchElementException:
+                    pass  # May get this error on Safari even if upload works.
+            else:
+                element.send_keys(abs_path)
         if self.demo_mode:
             if self.driver.current_url != pre_action_url:
                 self.__demo_mode_pause_if_active()