Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1457915 - Disable service workers and push notifications on 60 ES…
…R. r=baku, a=jcristau
  • Loading branch information
bakulf committed May 2, 2018
1 parent d36da62 commit 7b2c71c
Show file tree
Hide file tree
Showing 19 changed files with 66 additions and 50 deletions.
4 changes: 2 additions & 2 deletions browser/app/profile/firefox.js
Expand Up @@ -1592,10 +1592,10 @@ pref("reader.parse-node-limit", 0);
// and because (normally) these errors are not persisted anywhere.
pref("reader.errors.includeURLs", true);

pref("dom.serviceWorkers.enabled", true);
pref("dom.serviceWorkers.enabled", false);

// Enable Push API.
pref("dom.push.enabled", true);
pref("dom.push.enabled", false);

// These are the thumbnail width/height set in about:newtab.
// If you change this, ENSURE IT IS THE SAME SIZE SET
Expand Down
Expand Up @@ -23,6 +23,7 @@ add_task(async function setup() {
// make sure userContext is enabled.
await SpecialPowers.pushPrefEnv({"set": [
["privacy.userContext.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.ipc.processCount", 1]
]});
});
Expand Down
Expand Up @@ -161,6 +161,12 @@ async function testClearData(clearSiteData, clearCache) {
await SiteDataManager.removeAll();
}

add_task(async function() {
await SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.enabled", true],
]});
});

