Merge pull request #117 from mozilla/sl/firefox-home-on-launch-1

Firefox Home on Launch

Author: sarinali

modules/browser_object_tabbar.py

@@ -53,6 +53,18 @@ def new_tab_by_keys(self, sys_platform: str) -> BasePage:
             ).perform()
         return self
 
+    def new_window_by_keys(self, sys_platform: str) -> BasePage:
+        """Use keyboard shortcut to open a new tab"""
+        if sys_platform == "Darwin":
+            self.actions.key_down(Keys.COMMAND).send_keys("n").key_up(
+                Keys.COMMAND
+            ).perform()
+        else:
+            self.actions.key_down(Keys.CONTROL).send_keys("n").key_up(
+                Keys.CONTROL
+            ).perform()
+        return self
+
     def click_tab_by_title(self, title: str) -> BasePage:
         """Given a full page title, click the corresponding tab"""
         with self.driver.context(self.driver.CONTEXT_CHROME):

modules/data/about_prefs.components.json

@@ -216,6 +216,12 @@
         "groups": []
     },
 
+    "home-new-window-dropdown": {
+        "selectorData": "homeMode",
+        "strategy": "id",
+        "groups": []
+    },
+
     "home-new-tabs-dropdown-option-default": {
         "selectorData": "menuitem[data-l10n-id=\"home-mode-choice-default-fx\"]",
         "strategy": "css",

modules/data/panel_ui.components.json

@@ -91,6 +91,12 @@
         ]
     },
 
+    "panel-ui-new-window": {
+        "selectorData": "appMenu-new-window-button2",
+        "strategy": "id",
+        "groups": []
+    },
+
     "panel-ui-history": {
         "selectorData": "appMenu-history-button",
         "strategy": "id",

modules/page_object_about_prefs.py

@@ -46,7 +46,9 @@ def __init__(self, page, **kwargs):
         def loaded(self):
             return self.root if EC.element_to_be_clickable(self.root) else False
 
-        def select_option(self, option_name: str, double_click=False):
+        def select_option(
+            self, option_name: str, double_click=False, wait_for_selection=True
+        ):
             """Select an option in the dropdown. Does not return self."""
             if not self.dropmarker.get_attribute("open") == "true":
                 self.root.click()
@@ -64,6 +66,7 @@ def select_option(self, option_name: str, double_click=False):
                     )
                 else:
                     matching_menuitems[0].click()
+                if wait_for_selection:
                     self.wait.until(EC.element_to_be_selected(matching_menuitems[0]))
                 return self
             else:

tests/address_bar_and_search/test_google_search_counts_us.py

@@ -1,6 +1,5 @@
 from time import sleep
 
-import pytest
 from selenium.webdriver import Firefox
 
 from modules.browser_object import Navigation

tests/language_packs/test_language_pack_install_addons.py

@@ -57,7 +57,7 @@ def test_language_pack_install_from_addons(
     about_prefs = AboutPrefs(driver, category="general").open()
     language_dropdown = about_prefs.get_element("language-dropdown")
     dropdown = about_prefs.Dropdown(page=about_prefs, root=language_dropdown)
-    dropdown.select_option(drop_down_name, double_click=True)
+    dropdown.select_option(drop_down_name, double_click=True, wait_for_selection=False)
 
     about_prefs.custom_wait(timeout=15).until(
         lambda _: about_prefs.get_element("html-root").get_attribute("lang")

tests/preferences/test_firefox_home_on_launch.py

@@ -0,0 +1,41 @@
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object import PanelUi, TabBar
+from modules.page_object import AboutNewtab, AboutPrefs
+
+
+@pytest.fixture()
+def set_prefs():
+    """Set prefs"""
+    return [
+        ("browser.startup.homepage", "about:home"),
+        ("browser.startup.blankWindow", "false"),
+    ]
+
+
+def test_firefox_home_on_launch(driver: Firefox, sys_platform: str):
+    """
+    C143543: setting the default new window to be Firefox Home
+    """
+    # instantiate objs
+    tabs = TabBar(driver)
+    new_tab = AboutNewtab(driver)
+    about_prefs = AboutPrefs(driver, category="home").open()
+    panel_ui = PanelUi(driver)
+
+    # click the dropdown
+    drop_down = about_prefs.get_element("home-new-window-dropdown")
+    dropdown = about_prefs.Dropdown(page=about_prefs, root=drop_down)
+    dropdown.select_option("Firefox Home (Default)", double_click=True)
+
+    # make sure that the option was selected correctly
+    assert drop_down.get_attribute("label") == "Firefox Home (Default)"
+    panel_ui.open_panel_menu()
+    panel_ui.select_panel_setting("panel-ui-new-window")
+    # wait for the number of tabs and switch
+    tabs.wait_for_num_tabs(2)
+    driver.switch_to.window(driver.window_handles[-1])
+
+    # make sure we are on the correct new tab page
+    assert new_tab.get_element("body-logo") is not None