Update the Swag Labs tests

Author: mdmintz

examples/swag_labs_suite.py

@@ -5,12 +5,12 @@
 
 class SwagLabsTests(BaseCase):
 
-    def login(self, user="standard_user"):
+    def login(self, username="standard_user"):
         """ Login to Swag Labs and verify that login was successful. """
         self.open("https://www.saucedemo.com/")
-        if user not in self.get_text("#login_credentials"):
-            self.fail("Invalid user for login: %s" % user)
-        self.update_text("#user-name", user)
+        if username not in self.get_text("#login_credentials"):
+            self.fail("Invalid user for login: %s" % username)
+        self.update_text("#user-name", username)
         self.update_text("#password", "secret_sauce")
         self.click('input[type="submit"]')
         self.assert_element("#inventory_container")
@@ -21,10 +21,10 @@ def login(self, user="standard_user"):
         ["problem_user"],
     ])
     @pytest.mark.run(order=1)
-    def test_swag_labs_basic_functional_flow(self, user):
+    def test_swag_labs_basic_functional_flow(self, username):
         """ This test checks functional flow of the Swag Labs store.
             This test is parameterized, and receives the user for login. """
-        self.login(user=user)
+        self.login(username=username)
 
         # Verify that the "Test.allTheThings() T-Shirt" appears on the page
         item_name = "Test.allTheThings() T-Shirt"
@@ -48,7 +48,11 @@ def test_swag_labs_basic_functional_flow(self, user):
         self.assert_text(item_name, "div.inventory_item_name")
         self.assert_exact_text("1", "div.cart_quantity")
         self.assert_exact_text("REMOVE", "button.cart_button")
-        self.assert_element("link=CONTINUE SHOPPING")
+        continue_shopping_button = "link=CONTINUE SHOPPING"
+        if self.browser == "safari":
+            # Safari sees this element differently
+            continue_shopping_button = "link=Continue Shopping"
+        self.assert_element(continue_shopping_button)
 
         # Checkout - Add info
         self.click("link=CHECKOUT")
@@ -72,16 +76,16 @@ def test_swag_labs_basic_functional_flow(self, user):
         self.assert_element("div.pony_express")
         self.click("#shopping_cart_container path")
         self.assert_element_absent("div.inventory_item_name")
-        self.click("link=CONTINUE SHOPPING")
+        self.click(continue_shopping_button)
         self.assert_element_absent("span.shopping_cart_badge")
 
     @parameterized.expand([
         ["standard_user"],
         ["problem_user"],
     ])
     @pytest.mark.run(order=2)
-    def test_swag_labs_products_page_resource_verification(self, user):
+    def test_swag_labs_products_page_resource_verification(self, username):
         """ This test checks for 404 errors on the Swag Labs products page.
             This test is parameterized, and receives the user for login. """
-        self.login(user=user)
+        self.login(username=username)
         self.assert_no_404_errors()

examples/test_swag_labs.py

@@ -3,20 +3,20 @@
 
 class SwagLabsTests(BaseCase):
 
-    def login(self, user="standard_user"):
+    def login(self, username="standard_user"):
         """ Login to Swag Labs and verify that login was successful. """
         self.open("https://www.saucedemo.com/")
-        if user not in self.get_text("#login_credentials"):
-            self.fail("Invalid user for login: %s" % user)
-        self.update_text("#user-name", user)
+        if username not in self.get_text("#login_credentials"):
+            self.fail("Invalid user for login: %s" % username)
+        self.update_text("#user-name", username)
         self.update_text("#password", "secret_sauce")
         self.click('input[type="submit"]')
         self.assert_element("#inventory_container")
         self.assert_text("Products", "div.product_label")
 
     def test_swag_labs_basic_flow(self):
         """ This test checks functional flow of the Swag Labs store. """
-        self.login(user="standard_user")
+        self.login(username="standard_user")
 
         # Verify that the "Test.allTheThings() T-Shirt" appears on the page
         item_name = "Test.allTheThings() T-Shirt"
@@ -40,7 +40,12 @@ def test_swag_labs_basic_flow(self):
         self.assert_text(item_name, "div.inventory_item_name")
         self.assert_exact_text("1", "div.cart_quantity")
         self.assert_exact_text("REMOVE", "button.cart_button")
-        self.assert_element("link=CONTINUE SHOPPING")
+        continue_shopping_button = "link=CONTINUE SHOPPING"
+        if self.browser == "safari":
+            # Safari sees this element differently
+            continue_shopping_button = "link=Continue Shopping"
+        self.assert_element(continue_shopping_button)
+
 
         # Checkout - Add info
         self.click("link=CHECKOUT")
@@ -64,5 +69,5 @@ def test_swag_labs_basic_flow(self):
         self.assert_element("div.pony_express")
         self.click("#shopping_cart_container path")
         self.assert_element_absent("div.inventory_item_name")
-        self.click("link=CONTINUE SHOPPING")
+        self.click(continue_shopping_button)
         self.assert_element_absent("span.shopping_cart_badge")