merge changes in

Author: sarinali

modules/data/about_privatebrowsing.components.json

@@ -0,0 +1,10 @@
+{
+    "main-logo": {
+        "selectorData": "about-private-browsing-logo",
+        "strategy": "id",
+        "groups": [
+            "requiredForPage"
+        ]
+    }
+
+}

modules/data/panel_ui.components.json

@@ -41,6 +41,12 @@
         ]
     },
 
+    "new-private-window-option": {
+        "selectorData": "appMenu-new-private-window-button2",
+        "strategy": "id",
+        "groups": []
+    },
+
     "more-tools": {
         "selectorData": "appMenu-more-button2",
         "strategy": "id",

modules/page_base.py

@@ -537,10 +537,19 @@ def wait_for_num_tabs(self, num_tabs: int) -> Page:
             logging.warn("Timeout waiting for the number of windows to be:", num_tabs)
         return self
 
-    def switch_to_new_tab(self):
+    def switch_to_new_tab(self) -> Page:
         """Get list of all window handles, switch to the newly opened tab"""
         handles = self.driver.window_handles
         self.driver.switch_to.window(handles[-1])
+        return self
+
+    def wait_for_num_windows(self, num: int) -> Page:
+        """Wait for the number of open tabs + windows to equal given int"""
+        return self.wait_for_num_tabs(num)
+
+    def switch_to_new_window(self) -> Page:
+        """Switch to newest window"""
+        return self.switch_to_new_tab()
 
     def hide_popup(self, context_menu: str, chrome=False) -> Page:
         """

modules/page_object.py

@@ -4,6 +4,7 @@
 from modules.page_object_about_logins import *
 from modules.page_object_about_newtab import *
 from modules.page_object_about_prefs import *
+from modules.page_object_about_privatebrowsing import *
 from modules.page_object_about_profiles import *
 from modules.page_object_about_telemetry import *
 from modules.page_object_addons_mozilla_org import *

modules/page_object_about_privatebrowsing.py

@@ -0,0 +1,5 @@
+from modules.page_base import BasePage
+
+
+class AboutPrivatebrowsing(BasePage):
+    URL_TEMPLATE = "about:privatebrowsing"

modules/util.py

@@ -565,7 +565,7 @@ def shadow_from_script():
     def css_selector_matches_element(
         self, element: Union[WebElement, ShadowRoot], selector: list
     ) -> bool:
-        if type(element) == ShadowRoot:
+        if isinstance(element, ShadowRoot):
             return False
         sel = f'"{selector[1]}"'
         return self.driver.execute_script(

new_model.py

@@ -6,7 +6,7 @@
 import re
 import sys
 
-SNAKE_RE = re.compile(r"^[a-z](_[a-z])*[a-z]$")
+SNAKE_RE = re.compile(r"^[a-z]+([_a-z][a-z])*$")
 PASCAL_RE = re.compile(r"^[A-Z][a-zA-Z]*[a-z]$")
 
 
@@ -61,20 +61,38 @@ def pascalify(snake: str) -> str:
 
 
 if __name__ == "__main__":
+    first = True
+    second = False
     while not model_type:
+        if second:
+            print("Please enter POM or BOM.")
         resp = input("What type of model is this? ")
         resp = resp.strip().lower()
         if resp not in ["pom", "bom"]:
             resp = None
         model_type = resp
+        if second:
+            second = False
+        if first:
+            first = False
+            second = True
 
+    first = True
+    second = False
     while not model_name:
+        if second:
+            print("Please enter the name in either snake_case or PascalCase.")
         resp = input("What is the name of the model? ")
         resp = resp.strip()
         if SNAKE_RE.match(resp):
             model_name = resp
         elif PASCAL_RE.match(resp):
             model_name = snakify(resp)
+        if second:
+            second = False
+        if first:
+            first = False
+            second = True
 
     model_type_name = "page" if model_type == "pom" else "browser"
 

tests/security_and_privacy/conftest.py

@@ -6,6 +6,11 @@ def suite_id():
     return ("5833", "Security and Privacy")
 
 
+@pytest.fixture()
+def add_prefs():
+    return []
+
+
 @pytest.fixture()
 def set_prefs(add_prefs: dict):
     """Set prefs"""

tests/security_and_privacy/test_blocking_cryptominers.py

@@ -1,6 +1,5 @@
 from time import sleep
 
-import pytest
 from selenium.webdriver import Firefox
 
 from modules.browser_object_navigation import Navigation
@@ -9,11 +8,6 @@
 CRYPTOMINERS_URL = "https://senglehardt.com/test/trackingprotection/test_pages/fingerprinting_and_cryptomining.html"
 
 
-@pytest.fixture()
-def add_prefs():
-    return []
-
-
 def test_blocking_cryptominers(driver: Firefox):
     # instantiate objects
     nav = Navigation(driver).open()

tests/security_and_privacy/test_cryptominers_blocked_and_shown_in_info_panel.py

@@ -1,18 +1,12 @@
 from time import sleep
 
-import pytest
 from selenium.webdriver import Firefox
 
 from modules.browser_object_navigation import Navigation
 
 CRYPTOMINERS_URL = "https://senglehardt.com/test/trackingprotection/test_pages/fingerprinting_and_cryptomining.html"
 
 
-@pytest.fixture()
-def add_prefs():
-    return []
-
-
 def test_cryptominers_blocked_and_shown_in_info_panel(driver: Firefox):
     """
     C450232: Cryptominers are blocked and shown in Standard mode in the Information pannel