Update example tests

Author: mdmintz

examples/raw_parameter_script.py

@@ -57,7 +57,7 @@
     sb.extension_zip = None
     sb.extension_dir = None
     sb.database_env = "test"
-    sb.log_path = "latest_logs/"
+    sb.log_path = "latest_logs"
     sb.archive_logs = False
     sb.disable_csp = False
     sb.disable_ws = False

examples/swag_labs_suite.py

@@ -81,10 +81,8 @@ def tearDown(self):
         self.save_teardown_screenshot()
         # Reset App State and Logout if the controls are present
         try:
-            if self.is_element_present("a#reset_sidebar_link"):
-                self.js_click("a#reset_sidebar_link")
-            if self.is_element_present("a#logout_sidebar_link"):
-                self.js_click("a#logout_sidebar_link")
+            self.js_click_if_present("a#reset_sidebar_link")
+            self.js_click_if_present("a#logout_sidebar_link")
         except Exception:
             pass
         super(SwagLabsTests, self).tearDown()

examples/test_image_saving.py

@@ -26,8 +26,9 @@ def test_1_save_element_as_image_file(self):
         file_name = "comic.png"
         folder = "images_exported"
         self.save_element_as_image_file(selector, file_name, folder)
-        self.assert_true(os.path.exists("%s/%s" % (folder, file_name)))
-        print('\n"%s/%s" was saved!' % (folder, file_name))
+        file_path = os.path.join(folder, file_name)
+        self.assert_true(os.path.exists(file_path))
+        print('\n"%s" was saved!' % file_path)
 
     # @pytest.mark.run(order=2)
     def test_2_add_text_overlay_to_image(self):
@@ -40,8 +41,9 @@ def test_2_add_text_overlay_to_image(self):
         self.save_element_as_image_file(
             selector, file_name, folder, overlay_text
         )
-        self.assert_true(os.path.exists("%s/%s" % (folder, file_name)))
-        print('\n"%s/%s" was saved!' % (folder, file_name))
+        file_path = os.path.join(folder, file_name)
+        self.assert_true(os.path.exists(file_path))
+        print('\n"%s" was saved!' % file_path)
 
     # @pytest.mark.run(order=3)
     def test_3_add_text_overlay_to_page_section(self):
@@ -59,8 +61,9 @@ def test_3_add_text_overlay_to_page_section(self):
         self.save_element_as_image_file(
             selector, file_name, folder, overlay_text
         )
-        self.assert_true(os.path.exists("%s/%s" % (folder, file_name)))
-        print('\n"%s/%s" was saved!' % (folder, file_name))
+        file_path = os.path.join(folder, file_name)
+        self.assert_true(os.path.exists(file_path))
+        print('\n"%s" was saved!' % file_path)
 
     # @pytest.mark.run(order=4)
     def test_4_add_text_overlay_to_full_page(self):
@@ -74,5 +77,6 @@ def test_4_add_text_overlay_to_full_page(self):
         self.save_element_as_image_file(
             selector, file_name, folder, overlay_text
         )
-        self.assert_true(os.path.exists("%s/%s" % (folder, file_name)))
-        print('\n"%s/%s" was saved!' % (folder, file_name))
+        file_path = os.path.join(folder, file_name)
+        self.assert_true(os.path.exists(file_path))
+        print('\n"%s" was saved!' % file_path)

examples/test_swag_labs.py

@@ -69,10 +69,8 @@ def tearDown(self):
         self.save_teardown_screenshot()
         # Reset App State and Logout if the controls are present
         try:
-            if self.is_element_present("a#reset_sidebar_link"):
-                self.js_click("a#reset_sidebar_link")
-            if self.is_element_present("a#logout_sidebar_link"):
-                self.js_click("a#logout_sidebar_link")
+            self.js_click_if_present("a#reset_sidebar_link")
+            self.js_click_if_present("a#logout_sidebar_link")
         except Exception:
             pass
         super(SwagLabsTests, self).tearDown()