Batch 2

Author: Hani Yacoub

modules/browser_object_tabbar.py

@@ -316,3 +316,13 @@ def open_multiple_tabs_with_pages(self, pages: list) -> "TabBar":
             else:
                 page.open()
         return self
+
+    @BasePage.context_chrome
+    def verify_tab_focus_cycle(self, num_tabs: int):
+        """Go through all the tabs and ensure the focus changes correctly."""
+        for i in range(1, num_tabs + 2):
+            target_tab = self.get_tab(i)
+            self.click_on(target_tab)
+            self.custom_wait(timeout=3).until(
+                lambda d: target_tab.get_attribute("visuallyselected") == ""
+            )

tests/tabs/test_active_tab.py

@@ -6,6 +6,7 @@
 
 NUM_TABS = 5
 
+
 @pytest.fixture()
 def test_case():
     return "134646"
@@ -25,10 +26,4 @@ def test_active_tab(driver: Firefox):
         tabs.new_tab_by_button()
 
     # Go through all the tabs and ensure the focus is correct
-    for i in range(1, NUM_TABS + 2):
-        with driver.context(driver.CONTEXT_CHROME):
-            target_tab = tabs.get_tab(i)
-            target_tab.click()
-            tabs.custom_wait(timeout=3).until(
-                lambda d: target_tab.get_attribute("visuallyselected") == ""
-            )
+    tabs.verify_tab_focus_cycle(NUM_TABS)

tests/tabs/test_navigation_multiple_tabs.py

@@ -1,12 +1,11 @@
 import logging
-
 import pytest
 from selenium.webdriver import Firefox
-
 from modules.browser_object import TabBar
 
 NUM_TABS = 20
 
+
 @pytest.fixture()
 def test_case():
     return "134654"

tests/tabs/test_open_bookmark_in_new_tab.py

@@ -14,9 +14,11 @@ def test_case():
 
 BOOKMARK_URL = "https://www.youtube.com/"
 BOOKMARK_TITLE = "YouTube"
+EXPECTED_TEST = "youtube"
 
 
 def test_open_bookmark_in_new_tab(driver: Firefox):
+
     """
     C134460: Verify that New Tabs can be opened by right clicking and selecting new tab from the bookmarks.
     """
@@ -39,6 +41,6 @@ def test_open_bookmark_in_new_tab(driver: Firefox):
     tabs.wait_for_num_tabs(3)
     driver.switch_to.window(driver.window_handles[-1])
 
-    WebDriverWait(driver, 5).until(EC.url_contains("youtube"))
-    assert "youtube" in driver.current_url
-    page.url_contains("youtube")
+    WebDriverWait(driver, 5).until(EC.url_contains(EXPECTED_TEST))
+    assert EXPECTED_TEST in driver.current_url
+    page.url_contains(EXPECTED_TEST)

tests/tabs/test_open_new_tab.py

@@ -5,6 +5,10 @@
 from modules.browser_object import TabBar
 
 
+URL = "about:robots"
+EXPECTED_TEXT = "Firefox"
+
+
 @pytest.fixture()
 def test_case():
     return "134453"
@@ -14,11 +18,15 @@ def test_open_new_tab_plus(driver: Firefox):
     """
     C134453 - A new tab can be opened from the dedicated button ("+")
     """
+
+    # Instantiate object
     browser = TabBar(driver)
-    driver.get("about:robots")
+
+    # Open page and check a new tab can be opened from the dedicated button ("+")
+    driver.get(URL)
     browser.set_chrome_context()
     browser.new_tab_by_button()
-    browser.expect(EC.title_contains("Firefox"))
-    assert "Firefox" in driver.title, (
+    browser.expect(EC.title_contains(EXPECTED_TEXT))
+    assert EXPECTED_TEXT in driver.title, (
         f"Expected title to contain 'Firefox', but got '{driver.title}'"
     )

tests/tabs/test_open_new_tab_keys.py

@@ -1,10 +1,13 @@
 import pytest
 from selenium.webdriver import Firefox
 from selenium.webdriver.support import expected_conditions as EC
-
 from modules.browser_object import TabBar
 
 
+URL = "about:robots"
+EXPECTED_TEXT = "Firefox"
+
+
 @pytest.fixture()
 def test_case():
     return "134442"
@@ -14,11 +17,15 @@ def test_open_new_tab_via_keyboard(driver: Firefox, sys_platform: str):
     """
     C134442 - A new tab can be opened via keyboard combinations
     """
+
+    # Instantiate object
     browser = TabBar(driver)
-    driver.get("about:robots")
+
+    # Open page and check a new tab can be opened via keyboard combinations
+    driver.get(URL)
     browser.set_chrome_context()
     browser.new_tab_by_keys(sys_platform)
-    browser.expect(EC.title_contains("Firefox"))
-    assert "Firefox" in driver.title, (
+    browser.expect(EC.title_contains(EXPECTED_TEXT))
+    assert EXPECTED_TEXT in driver.title, (
         f"Expected title to contain 'Firefox', but got '{driver.title}'"
     )