Refactoring

mdmintz · mdmintz · commit 74aaa4b8a155 · 2022-06-24T14:14:17.000-04:00
diff --git a/examples/behave_bdd/features/steps/swag_labs.py b/examples/behave_bdd/features/steps/swag_labs.py
@@ -86,8 +86,7 @@ def click_continue(context):
 def verify_item_in_cart(context, quantity, item):
     sb = context.sb
     sb.assert_exact_text(
-        quantity,
-        'div.cart_item:contains("%s") div.cart_quantity' % item
+        quantity, 'div.cart_item:contains("%s") div.cart_quantity' % item
     )
 
 
@@ -97,37 +96,31 @@ def verify_cost_of_item(context, item, var):
     earlier_price = sb.variables[var]
     sb.assert_exact_text(
         earlier_price,
-        'div.cart_item_label:contains("%s") .inventory_item_price' % item
+        'div.cart_item_label:contains("%s") .inventory_item_price' % item,
     )
 
 
 @step("Verify item total is {item_total}")
 def verify_item_total(context, item_total):
     sb = context.sb
     sb.assert_exact_text(
-        "Item total: %s" % item_total,
-        "div.summary_subtotal_label",
-        timeout=1
+        "Item total: %s" % item_total, "div.summary_subtotal_label", timeout=1
     )
 
 
 @step("Verify tax amount is {tax_amount}")
 def verify_tax_amount(context, tax_amount):
     sb = context.sb
     sb.assert_exact_text(
-        "Tax: %s" % tax_amount,
-        "div.summary_tax_label",
-        timeout=1
+        "Tax: %s" % tax_amount, "div.summary_tax_label", timeout=1
     )
 
 
 @step("Verify total cost is {total_cost}")
 def verify_total_cost(context, total_cost):
     sb = context.sb
     sb.assert_exact_text(
-        "Total: %s" % total_cost,
-        "div.summary_total_label",
-        timeout=1
+        "Total: %s" % total_cost, "div.summary_total_label", timeout=1
     )
 
 
diff --git a/examples/hack_the_planet.py b/examples/hack_the_planet.py
@@ -69,7 +69,7 @@ def test_all_your_base_are_belong_to_us(self):
         self.highlight("h2", loops=9, scroll=False)
 
         self.open("https://google.com/ncr")
-        self.hide_elements('iframe')
+        self.hide_elements("iframe")
         self.set_text_content('a[href*="about.google"]', ayb)
         self.set_text_content('a[href*="store.google"]', abtu)
         self.set_text_content('a[href*="mail.google.com"]', ayb)
diff --git a/examples/parameterized_test.py b/examples/parameterized_test.py
@@ -12,7 +12,7 @@ class GoogleTests(BaseCase):
     )
     def test_parameterized_google_search(self, search_key, expected_text, img):
         self.open("https://google.com/ncr")
-        self.hide_elements('iframe')
+        self.hide_elements("iframe")
         self.type('input[title="Search"]', search_key + "\n")
         self.assert_text(expected_text, "#search")
         self.click('a:contains("%s")' % expected_text)
diff --git a/examples/test_hack_search.py b/examples/test_hack_search.py
@@ -13,7 +13,7 @@ def test_hack_search(self):
             print("\n  This test is not for Headless Mode.")
             self.skip('Do not use "--headless" with this test.')
         self.open("https://google.com/ncr")
-        self.hide_elements('iframe')
+        self.hide_elements("iframe")
         self.assert_element('input[title="Search"]')
         self.set_attribute('[action="/search"]', "action", "//bing.com/search")
         self.set_attributes('[value="Google Search"]', "value", "Bing Search")
diff --git a/examples/tour_examples/bootstrap_google_tour.py b/examples/tour_examples/bootstrap_google_tour.py
@@ -5,7 +5,7 @@ class MyTourClass(BaseCase):
     def test_google_tour(self):
         self.open("https://google.com/ncr")
         self.wait_for_element('input[title="Search"]')
-        self.hide_elements('iframe')
+        self.hide_elements("iframe")
 
         self.create_bootstrap_tour()  # OR self.create_tour(theme="bootstrap")
         self.add_tour_step("Welcome to Google!", title="SeleniumBase Tours")
