remove unnecessary panelui function

Author: ben-c-at-moz

modules/browser_object_find_toolbar.py

@@ -21,7 +21,7 @@ def __init__(self, driver: Firefox, **kwargs):
     def open(self) -> BasePage:
         """Use PanelUi to open the Find Toolbar, wait for element to load"""
         self.panel_ui.open_panel_menu()
-        self.panel_ui.select_panel_setting("find-in-page")
+        self.panel_ui.click_on("find-in-page")
         self.wait_for_page_to_load()
         return self
 

modules/browser_object_panel_ui.py

@@ -1,5 +1,4 @@
-import logging
-import time
+from time import sleep
 from typing import List
 
 from pypom import Region
@@ -48,46 +47,27 @@ def open_panel_menu(self) -> BasePage:
         self.menu = self.Menu(self, root=panel_root)
         return self
 
-    def select_panel_setting(self, name: str, *labels) -> BasePage:
-        """
-        Selects a panel setting in PanelUi.
-
-        ...
-
-        Parameters
-        ----------
-
-        name: str
-            Name of setting element
-        labels: *list[str]
-            Labels to pass to get_element()
-        """
-        self.click_on(name, labels=labels)
-        return self
-
     def navigate_to_about_addons(self):
         """
         On the hamburger menu > More Tools > Customize Toolbar > Manage Themes
         """
-        self.select_panel_setting("more-tools")
-        self.select_panel_setting("customize-toolbar")
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.get_element("manage-themes").click()
+        self.click_on("more-tools")
+        self.click_on("customize-toolbar")
+        self.click_on("manage-themes")
 
     def navigate_to_customize_toolbar(self):
         """
         On the hamburger menu > More Tools > Customize Toolbar
         """
-        self.select_panel_setting("more-tools")
-        self.select_panel_setting("customize-toolbar")
+        self.click_on("more-tools")
+        self.click_on("customize-toolbar")
 
     def click_sync_sign_in_button(self) -> BasePage:
         """
         Click FxA sync button.
         """
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.open_panel_menu()
-            self.select_panel_setting("fxa-sign-in")
+        self.open_panel_menu()
+        self.click_on("fxa-sign-in")
         return self
 
     def log_out_fxa(self) -> BasePage:
@@ -154,8 +134,10 @@ def open_history_menu(self) -> BasePage:
         """
         Opens the History menu
         """
-        if not self.get_elements("panel-main-view"):
-            self.open_panel_menu()
+        self.open_panel_menu()
+        self.element_visible("panel-main-view")
+        if self.sys_platform() == "Windows":
+            sleep(2)
         self.click_on("panel-ui-history")
         self.element_visible("panel-ui-history-view")
         return self

modules/browser_object_print_preview.py

@@ -21,13 +21,13 @@ class PrintPreview(BasePage):
 
     URL_TEMPLATE = "about:blank"
 
+    @BasePage.context_chrome
     def open(self) -> BasePage:
         """Use PanelUi to open the Print Preview, wait for element to load"""
         panel_ui = PanelUi(self.driver)
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            panel_ui.open_panel_menu()
-            panel_ui.select_panel_setting("print-option")
-            self.wait_for_page_to_load()
+        panel_ui.open_panel_menu()
+        panel_ui.click_on("print-option")
+        self.wait_for_page_to_load()
         return self
 
     def open_with_key_combo(self) -> BasePage:

tests/bookmarks_and_history/test_opened_website_in_new_tab_present_in_toolbar_history.py

@@ -1,8 +1,7 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object_panel_ui import PanelUi
-from modules.browser_object_tabbar import TabBar
+from modules.browser_object import PanelUi, TabBar
 from modules.page_object_generics import GenericPage