Commit 55e73f4b authored by Ed Lee's avatar Ed Lee
Browse files

Bug 1739055 - Reset custom homepage / start page only on saving colorway r=pdahiya 

Handle checkbox only from primary button and not any completion of colorway screen.

Depends on D130930

Differential Revision: https://phabricator.services.mozilla.com/D132830
parent 6b842201

browser/base/content/upgradeDialog.js

+4 −0
Original line number Diff line number Diff line
@@ -298,7 +298,10 @@ function onLoad(ready) { 
    logo.classList.remove("hidden");

    colorways.remove();

    checkbox.remove();

  }



  // Handle checkbox being checked.

  function handleCheckbox() {

    // Revert both homepage and newtab if still checked (potentially doing

    // nothing if each pref is already the default value).

    if (checkbox.firstElementChild.checked) {
@@ -346,6 +349,7 @@ function onLoad(ready) { 
        // New theme is confirmed, so don't revert to previous.

        case "upgrade-dialog-colorway-primary-button":

          gPrevTheme = null;

          handleCheckbox();

          removeColorways();

          break;

browser/components/tests/browser/browser_browserGlue_upgradeDialog.js

+22 −4
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ add_task(async function keep_home() { 


    // Click the pre-selected checkbox to keep custom homepage.

    win.document.getElementById("checkbox").click();

    win.document.getElementById("secondary").click();

    win.document.getElementById("primary").click();

    await BrowserTestUtils.waitForEvent(win, "ready");

    win.close();

  });
@@ -88,7 +88,7 @@ add_task(async function keep_home() { 
add_task(async function revert_home() {

  await showAndWaitForDialog(async win => {

    await BrowserTestUtils.waitForEvent(win, "ready");

    win.document.getElementById("secondary").click();

    win.document.getElementById("primary").click();

    await BrowserTestUtils.waitForEvent(win, "ready");

    win.close();

  });
@@ -99,13 +99,31 @@ add_task(async function revert_home() { 
  );

});



add_task(async function keep_newtab() {

  Services.prefs.setBoolPref("browser.newtabpage.enabled", false);



  await showAndWaitForDialog(async win => {

    await BrowserTestUtils.waitForEvent(win, "ready");



    // Click secondary to ignore pre-selected checkbox.

    win.document.getElementById("secondary").click();

    await BrowserTestUtils.waitForEvent(win, "ready");

    win.close();

  });



  Assert.ok(

    Services.prefs.prefHasUserValue("browser.newtabpage.enabled"),

    "New tab kept disabled"

  );

});



add_task(async function revert_newtab() {

  Services.telemetry.clearEvents();

  Services.prefs.setBoolPref("browser.newtabpage.enabled", false);



  await showAndWaitForDialog(async win => {

    await BrowserTestUtils.waitForEvent(win, "ready");

    win.document.getElementById("secondary").click();

    win.document.getElementById("primary").click();

    await BrowserTestUtils.waitForEvent(win, "ready");

    win.close();

  });
@@ -120,7 +138,7 @@ add_task(async function revert_newtab() { 
    ["content", "show", "random-1"],

    ["content", "show", "upgrade-dialog-colorway-home-checkbox"],

    ["content", "show", "upgrade-dialog-colorway-primary-button"],

    ["content", "button", "upgrade-dialog-colorway-secondary-button"],

    ["content", "button", "upgrade-dialog-colorway-primary-button"],

    ["content", "button", "upgrade-dialog-colorway-home-checkbox"],

    ["content", "show", "upgrade-dialog-thankyou-primary-button"],

    ["content", "close", "external"]