Refactor 1

Author: Hani Yacoub

modules/browser_object_tabbar.py

@@ -136,6 +136,7 @@ def get_tab_title(self, tab_element: WebElement) -> str:
         tab_label = tab_element.find_element(*self.get_selector("tab-title"))
         return tab_label.text
 
+    @BasePage.context_chrome
     def expect_tab_sound_status(
         self, identifier: Union[str, int], status: MediaStatus
     ) -> BasePage:

tests/tabs/test_active_tab.py

@@ -4,6 +4,8 @@
 from modules.browser_object import TabBar
 
 
+NUM_TABS = 5
+
 @pytest.fixture()
 def test_case():
     return "134646"
@@ -14,15 +16,16 @@ def test_active_tab(driver: Firefox):
     """
     C134646, ensures that the selected tab is highlighted
     """
+
+    # Instantiate objects
     tabs = TabBar(driver)
-    num_tabs = 5
 
     # Open 5 tabs
-    for i in range(num_tabs):
+    for i in range(NUM_TABS):
         tabs.new_tab_by_button()
 
     # Go through all the tabs and ensure the focus is correct
-    for i in range(1, num_tabs + 2):
+    for i in range(1, NUM_TABS + 2):
         with driver.context(driver.CONTEXT_CHROME):
             target_tab = tabs.get_tab(i)
             target_tab.click()

tests/tabs/test_close_pinned_tab_via_mouse.py

@@ -16,25 +16,25 @@ def test_close_pinned_tab_via_middle_click(driver: Firefox):
     C134726 - Verify middle-clicking pinned tab will close it
     """
 
+    # Instantiate objects
     example = ExamplePage(driver)
-    example.open()
     tabs = TabBar(driver)
     tab_menu = ContextMenu(driver)
 
     # Open 2 new tabs
+    example.open()
     for _ in range(2):
         tabs.new_tab_by_button()
     tabs.wait_for_num_tabs(3)
 
     # Pin the first tab
-    with driver.context(driver.CONTEXT_CHROME):
-        first_tab = tabs.get_tab(1)
-        tabs.context_click(first_tab)
-        tab_menu.click_and_hide_menu("context-menu-pin-tab")
-        assert tabs.is_pinned(first_tab), "Expected the first tab to be pinned"
-
-        # Middle-click the pinned tab to close it
-        tabs.middle_click(first_tab)
+    first_tab = tabs.get_tab(1)
+    tabs.context_click(first_tab)
+    tab_menu.click_and_hide_menu("context-menu-pin-tab")
+    assert tabs.is_pinned(first_tab), "Expected the first tab to be pinned"
+
+    # Middle-click the pinned tab to close it
+    tabs.middle_click(first_tab)
 
     # Verify pinned tab was closed and 2 tabs remain
     tabs.wait_for_num_tabs(2)

tests/tabs/test_close_tab_through_middle_mouse_click.py

@@ -16,19 +16,19 @@ def test_close_tab_through_middle_mouse_click(driver: Firefox):
     C134645 - Verify that middle clicking a tab will close it
     """
 
+    # Instantiate objects
     example = ExamplePage(driver)
     tabs = TabBar(driver)
-    example.open()
 
     # Open 2 mnew tabs for a total of 3
+    example.open()
     for _ in range(2):
         tabs.new_tab_by_button()
     tabs.wait_for_num_tabs(3)
 
     # Ensure each tab exists and middle-click to close it
     for i in range(3, 1, -1):
-        with driver.context(driver.CONTEXT_CHROME):
-            tab_to_close = tabs.get_tab(i)
-            assert tab_to_close is not None, f"Expected tab index {i} to exist"
-            tabs.middle_click(tab_to_close)
+        tab_to_close = tabs.get_tab(i)
+        assert tab_to_close is not None, f"Expected tab index {i} to exist"
+        tabs.middle_click(tab_to_close)
         tabs.wait_for_num_tabs(i - 1)

tests/tabs/test_display_customize_button.py

@@ -18,15 +18,14 @@ def test_customize_button_displayed_in_tab_bar(driver: Firefox):
     and the Customize tab persists when switching tabs.
     """
 
+    # Instantiate objects
     panel_ui = PanelUi(driver)
     tabs = TabBar(driver)
     custom_page = CustomizeFirefox(driver)
-
-    # Open an initial example page
     example = ExamplePage(driver)
-    example.open()
 
     # Open customize firefox toolbar tab
+    example.open()
     panel_ui.open_panel_menu()
     panel_ui.navigate_to_customize_toolbar()
 

tests/tabs/test_mute_tabs.py

@@ -28,13 +28,17 @@ def add_to_prefs_list():
 @pytest.mark.audio
 def test_mute_unmute_tab(screenshot, driver: Firefox, video_url: str):
     """C134719, test that tabs can be muted and unmuted"""
+
+    # Instantiate objects
     tabs = TabBar(driver)
+
+    # Open the video URL and verify the page title contains "mov_bbb.mp4"
     driver.get(video_url)
     tabs.expect(EC.title_contains("mov_bbb.mp4"))
 
-    with driver.context(driver.CONTEXT_CHROME):
-        tabs.expect_tab_sound_status(1, tabs.MEDIA_STATUS.PLAYING)
-        tabs.click_tab_mute_button(1)
-        tabs.expect_tab_sound_status(1, tabs.MEDIA_STATUS.MUTED)
-        tabs.click_tab_mute_button(1)
-        tabs.expect_tab_sound_status(1, tabs.MEDIA_STATUS.PLAYING)
+    # Check that the tab is currently playing audio and click on mute
+    tabs.expect_tab_sound_status(1, tabs.MEDIA_STATUS.PLAYING)
+    tabs.click_tab_mute_button(1)
+    tabs.expect_tab_sound_status(1, tabs.MEDIA_STATUS.MUTED)
+    tabs.click_tab_mute_button(1)
+    tabs.expect_tab_sound_status(1, tabs.MEDIA_STATUS.PLAYING)

tests/tabs/test_navigation_multiple_tabs.py

@@ -5,6 +5,7 @@
 
 from modules.browser_object import TabBar
 
+NUM_TABS = 20
 
 @pytest.fixture()
 def test_case():
@@ -14,11 +15,11 @@ def test_case():
 def test_navigation_multiple_tabs(driver: Firefox):
     """C134647 - Verify that navigation through multiple tabs is allowed"""
 
+    # Instantiate objects
     tabs = TabBar(driver)
-    num_tabs = 20
 
     # Open multiple tabs
-    for _ in range(num_tabs):
+    for _ in range(NUM_TABS):
         tabs.new_tab_by_button()
 
     with driver.context(driver.CONTEXT_CHROME):