nerge changes in and fix

Author: sarinali

modules/browser_object_panel_ui.py

@@ -141,3 +141,12 @@ def open_private_window(self) -> BasePage:
         with self.driver.context(self.driver.CONTEXT_CHROME):
             self.get_element("panel-ui-new-private-window").click()
         return self
+
+    def open_history_menu(self) -> BasePage:
+        """
+        Opens the History menu
+        """
+        self.open_panel_menu()
+        with self.driver.context(self.driver.CONTEXT_CHROME):
+            self.get_element("panel-ui-history").click()
+        return self

modules/data/panel_ui.components.json

@@ -127,6 +127,12 @@
         "groups": []
     },
 
+    "recent-history-content": {
+        "selectorData": "#appMenu_historyMenu .toolbarbutton-text",
+        "strategy": "css",
+        "groups": []
+    },
+
     "panel-ui-history-recent-history-container": {
         "selectorData": "appMenu_historyMenu",
         "strategy": "id",

tests/security_and_privacy/test_never_remember_browsing_history.py

@@ -69,10 +69,9 @@ def test_never_remember_browsing_history_from_panel(driver: Firefox):
         for i in range(num_tabs):
             x_icon[i].click()
 
-    panel_ui.open_panel_menu()
+        panel_ui.open_panel_menu()
 
-    # go into the history tab
-    with driver.context(driver.CONTEXT_CHROME):
+        # go into the history tab
         panel_ui.get_element("panel-ui-history").click()
 
         # check for history

tests/security_and_privacy/test_private_session_history_exclusion.py

@@ -0,0 +1,41 @@
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object_panel_ui import PanelUi
+
+YOUTUBE_URL = "https://www.youtube.com/"
+FACEBOOK_URL = "https://www.facebook.com/"
+AMAZON_URL = "https://www.amazon.com/"
+
+
+@pytest.fixture()
+def add_prefs():
+    return []
+
+
+def test_websites_visited_in_private_browser_not_displayed_in_history(driver: Firefox):
+    """
+    C101663 - Verify the visited websites from the Private Browsing session are not displayed inside the normal session
+    History menu
+    """
+
+    initial_window_handle = driver.current_window_handle
+
+    panel_ui = PanelUi(driver).open()
+    panel_ui.open_private_window()
+    panel_ui.switch_to_new_window()
+
+    driver.get(YOUTUBE_URL)
+    driver.get(FACEBOOK_URL)
+    driver.get(AMAZON_URL)
+
+    driver.switch_to.window(initial_window_handle)
+
+    panel_ui.open_history_menu()
+    with panel_ui.driver.context(panel_ui.driver.CONTEXT_CHROME):
+        empty_label = panel_ui.get_element("recent-history-content").get_attribute(
+            "value"
+        )
+        assert (
+            empty_label == "(Empty)"
+        ), f"Expected history to be empty, but found '{empty_label}'"