// Test opening the "Clear All Data" dialog and cancelling.
add_task(async function() {
await testClearData(false, false);
Expand Down
Expand Up @@ -26,7 +26,10 @@ function getPersistentStoragePermStatus(origin) {
// Test listing site using quota usage or site using appcache
// This is currently disabled because of bug 1414751.
add_task(async function() {
await SpecialPowers.pushPrefEnv({set: [["browser.storageManager.enabled", true]]});
await SpecialPowers.pushPrefEnv({set: [
["browser.storageManager.enabled", true],
["dom.serviceWorkers.enabled", true],
]});

// Open a test site which would save into appcache
await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_OFFLINE_URL);
Expand Down Expand Up @@ -71,7 +74,10 @@ add_task(async function() {

// Test buttons are disabled and loading message shown while updating sites
add_task(async function() {
await SpecialPowers.pushPrefEnv({set: [["browser.storageManager.enabled", true]]});
await SpecialPowers.pushPrefEnv({set: [
["browser.storageManager.enabled", true],
["dom.serviceWorkers.enabled", true],
]});
let updatedPromise = promiseSiteDataManagerSitesUpdated();
await openPreferencesViaOpenPreferencesAPI("privacy", { leaveOpen: true });
await updatedPromise;
Expand Down Expand Up @@ -118,7 +124,10 @@ add_task(async function() {

// Test clearing service wroker through the settings panel
add_task(async function() {
await SpecialPowers.pushPrefEnv({set: [["browser.storageManager.enabled", true]]});
await SpecialPowers.pushPrefEnv({set: [
["browser.storageManager.enabled", true],
["dom.serviceWorkers.enabled", true],
]});
// Register a test service worker
await loadServiceWorkerTestPage(TEST_SERVICE_WORKER_URL);
await openPreferencesViaOpenPreferencesAPI("privacy", { leaveOpen: true });
Expand Down
1 change: 1 addition & 0 deletions devtools/client/aboutdebugging/test/head.js
Expand Up @@ -405,6 +405,7 @@ function* enableServiceWorkerDebugging() {
let options = { "set": [
// Enable service workers.
["dom.serviceWorkers.enabled", true],
["dom.push.enabled", true],
// Accept workers from mochitest's http.
["dom.serviceWorkers.testing.enabled", true],
// Force single content process.
Expand Down
Expand Up @@ -13,6 +13,15 @@ const URL = EXAMPLE_URL.replace("http:", "https:");
const TEST_URL = URL + "service-workers/status-codes.html";

add_task(async function () {
await new Promise(done => {
let options = { "set": [
// Accept workers from mochitest's http.
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
]};
SpecialPowers.pushPrefEnv(options, done);
});

let { tab, monitor } = await initNetMonitor(TEST_URL, true);
info("Starting test... ");

Expand Down
Expand Up @@ -6,6 +6,11 @@
// are correctly fetched via the service worker in the stylesheet editor.

add_task(async function () {
await SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
]});

const TEST_URL = "https://test1.example.com/browser/devtools/client/styleeditor/test/bug_1405342_serviceworker_iframes.html";
let { ui } = await openStyleEditorForURL(TEST_URL);

Expand Down
10 changes: 0 additions & 10 deletions dom/serviceworkers/test/test_serviceworker_interfaces.js
Expand Up @@ -192,16 +192,6 @@ var interfaceNamesInGlobalScope =
"PerformanceResourceTiming",
// IMPORTANT: Do not change this list without review from a DOM peer!
"ProgressEvent",
// IMPORTANT: Do not change this list without review from a DOM peer!
"PushEvent",
// IMPORTANT: Do not change this list without review from a DOM peer!
"PushManager",
// IMPORTANT: Do not change this list without review from a DOM peer!
"PushMessageData",
// IMPORTANT: Do not change this list without review from a DOM peer!
"PushSubscription",
// IMPORTANT: Do not change this list without review from a DOM peer!
"PushSubscriptionOptions",
// IMPORTANT: Do not change this list without review from a DOM peer!
"Request",
// IMPORTANT: Do not change this list without review from a DOM peer!
Expand Down
12 changes: 0 additions & 12 deletions dom/tests/mochitest/general/test_interfaces.js
Expand Up @@ -814,12 +814,6 @@ var interfaceNamesInGlobalScope =
{name: "ProgressEvent", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "PublicKeyCredential"},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "PushManager", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "PushSubscription", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "PushSubscriptionOptions", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "RadioNodeList", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
Expand Down Expand Up @@ -872,12 +866,6 @@ var interfaceNamesInGlobalScope =
{name: "SecurityPolicyViolationEvent", insecureContext: true, release: false},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "Selection", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "ServiceWorker", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "ServiceWorkerContainer", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "ServiceWorkerRegistration", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "ScopedCredential", insecureContext: true, disabled: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
Expand Down
8 changes: 0 additions & 8 deletions dom/workers/test/test_worker_interfaces.js
Expand Up @@ -192,18 +192,10 @@ var interfaceNamesInGlobalScope =
{name: "PerformanceResourceTiming", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "ProgressEvent", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "PushManager", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "PushSubscription", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "PushSubscriptionOptions", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "Request", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "Response", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "ServiceWorkerRegistration", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "StorageManager", android: false},
// IMPORTANT: Do not change this list without review from a DOM peer!
Expand Down
16 changes: 8 additions & 8 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions testing/web-platform/meta/background-fetch/__dir__.ini
@@ -0,0 +1 @@
prefs: [dom.serviceWorkers.enabled:true]
@@ -1 +1 @@
prefs: [security.csp.enable_violation_events:true]
prefs: [security.csp.enable_violation_events:true, dom.serviceWorkers.enabled:true]
1 change: 1 addition & 0 deletions testing/web-platform/meta/cookie-store/__dir__.ini
@@ -0,0 +1 @@
prefs: [dom.serviceWorkers.enabled:true]
1 change: 1 addition & 0 deletions testing/web-platform/meta/fetch/__dir__.ini
@@ -0,0 +1 @@
prefs: [dom.serviceWorkers.enabled:true]
1 change: 1 addition & 0 deletions testing/web-platform/meta/html/__dir__.ini
@@ -0,0 +1 @@
prefs: [dom.serviceWorkers.enabled:true]
2 changes: 1 addition & 1 deletion testing/web-platform/meta/streams/__dir__.ini
@@ -1 +1 @@
prefs: [javascript.options.streams:true]
prefs: [javascript.options.streams:true, dom.serviceWorkers.enabled:true]
Expand Up @@ -15,7 +15,10 @@

add_task(async function test_webRequest_serviceworker_events() {
await SpecialPowers.pushPrefEnv({
set: [["dom.serviceWorkers.testing.enabled", true]],
set: [
["dom.serviceWorkers.testing.enabled", true],
["dom.serviceWorkers.enabled", true],
],
});

let extension = ExtensionTestUtils.loadExtension({
Expand Down
Expand Up @@ -57,8 +57,10 @@
}

await SpecialPowers.pushPrefEnv({
set: [["dom.serviceWorkers.testing.enabled", true],
["network.http.rcwn.enabled", false]],
set: [
["dom.serviceWorkers.testing.enabled", true],
["dom.serviceWorkers.enabled", true],
],
});

let events = {
Expand Down Expand Up @@ -103,7 +105,10 @@

add_task(async function test_webRequest_filter_tab() {
await SpecialPowers.pushPrefEnv({
set: [["dom.serviceWorkers.testing.enabled", true]],
set: [
["dom.serviceWorkers.testing.enabled", true],
["dom.serviceWorkers.enabled", true],
],
});

let img = `file_image_good.png?r=${Math.random()}`;
Expand Down Expand Up @@ -154,7 +159,10 @@

add_task(async function test_webRequest_filter_background() {
await SpecialPowers.pushPrefEnv({
set: [["dom.serviceWorkers.testing.enabled", true]],
set: [
["dom.serviceWorkers.testing.enabled", true],
["dom.serviceWorkers.enabled", true],
],
});

let events = {
Expand Down

0 comments on commit 7b2c71c

Please sign in to comment.