Merge pull request #833 from seleniumbase/update-method-and-dependencies

Improve reliability of asserting that there are no 404-errors

Author: mdmintz

examples/swag_labs_suite.py

@@ -86,6 +86,23 @@ def test_swag_labs_basic_flow(self, username):
     @pytest.mark.run(order=2)
     def test_swag_labs_products_page_links(self, username):
         """ This test checks for 404s on the Swag Labs products page.
-            This test is parameterized on the login user. """
+            This test is parameterized on the login user.
+            Swag Labs replaced broken links with dog images for the
+                "problem_user" login, so the test switches those back
+                to demonstrate the "assert_no_404_errors()" method. """
         self.login_to_swag_labs(username=username)
+        self.set_attributes('img[src*="/sl-404"]', "src", "/bad_link.jpg")
         self.assert_no_404_errors()
+
+    @parameterized.expand([
+        ["standard_user"],
+        ["problem_user"],
+    ])
+    @pytest.mark.run(order=3)
+    def test_swag_labs_visual_regressions(self, username):
+        """ This test checks for visual regressions on the Swag Labs page.
+            This test is parameterized on the login user. """
+        self.login_to_swag_labs(username="standard_user")
+        self.check_window(baseline=True)
+        self.login_to_swag_labs(username=username)
+        self.check_window(level=3)

requirements.txt

@@ -87,6 +87,6 @@ pyflakes==2.2.0;python_version>="3.5"
 tornado==5.1.1;python_version<"3.5"
 tornado==6.1;python_version>="3.5"
 allure-pytest==2.8.22;python_version<"3.5"
-allure-pytest==2.8.35;python_version>="3.5"
+allure-pytest==2.8.36;python_version>="3.5"
 pdfminer.six==20191110;python_version<"3.5"
 pdfminer.six==20201018;python_version>="3.5"

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "1.56.5"
+__version__ = "1.56.6"

seleniumbase/fixtures/base_case.py

@@ -2758,7 +2758,12 @@ def assert_link_status_code_is_not_404(self, link):
     def __get_link_if_404_error(self, link):
         status_code = str(self.get_link_status_code(link))
         if status_code == "404":
-            return link
+            # Verify again to be sure. (In case of multi-threading overload.)
+            status_code = str(self.get_link_status_code(link))
+            if status_code == "404":
+                return link
+            else:
+                return None
         else:
             return None
 

setup.py

@@ -191,7 +191,7 @@
         'tornado==5.1.1;python_version<"3.5"',
         'tornado==6.1;python_version>="3.5"',
         'allure-pytest==2.8.22;python_version<"3.5"',
-        'allure-pytest==2.8.35;python_version>="3.5"',
+        'allure-pytest==2.8.36;python_version>="3.5"',
         'pdfminer.six==20191110;python_version<"3.5"',
         'pdfminer.six==20201018;python_version>="3.5"',
     ],