From 7c3421e8423422f35827a6f7aebc8552ea8f3276 Mon Sep 17 00:00:00 2001 From: Christoph Kerschbaumer Date: Mon, 29 May 2017 17:57:08 +0200 Subject: [PATCH] Bug 1363977 - Have loadTabs() tests provide the correct triggeringPrincipal. r=gijs,kit --- .../tests/mochitest/relations/test_tabbrowser.xul | 6 +++++- .../tests/mochitest/tree/test_tabbrowser.xul | 6 +++++- .../test/xpcshell/test_TabListComponent.js | 13 +++++++++++-- .../extension/configurations/Tabs.jsm | 14 ++++++++++++-- 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/accessible/tests/mochitest/relations/test_tabbrowser.xul b/accessible/tests/mochitest/relations/test_tabbrowser.xul index 8fd340fec8e7..0a9cdd88392c 100644 --- a/accessible/tests/mochitest/relations/test_tabbrowser.xul +++ b/accessible/tests/mochitest/relations/test_tabbrowser.xul @@ -36,7 +36,11 @@ this.invoke = function testTabRelations_invoke() { var docURIs = ["about:", "about:mozilla"]; - tabBrowser().loadTabs(docURIs, false, true); + tabBrowser().loadTabs(docURIs, { + inBackground: false, + replace: true, + triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(), + }); } this.finalCheck = function testTabRelations_finalCheck(aEvent) diff --git a/accessible/tests/mochitest/tree/test_tabbrowser.xul b/accessible/tests/mochitest/tree/test_tabbrowser.xul index f3fa24431736..4f3f05a66aff 100644 --- a/accessible/tests/mochitest/tree/test_tabbrowser.xul +++ b/accessible/tests/mochitest/tree/test_tabbrowser.xul @@ -35,7 +35,11 @@ this.invoke = function testTabHierarchy_invoke() { var docURIs = ["about:", "about:mozilla"]; - tabBrowser().loadTabs(docURIs, false, true); + tabBrowser().loadTabs(docURIs, { + inBackground: false, + replace: true, + triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(), + }); } this.finalCheck = function testTabHierarchy_finalCheck(aEvent) diff --git a/browser/components/syncedtabs/test/xpcshell/test_TabListComponent.js b/browser/components/syncedtabs/test/xpcshell/test_TabListComponent.js index bb6e23ffe2c8..b13107c1e15b 100644 --- a/browser/components/syncedtabs/test/xpcshell/test_TabListComponent.js +++ b/browser/components/syncedtabs/test/xpcshell/test_TabListComponent.js @@ -4,6 +4,7 @@ let { SyncedTabs } = Cu.import("resource://services-sync/SyncedTabs.jsm", {}); let { TabListComponent } = Cu.import("resource:///modules/syncedtabs/TabListComponent.js", {}); let { SyncedTabsListStore } = Cu.import("resource:///modules/syncedtabs/SyncedTabsListStore.js", {}); let { View } = Cu.import("resource:///modules/syncedtabs/TabListView.js", {}); +let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); const ACTION_METHODS = [ "onSelectRow", @@ -139,9 +140,17 @@ add_task(function* testActions() { let tabsToOpen = ["uri1", "uri2"]; component.onOpenTabs(tabsToOpen, "where"); Assert.ok(getChromeWindowMock.calledWith(windowMock)); - Assert.ok(chromeWindowMock.gBrowser.loadTabs.calledWith(tabsToOpen, false, false)); + Assert.ok(chromeWindowMock.gBrowser.loadTabs.calledWith(tabsToOpen, { + inBackground: false, + replace: false, + triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(), + })); component.onOpenTabs(tabsToOpen, "tabshifted"); - Assert.ok(chromeWindowMock.gBrowser.loadTabs.calledWith(tabsToOpen, true, false)); + Assert.ok(chromeWindowMock.gBrowser.loadTabs.calledWith(tabsToOpen, { + inBackground: true, + replace: false, + triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(), + })); sinon.spy(clipboardHelperMock, "copyString"); component.onCopyTabLocation("uri"); diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm index 649786fb67ea..4e6b8333f360 100644 --- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm +++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm @@ -92,7 +92,12 @@ this.Tabs = { "about:home", DEFAULT_FAVICON_TAB, "about:newtab", - ], true, true); + ], + { + inBackground: true, + replace: true, + triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal() + }); browserWindow.gBrowser.pinTab(browserWindow.gBrowser.tabs[1]); browserWindow.gBrowser.pinTab(browserWindow.gBrowser.tabs[2]); browserWindow.gBrowser.selectTabAtIndex(3); @@ -119,7 +124,12 @@ function fiveTabsHelper() { DEFAULT_FAVICON_TAB, "about:newtab", CUST_TAB, - ], true, true); + ], + { + inBackground: true, + replace: true, + triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal() + }); browserWindow.gBrowser.selectTabAtIndex(1); }