diff --git a/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm b/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm index e81b0d3b92a17..3f5f9b4993269 100644 --- 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 index 7dbe2e0c511c8..5e868e1bfbcb6 100644 --- 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 index b2909608594fb..fc6dceaacbc99 100644 --- 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/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_show_firefox_accounts.js b/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_show_firefox_accounts.js index 82bba359a3236..3f99fa77ef401 100644 --- a/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_show_firefox_accounts.js +++ b/toolkit/components/messaging-system/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); - }); });