From f6052f7eae0ff7435c57048fd307d284d3574c10 Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Fri, 22 Jul 2016 17:29:52 -0700 Subject: [PATCH] Bug 1288885: Migrate bookmarks mochitests to xpcshell. r=aswan MozReview-Commit-ID: 9PFJcqXXxhU --HG-- rename : toolkit/components/extensions/test/mochitest/test_ext_bookmarks.html => browser/components/extensions/test/xpcshell/test_ext_bookmarks.js extra : source : 8c67ff2971ecc155ce26dc5d9905c5de7e4bfd4b --- .../test/xpcshell/test_ext_bookmarks.js | 26 ++++--------------- .../extensions/test/xpcshell/xpcshell.ini | 1 + .../extensions/test/mochitest/mochitest.ini | 2 -- .../extensions/test/xpcshell/head.js | 2 ++ 4 files changed, 8 insertions(+), 23 deletions(-) rename toolkit/components/extensions/test/mochitest/test_ext_bookmarks.html => browser/components/extensions/test/xpcshell/test_ext_bookmarks.js (96%) diff --git a/toolkit/components/extensions/test/mochitest/test_ext_bookmarks.html b/browser/components/extensions/test/xpcshell/test_ext_bookmarks.js similarity index 96% rename from toolkit/components/extensions/test/mochitest/test_ext_bookmarks.html rename to browser/components/extensions/test/xpcshell/test_ext_bookmarks.js index 6157f98e093a..fce99b761bd0 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_bookmarks.html +++ b/browser/components/extensions/test/xpcshell/test_ext_bookmarks.js @@ -1,16 +1,5 @@ - - - - WebExtension test - - - - - - - - - - - - diff --git a/browser/components/extensions/test/xpcshell/xpcshell.ini b/browser/components/extensions/test/xpcshell/xpcshell.ini index 29749bb80fd5..cd06f185970f 100644 --- a/browser/components/extensions/test/xpcshell/xpcshell.ini +++ b/browser/components/extensions/test/xpcshell/xpcshell.ini @@ -3,4 +3,5 @@ head = head.js tail = firefox-appdir = browser +[test_ext_bookmarks.js] [test_ext_manifest_commands.js] diff --git a/toolkit/components/extensions/test/mochitest/mochitest.ini b/toolkit/components/extensions/test/mochitest/mochitest.ini index 1f7ffb7fd045..299be2be6266 100644 --- a/toolkit/components/extensions/test/mochitest/mochitest.ini +++ b/toolkit/components/extensions/test/mochitest/mochitest.ini @@ -75,8 +75,6 @@ skip-if = (os == 'android' || buildapp == 'b2g') # sender.tab is undefined on b2 [test_ext_storage_tab.html] skip-if = os == 'android' # Android does not currently support tabs. [test_ext_cookies.html] -[test_ext_bookmarks.html] -skip-if = (os == 'android' || buildapp == 'b2g') # unimplemented api. Bug 1258975 on android. [test_ext_background_window_properties.html] [test_ext_background_sub_windows.html] [test_ext_background_api_injection.html] diff --git a/toolkit/components/extensions/test/xpcshell/head.js b/toolkit/components/extensions/test/xpcshell/head.js index f427a1cec116..e23c674e2dac 100644 --- a/toolkit/components/extensions/test/xpcshell/head.js +++ b/toolkit/components/extensions/test/xpcshell/head.js @@ -8,6 +8,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "Extension", "resource://gre/modules/Extension.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "ExtensionData", "resource://gre/modules/Extension.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "ExtensionManagement", + "resource://gre/modules/ExtensionManagement.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "ExtensionTestUtils", "resource://testing-common/ExtensionXPCShellUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",