diff --git a/examples/tour_examples/google_tour.py b/examples/tour_examples/google_tour.py
@@ -5,7 +5,7 @@ class MyTourClass(BaseCase):
     def test_google_tour(self):
         self.open("https://google.com/ncr")
         self.wait_for_element('input[title="Search"]')
-        self.hide_elements('iframe')
+        self.hide_elements("iframe")
 
         # Create a website tour using the ShepherdJS library with "dark" theme
         # Same as:  self.create_shepherd_tour(theme="dark")
diff --git a/examples/tour_examples/hopscotch_google_tour.py b/examples/tour_examples/hopscotch_google_tour.py
@@ -5,7 +5,7 @@ class MyTourClass(BaseCase):
     def test_google_tour(self):
         self.open("https://google.com/ncr")
         self.wait_for_element('input[title="Search"]')
-        self.hide_elements('iframe')
+        self.hide_elements("iframe")
 
         self.create_hopscotch_tour()  # OR self.create_tour(theme="hopscotch")
         self.add_tour_step("Welcome to Google!", title="SeleniumBase Tours")
diff --git a/examples/tour_examples/introjs_google_tour.py b/examples/tour_examples/introjs_google_tour.py
@@ -5,7 +5,7 @@ class MyTourClass(BaseCase):
     def test_google_tour(self):
         self.open("https://google.com/ncr")
         self.wait_for_element('input[title="Search"]')
-        self.hide_elements('iframe')
+        self.hide_elements("iframe")
 
         self.create_introjs_tour()  # OR self.create_tour(theme="introjs")
         self.add_tour_step("Welcome to Google!", title="SeleniumBase Tours")
diff --git a/examples/tour_examples/maps_introjs_tour.py b/examples/tour_examples/maps_introjs_tour.py
@@ -49,7 +49,7 @@ def test_google_maps_tour(self):
         )
         self.add_tour_step(
             "Thanks for using SeleniumBase Tours!",
-            title="🚃 End of Guided Tour 🚃"
+            title="🚃 End of Guided Tour 🚃",
         )
         self.export_tour(filename="maps_introjs_tour.js")
         self.play_tour()
diff --git a/examples/tour_examples/shepherd_google_tour.py b/examples/tour_examples/shepherd_google_tour.py
@@ -5,7 +5,7 @@ class MyTourClass(BaseCase):
     def test_google_tour(self):
         self.open("https://google.com/ncr")
         self.wait_for_element('input[title="Search"]')
-        self.hide_elements('iframe')
+        self.hide_elements("iframe")
 
         self.create_shepherd_tour(theme="dark")
         self.add_tour_step("Welcome to Google!", title="SeleniumBase Tours")
diff --git a/seleniumbase/console_scripts/sb_behave_gui.py b/seleniumbase/console_scripts/sb_behave_gui.py
@@ -249,12 +249,12 @@ def create_tkinter_gui(tests, command_string):
         cb = tk.Checkbutton(
             text_area,
             text=(row),
-            bg='white',
-            anchor='w',
+            bg="white",
+            anchor="w",
             variable=ara[count],
         )
-        text_area.window_create('end', window=cb)
-        text_area.insert('end', '\n')
+        text_area.window_create("end", window=cb)
+        text_area.insert("end", "\n")
         count += 1
 
     tk.Label(root, text="").pack()
diff --git a/seleniumbase/console_scripts/sb_commander.py b/seleniumbase/console_scripts/sb_commander.py
@@ -260,20 +260,20 @@ def create_tkinter_gui(tests, command_string):
         cb = tk.Checkbutton(
             text_area,
             text=(row),
-            bg='white',
-            anchor='w',
+            bg="white",
+            anchor="w",
             variable=ara[count],
         )
-        text_area.window_create('end', window=cb)
-        text_area.insert('end', '\n')
+        text_area.window_create("end", window=cb)
+        text_area.insert("end", "\n")
         count += 1
 
     tk.Label(root, text="").pack()
     additional_options = ""
     aopts = tk.StringVar(value=additional_options)
     tk.Label(
         root,
-        text='Additional pytest Options:  (space-separated)',
+        text="Additional pytest Options:  (space-separated)",
         fg="blue",
     ).pack()
     entry = tk.Entry(root, textvariable=aopts)
diff --git a/seleniumbase/console_scripts/sb_mkdir.py b/seleniumbase/console_scripts/sb_mkdir.py
@@ -326,7 +326,7 @@ def main():
     data.append('        self.open("https://www.saucedemo.com")')
     data.append('        self.type("#user-name", "standard_user")')
     data.append('        self.type("#password", "secret_sauce\\n")')
