Bug 1330076 - Rewrite test_chrome_ext_shutdown_cleanup.html into an xpcshell test
MozReview-Commit-ID: 52AITgCDmJy
--- a/toolkit/components/extensions/test/mochitest/chrome.ini
+++ b/toolkit/components/extensions/test/mochitest/chrome.ini
@@ -16,17 +16,16 @@ skip-if = (os == 'android') # android do
skip-if = (toolkit == 'android') # android doesn't have devtools
[test_chrome_ext_eventpage_warning.html]
[test_chrome_ext_contentscript_unrecognizedprop_warning.html]
skip-if = (os == 'android') # browser.tabs is undefined. Bug 1258975 on android.
[test_chrome_ext_hybrid_addons.html]
[test_chrome_ext_trustworthy_origin.html]
[test_chrome_ext_webnavigation_resolved_urls.html]
skip-if = (os == 'android') # browser.tabs is undefined. Bug 1258975 on android.
-[test_chrome_ext_shutdown_cleanup.html]
[test_chrome_native_messaging_paths.html]
skip-if = os != "mac" && os != "linux"
[test_ext_cookies_expiry.html]
[test_ext_cookies_permissions_bad.html]
[test_ext_cookies_permissions_good.html]
[test_ext_cookies_containers.html]
[test_ext_jsversion.html]
[test_ext_schema.html]
rename from toolkit/components/extensions/test/mochitest/test_chrome_ext_shutdown_cleanup.html
rename to toolkit/components/extensions/test/xpcshell/test_ext_shutdown_cleanup.js
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_shutdown_cleanup.html
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_shutdown_cleanup.js
@@ -1,50 +1,30 @@
-<!DOCTYPE HTML>
-<html>
-<head>
- <title>WebExtension 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>
+/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set sts=2 sw=2 et tw=80: */
-<script type="text/javascript">
"use strict";
-const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://testing-common/TestUtils.jsm");
-
const {GlobalManager} = Cu.import("resource://gre/modules/Extension.jsm", {});
-/* eslint-disable mozilla/balanced-listeners */
+add_task(function* test_global_manager_shutdown_cleanup() {
+ equal(GlobalManager.initialized, false,
+ "GlobalManager start as not initialized");
-add_task(function* testShutdownCleanup() {
- is(GlobalManager.initialized, false,
- "GlobalManager start as not initialized");
+ function background() {
+ browser.test.notifyPass("background page loaded");
+ }
let extension = ExtensionTestUtils.loadExtension({
- background: function() {
- browser.test.notifyPass("background page loaded");
- },
+ background,
});
yield extension.startup();
-
yield extension.awaitFinish("background page loaded");
- is(GlobalManager.initialized, true,
- "GlobalManager has been initialized once an extension is started");
+ equal(GlobalManager.initialized, true,
+ "GlobalManager has been initialized once an extension is started");
yield extension.unload();
- is(GlobalManager.initialized, false,
- "GlobalManager has been uninitialized once all the webextensions have been stopped");
+ equal(GlobalManager.initialized, false,
+ "GlobalManager has been uninitialized once all the webextensions have been stopped");
});
-</script>
-
-</body>
-</html>
--- a/toolkit/components/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/components/extensions/test/xpcshell/xpcshell.ini
@@ -53,16 +53,17 @@ skip-if = release_or_beta
[test_ext_runtime_sendMessage.js]
[test_ext_runtime_sendMessage_errors.js]
[test_ext_runtime_sendMessage_no_receiver.js]
[test_ext_runtime_sendMessage_self.js]
[test_ext_schemas.js]
[test_ext_schemas_api_injection.js]
[test_ext_schemas_async.js]
[test_ext_schemas_allowed_contexts.js]
+[test_ext_shutdown_cleanup.js]
[test_ext_simple.js]
[test_ext_storage.js]
[test_ext_storage_sync.js]
head = head.js head_sync.js
skip-if = os == "android"
[test_ext_topSites.js]
skip-if = os == "android"
[test_getAPILevelForWindow.js]
