Backed out changeset a224934d4790 (bug 1786523) for causing multiple …

…failures in browser_siteData_multi_select/browser_aboutwelcome_multistage_mr CLOSED TREE
dothq · Sep 13, 2022 · 36d7cba · 36d7cba
1 parent f7c058d
commit 36d7cba
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 40 deletions.
diff --git a/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm b/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm
@@ -315,7 +315,6 @@ const MR_ABOUT_WELCOME_DEFAULT = {
           action: {
             data: {
               entrypoint: "activity-stream-firstrun",
-              where: "tab",
             },
             type: "SHOW_FIREFOX_ACCOUNTS",
             addFlowParams: true,

diff --git a/browser/components/newtab/test/browser/browser_aboutwelcome_multistage_mr.js b/browser/components/newtab/test/browser/browser_aboutwelcome_multistage_mr.js
@@ -74,13 +74,7 @@ add_task(async function test_aboutwelcome_mr_template_telemetry() {
   const sandbox = initSandbox();
   const messageStub = sandbox.spy(aboutWelcomeActor, "onContentMessage");
 
-  // In this case we need to click the primary button,
-  // since the only secondary button on the first screen is 'sign in'
-  await clickVisibleButton(browser, "button.primary");
-
-  registerCleanupFunction(() => {
-    sandbox.restore();
-  });
+  await clickVisibleButton(browser, "button.secondary");
 
   const { callCount } = messageStub;
   ok(callCount >= 1, `${callCount} Stub was called`);

diff --git a/toolkit/components/messaging-system/lib/SpecialMessageActions.jsm b/toolkit/components/messaging-system/lib/SpecialMessageActions.jsm
@@ -310,18 +310,7 @@ const SpecialMessageActions = {
           (data && data.entrypoint) || "snippets",
           (data && data.extraParams) || {}
         );
-        // if a location is specified, use that
-        if (data.where) {
-          window.openLinkIn(url, data.where, {
-            private: false,
-            triggeringPrincipal: Services.scriptSecurityManager.createNullPrincipal(
-              {}
-            ),
-            csp: null,
-          });
-          break;
-        }
-        // If no location was specified, we want to replace the current tab.
+        // We want to replace the current tab.
         window.openLinkIn(url, "current", {
           private: false,
           triggeringPrincipal: Services.scriptSecurityManager.createNullPrincipal(

diff --git a/...tem/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_show_firefox_accounts.js b/...tem/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_show_firefox_accounts.js
@@ -43,24 +43,4 @@ add_task(async function test_SHOW_FIREFOX_ACCOUNTS() {
       "should load fxa with a custom endpoint and extra parameters in url"
     );
   });
-
-  add_task(async function test_SHOW_FIREFOX_ACCOUNTS_where() {
-    // Open FXA with a 'where' prop
-    const action = {
-      type: "SHOW_FIREFOX_ACCOUNTS",
-      data: {
-        entrypoint: "activity-stream-firstrun",
-        where: "tab",
-      },
-    };
-    const tabPromise = BrowserTestUtils.waitForNewTab(
-      gBrowser,
-      "https://example.com/?context=fx_desktop_v3&entrypoint=activity-stream-firstrun&action=email&service=sync"
-    );
-
-    await SpecialMessageActions.handleAction(action, gBrowser);
-    const browser = await tabPromise;
-    ok(browser, "should open FXA in a new tab");
-    BrowserTestUtils.removeTab(browser);
-  });
 });