-    data.append('        self.assert_element("#inventory_container")')
+    data.append('        self.assert_element("div.inventory_list")')
     data.append('        self.assert_text("PRODUCTS", "span.title")')
     data.append("        self.click('button[name*=\"backpack\"]')")
     data.append('        self.click("#shopping_cart_container a")')
@@ -680,7 +680,7 @@ def main():
     data.append("class MyTests:")
     data.append("    def test_swag_labs_login(self, sb):")
     data.append('        LoginPage().login_to_swag_labs(sb, "standard_user")')
-    data.append('        sb.assert_element("#inventory_container")')
+    data.append('        sb.assert_element("div.inventory_list")')
     data.append(
         "        sb.assert_element('div:contains(\"Sauce Labs Backpack\")')"
     )
diff --git a/seleniumbase/fixtures/base_case.py b/seleniumbase/fixtures/base_case.py
@@ -9545,9 +9545,7 @@ def post_message(self, message, duration=None, pause=True, style="info"):
             duration = float(duration) + 0.15
             time.sleep(float(duration))
 
-    def post_message_and_highlight(
-        self, message, selector, by="css selector"
-    ):
+    def post_message_and_highlight(self, message, selector, by="css selector"):
         """Post a message on the screen and highlight an element.
         Arguments:
             message: The message to display.
@@ -10313,9 +10311,7 @@ def wait_for_element_absent(
             original_selector=original_selector,
         )
 
-    def assert_element_absent(
-        self, selector, by="css selector", timeout=None
-    ):
+    def assert_element_absent(self, selector, by="css selector", timeout=None):
         """Similar to wait_for_element_absent()
         As above, will raise an exception if the element stays present.
         A hidden element counts as a present element, which fails this assert.
@@ -10403,9 +10399,7 @@ def assert_text_not_visible(
             timeout = settings.SMALL_TIMEOUT
         if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
-        self.wait_for_text_not_visible(
-            text, selector, by=by, timeout=timeout
-        )
+        self.wait_for_text_not_visible(text, selector, by=by, timeout=timeout)
         if self.recorder_mode:
             url = self.get_current_url()
             if url and len(url) > 0:
diff --git a/seleniumbase/fixtures/constants.py b/seleniumbase/fixtures/constants.py
@@ -137,9 +137,7 @@ class Underscore:
 
 class Backbone:
     VER = "1.4.1"
-    MIN_JS = (
-        "https://cdn.jsdelivr.net/npm/backbone@%s/backbone.min.js" % VER
-    )
+    MIN_JS = "https://cdn.jsdelivr.net/npm/backbone@%s/backbone.min.js" % VER
 
 
 class HtmlInspector:
diff --git a/seleniumbase/plugins/base_plugin.py b/seleniumbase/plugins/base_plugin.py
@@ -193,10 +193,7 @@ def beforeTest(self, test):
         variables = self.options.variables
         if variables and type(variables) is str and len(variables) > 0:
             bad_input = False
-            if (
-                not variables.startswith("{")
-                or not variables.endswith("}")
-            ):
+            if not variables.startswith("{") or not variables.endswith("}"):
                 bad_input = True
             else:
                 try:

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class GoogleTests(BaseCase):`
`12`	`12`	`)`
`13`	`13`	`def test_parameterized_google_search(self, search_key, expected_text, img):`
`14`	`14`	`self.open("https://google.com/ncr")`
`15`		`- self.hide_elements('iframe')`
	`15`	`+ self.hide_elements("iframe")`
`16`	`16`	`self.type('input[title="Search"]', search_key + "\n")`
`17`	`17`	`self.assert_text(expected_text, "#search")`
`18`	`18`	`self.click('a:contains("%s")' % expected_text)`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ def test_google_maps_tour(self):`
`49`	`49`	`)`
`50`	`50`	`self.add_tour_step(`
`51`	`51`	`"Thanks for using SeleniumBase Tours!",`
`52`		`- title="🚃 End of Guided Tour 🚃"`
	`52`	`+ title="🚃 End of Guided Tour 🚃",`
`53`	`53`	`)`
`54`	`54`	`self.export_tour(filename="maps_introjs_tour.js")`
`55`	`55`	`self.play_tour()`