Bug 1389911 - Support activeTab permission on Firefox for Android pageAction.
MozReview-Commit-ID: HTPBdu2KDVu
--- a/mobile/android/components/extensions/ext-pageAction.js
+++ b/mobile/android/components/extensions/ext-pageAction.js
@@ -38,16 +38,19 @@ class PageAction {
this.tabContext = new TabContext(() => Object.create(this.defaults), extension);
this.options = {
title: manifest.default_title || extension.name,
id: `{${extension.uuid}}`,
clickCallback: () => {
let tab = tabTracker.activeTab;
+
+ this.tabManager.addActiveTabPermission(tab);
+
let popup = this.tabContext.get(tab.id).popup || this.defaults.popup;
if (popup) {
let win = Services.wm.getMostRecentWindow("navigator:browser");
win.BrowserApp.addTab(popup, {
selected: true,
parentId: win.BrowserApp.selectedTab.id,
});
} else {
--- a/mobile/android/components/extensions/test/mochitest/chrome.ini
+++ b/mobile/android/components/extensions/test/mochitest/chrome.ini
@@ -1,14 +1,15 @@
[DEFAULT]
support-files =
head.js
../../../../../../toolkit/components/extensions/test/mochitest/chrome_cleanup_script.js
tags = webextensions
+[test_ext_activeTab_permission.html]
[test_ext_browserAction_getTitle_setTitle.html]
[test_ext_browserAction_onClicked.html]
[test_ext_browsingData_cookies_cache.html]
[test_ext_browsingData_settings.html]
[test_ext_options_ui.html]
[test_ext_pageAction_show_hide.html]
[test_ext_pageAction_getPopup_setPopup.html]
skip-if = os == 'android' # bug 1373170
--- a/mobile/android/components/extensions/test/mochitest/head.js
+++ b/mobile/android/components/extensions/test/mochitest/head.js
@@ -1,14 +1,21 @@
"use strict";
-/* exported AppConstants */
+/* exported AppConstants, TEST_ICON_ARRAYBUFFER */
var {AppConstants} = SpecialPowers.Cu.import("resource://gre/modules/AppConstants.jsm", {});
+var TEST_ICON_DATA = "iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAC4klEQVRYhdWXLWzbQBSADQtDAwsHC1tUhUxqfL67lk2tdn+OJg0ODU0rLByqgqINBY6tmlbn7LMTJ5FaFVVBk1G0oUGjG2jT2Y7jxmmcbU/6iJ+f36fz+e5sGP9riCGm9hB37RG+scd4Yo/wsDXCZyIE2xuXsce4bY+wXkAsQtzYmExrfFgvkJkRbkzo1ehoxx5iXcgI/9iYUGt8WH9MqDXEcmNChmEYrRCf2SHWeYgQx3x0tLNRIeKQLTtEFyJEep4NTuhk8BC+yMrwEE3+iozo42d8gK7FAOkMsRiiN8QhW2ttSK5QTfRRV4QoymVeJMvPvDp7gCZigD613MN6yRFA3SWarow9QB9LCfG+NeF9qCtjAKOSQjCqVKhfVsiHEQ+grgx/lRGqUihAc1uL8EFD+KCRO+GrF4J61phcoRoPoEzkYhZYpykh5sMb7kOdIeY+jHKur4QI4Feh4AFX1nVeLxrAvQchGsBz5ls6wa2QdwcvIcE2863bTH79KOvsz/uUYJsp+J0pSzNlDckVqqVGUAF+n6uS7txcOl6wot4JVy70ufDLy4pWLUQVPE81pRI0mGe9oxLMHSeohHvMs/STUNaUK6vDPCvOyxMFDx4achehRDJmHnydnkPww5OFfLxrGIZBFDyYl4LpMzlTQFIP6AQx86w2UeYBccFpJrcKv5L9eGDtUAU6RIELqsB74uynjy/UBRF1gS5BTFxwQT1wTiXoUg9MH7m/3NZRRoi5IJytUbMgzv4Wc832+oQkiKgEehmyMkkpKsFkQV11QsRJL5rJYBLItQgRaUZEmnoZXsomz3vGiWw+I9KMF9SVFOqZEemZekli1jN3U/UOqhHHvC6oWWGElhfSpGdOk6+O9prdwvtLj5BjRsQxdRnot+Zeifpy/2/0stktKTRNLmbk0mwXyl8253fyojj+8rxOHNAhjjm5n0/5OOCGOKBzkrMO0Z75lvSAzKlrF32Z/3z8BqLAn+yMV7VhAAAAAElFTkSuQmCC";
+
+var TEST_ICON_ARRAYBUFFER = Uint8Array.from(
+ atob(TEST_ICON_DATA),
+ byte => byte.charCodeAt(0)
+).buffer;
+
{
let chromeScript = SpecialPowers.loadChromeScript(
SimpleTest.getTestFileURL("chrome_cleanup_script.js"));
SimpleTest.registerCleanupFunction(async () => {
await new Promise(resolve => setTimeout(resolve, 0));
chromeScript.sendAsyncMessage("check-cleanup");
new file mode 100644
--- /dev/null
+++ b/mobile/android/components/extensions/test/mochitest/test_ext_activeTab_permission.html
@@ -0,0 +1,117 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <title>PageAction Test</title>
+ <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+ <script src="chrome://mochikit/content/tests/SimpleTest/SpawnTask.js"></script>
+ <script src="chrome://mochikit/content/tests/SimpleTest/ExtensionTestUtils.js"></script>
+ <script type="text/javascript" src="head.js"></script>
+ <link rel="stylesheet" href="chrome://mochikit/contents/tests/SimpleTest/test.css"/>
+</head>
+<body>
+
+<script type="text/javascript">
+"use strict";
+
+var {PageActions} = SpecialPowers.Cu.import("resource://gre/modules/PageActions.jsm", {});
+
+function pageLoadedContentScript() {
+ browser.test.sendMessage("page-loaded", window.location.href);
+}
+
+add_task(async function test_activeTab_pageAction() {
+ async function background() {
+ function contentScriptCode() {
+ browser.test.log("content script executed");
+
+ return "tabs.executeScript result";
+ }
+
+ const createdTab = await browser.tabs.create({
+ url: "http://example.com/#test_activeTab_pageAction",
+ });
+
+ browser.test.log(`Created new tab with id: ${createdTab.id}`);
+
+ await browser.pageAction.show(createdTab.id);
+
+ browser.pageAction.onClicked.addListener(async (tab) => {
+ browser.test.assertEq(createdTab.id, tab.id,
+ "pageAction clicked on the expected tab id");
+
+ const [result] = await browser.tabs.executeScript(tab.id, {
+ code: `(${contentScriptCode})()`,
+ }).catch(error => {
+ // Make the test to fail fast if something goes wrong.
+ browser.test.fail(`Unexpected exception on tabs.executeScript: ${error}`);
+ browser.tabs.remove(tab.id);
+ browser.test.notifyFail("page_action.activeTab.done");
+ throw error;
+ });
+
+ browser.test.assertEq("tabs.executeScript result", result,
+ "Got the expected result from tabs.executeScript");
+
+ browser.tabs.onRemoved.addListener((tabId) => {
+ if (tabId !== tab.id) {
+ return;
+ }
+
+ browser.test.notifyPass("page_action.activeTab.done");
+ });
+ browser.tabs.remove(tab.id);
+ });
+
+ browser.test.sendMessage("background_page.ready");
+ }
+
+ let extension = ExtensionTestUtils.loadExtension({
+ background,
+ manifest: {
+ "name": "PageAction Extension",
+ "page_action": {
+ "default_title": "Page Action",
+ "default_icon": {
+ "18": "extension.png",
+ },
+ },
+ "content_scripts": [
+ {
+ "js": ["page_loaded.js"],
+ "matches": ["http://example.com/*"],
+ "run_at": "document_end",
+ },
+ ],
+ "permissions": ["activeTab"],
+ },
+ files: {
+ "extension.png": TEST_ICON_ARRAYBUFFER,
+ "page_loaded.js": pageLoadedContentScript,
+ },
+ });
+
+ await extension.startup();
+
+ await extension.awaitMessage("background_page.ready");
+
+ const uuid = `{${extension.uuid}}`;
+
+ ok(PageActions.isShown(uuid), "page action is shown");
+
+ info("Wait the new tab to be loaded");
+ const loadedURL = await extension.awaitMessage("page-loaded");
+
+ is(loadedURL, "http://example.com/#test_activeTab_pageAction",
+ "The expected URL has been loaded in a new tab");
+
+ info("Click the pageAction");
+ PageActions.synthesizeClick(uuid);
+
+ await extension.awaitFinish("page_action.activeTab.done");
+
+ await extension.unload();
+});
+</script>
+
+</body>
+</html>
--- a/mobile/android/components/extensions/test/mochitest/test_ext_pageAction_getPopup_setPopup.html
+++ b/mobile/android/components/extensions/test/mochitest/test_ext_pageAction_getPopup_setPopup.html
@@ -14,21 +14,16 @@
"use strict";
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
Cu.import("resource://gre/modules/Services.jsm");
var {PageActions} = Cu.import("resource://gre/modules/PageActions.jsm", {});
-let dataURI = "iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAC4klEQVRYhdWXLWzbQBSADQtDAwsHC1tUhUxqfL67lk2tdn+OJg0ODU0rLByqgqINBY6tmlbn7LMTJ5FaFVVBk1G0oUGjG2jT2Y7jxmmcbU/6iJ+f36fz+e5sGP9riCGm9hB37RG+scd4Yo/wsDXCZyIE2xuXsce4bY+wXkAsQtzYmExrfFgvkJkRbkzo1ehoxx5iXcgI/9iYUGt8WH9MqDXEcmNChmEYrRCf2SHWeYgQx3x0tLNRIeKQLTtEFyJEep4NTuhk8BC+yMrwEE3+iozo42d8gK7FAOkMsRiiN8QhW2ttSK5QTfRRV4QoymVeJMvPvDp7gCZigD613MN6yRFA3SWarow9QB9LCfG+NeF9qCtjAKOSQjCqVKhfVsiHEQ+grgx/lRGqUihAc1uL8EFD+KCRO+GrF4J61phcoRoPoEzkYhZYpykh5sMb7kOdIeY+jHKur4QI4Feh4AFX1nVeLxrAvQchGsBz5ls6wa2QdwcvIcE2863bTH79KOvsz/uUYJsp+J0pSzNlDckVqqVGUAF+n6uS7txcOl6wot4JVy70ufDLy4pWLUQVPE81pRI0mGe9oxLMHSeohHvMs/STUNaUK6vDPCvOyxMFDx4achehRDJmHnydnkPww5OFfLxrGIZBFDyYl4LpMzlTQFIP6AQx86w2UeYBccFpJrcKv5L9eGDtUAU6RIELqsB74uynjy/UBRF1gS5BTFxwQT1wTiXoUg9MH7m/3NZRRoi5IJytUbMgzv4Wc832+oQkiKgEehmyMkkpKsFkQV11QsRJL5rJYBLItQgRaUZEmnoZXsomz3vGiWw+I9KMF9SVFOqZEemZekli1jN3U/UOqhHHvC6oWWGElhfSpGdOk6+O9prdwvtLj5BjRsQxdRnot+Zeifpy/2/0stktKTRNLmbk0mwXyl8253fyojj+8rxOHNAhjjm5n0/5OOCGOKBzkrMO0Z75lvSAzKlrF32Z/3z8BqLAn+yMV7VhAAAAAElFTkSuQmCC";
-
-let image = atob(dataURI);
-const IMAGE_ARRAYBUFFER = Uint8Array.from(image, byte => byte.charCodeAt(0)).buffer;
-
add_task(async function test_setPopup_and_getPopup() {
async function background() {
let tabCreatedPromise = new Promise(resolve => {
let onTabCreated = tab => {
browser.tabs.onCreated.removeListener(onTabCreated);
resolve();
};
browser.tabs.onCreated.addListener(onTabCreated);
@@ -133,17 +128,17 @@ add_task(async function test_setPopup_an
"default_popup": "default.html",
"default_icon": {
"18": "extension.png",
},
},
},
files: {
"default.html": `<html><head><meta charset="utf-8"><script src="popup.js"><\/script></head></html>`,
- "extension.png": IMAGE_ARRAYBUFFER,
+ "extension.png": TEST_ICON_ARRAYBUFFER,
"a.html": `<html><head><meta charset="utf-8"><script src="popup.js"><\/script></head></html>`,
"b.html": `<html><head><meta charset="utf-8"><script src="popup.js"><\/script></head></html>`,
"popup.js": popupScript,
},
});
let tabClosedPromise = () => {
return new Promise(resolve => {
--- a/mobile/android/components/extensions/test/mochitest/test_ext_pageAction_show_hide.html
+++ b/mobile/android/components/extensions/test/mochitest/test_ext_pageAction_show_hide.html
@@ -11,21 +11,16 @@
<body>
<script type="text/javascript">
"use strict";
var {ContentTaskUtils} = SpecialPowers.Cu.import("resource://testing-common/ContentTaskUtils.jsm", {});
var {PageActions} = SpecialPowers.Cu.import("resource://gre/modules/PageActions.jsm", {});
-let dataURI = "iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAC4klEQVRYhdWXLWzbQBSADQtDAwsHC1tUhUxqfL67lk2tdn+OJg0ODU0rLByqgqINBY6tmlbn7LMTJ5FaFVVBk1G0oUGjG2jT2Y7jxmmcbU/6iJ+f36fz+e5sGP9riCGm9hB37RG+scd4Yo/wsDXCZyIE2xuXsce4bY+wXkAsQtzYmExrfFgvkJkRbkzo1ehoxx5iXcgI/9iYUGt8WH9MqDXEcmNChmEYrRCf2SHWeYgQx3x0tLNRIeKQLTtEFyJEep4NTuhk8BC+yMrwEE3+iozo42d8gK7FAOkMsRiiN8QhW2ttSK5QTfRRV4QoymVeJMvPvDp7gCZigD613MN6yRFA3SWarow9QB9LCfG+NeF9qCtjAKOSQjCqVKhfVsiHEQ+grgx/lRGqUihAc1uL8EFD+KCRO+GrF4J61phcoRoPoEzkYhZYpykh5sMb7kOdIeY+jHKur4QI4Feh4AFX1nVeLxrAvQchGsBz5ls6wa2QdwcvIcE2863bTH79KOvsz/uUYJsp+J0pSzNlDckVqqVGUAF+n6uS7txcOl6wot4JVy70ufDLy4pWLUQVPE81pRI0mGe9oxLMHSeohHvMs/STUNaUK6vDPCvOyxMFDx4achehRDJmHnydnkPww5OFfLxrGIZBFDyYl4LpMzlTQFIP6AQx86w2UeYBccFpJrcKv5L9eGDtUAU6RIELqsB74uynjy/UBRF1gS5BTFxwQT1wTiXoUg9MH7m/3NZRRoi5IJytUbMgzv4Wc832+oQkiKgEehmyMkkpKsFkQV11QsRJL5rJYBLItQgRaUZEmnoZXsomz3vGiWw+I9KMF9SVFOqZEemZekli1jN3U/UOqhHHvC6oWWGElhfSpGdOk6+O9prdwvtLj5BjRsQxdRnot+Zeifpy/2/0stktKTRNLmbk0mwXyl8253fyojj+8rxOHNAhjjm5n0/5OOCGOKBzkrMO0Z75lvSAzKlrF32Z/3z8BqLAn+yMV7VhAAAAAElFTkSuQmCC";
-
-let image = atob(dataURI);
-const IMAGE_ARRAYBUFFER = Uint8Array.from(image, byte => byte.charCodeAt(0)).buffer;
-
add_task(async function test_pageAction() {
async function background() {
let tabCreatedPromise = new Promise(resolve => {
let onTabCreated = tab => {
browser.tabs.onCreated.removeListener(onTabCreated);
resolve();
};
browser.tabs.onCreated.addListener(onTabCreated);
@@ -79,17 +74,17 @@ add_task(async function test_pageAction(
},
"applications": {
"gecko": {
"id": "foo@bar.com",
},
},
},
files: {
- "extension.png": IMAGE_ARRAYBUFFER,
+ "extension.png": TEST_ICON_ARRAYBUFFER,
},
});
await extension.startup();
async function checkTab(tabId, uuid, showAfterSelecting) {
ok(!PageActions.isShown(uuid), "The PageAction should not be shown");
