Bug 1425993 - Make security violation events Nightly-only and update test expectations accordingly. r=smaug
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 03 Jan 2018 12:35:49 -0500
changeset 449362 4e60eefd78cc59b2ee913f4727e3cec2b3d2974e
parent 449361 b91ce5ed4d3597cf627b49c96def71ba63f1cc7d
child 449363 f491d9b28b7601af749bbab00c1aacc022d5dd61
push id8527
push userCallek@gmail.com
push dateThu, 11 Jan 2018 21:05:50 +0000
treeherdermozilla-beta@95342d212a7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1425993
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1425993 - Make security violation events Nightly-only and update test expectations accordingly. r=smaug
dom/tests/mochitest/general/test_interfaces.js
modules/libpref/init/all.js
testing/web-platform/meta/content-security-policy/style-src/style-src-imported-style-blocked.html.ini
--- a/dom/tests/mochitest/general/test_interfaces.js
+++ b/dom/tests/mochitest/general/test_interfaces.js
@@ -820,17 +820,17 @@ var interfaceNamesInGlobalScope =
     "Screen",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "ScreenOrientation",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "ScriptProcessorNode",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "ScrollAreaEvent",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    "SecurityPolicyViolationEvent",
+    {name: "SecurityPolicyViolationEvent", release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "Selection",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "ServiceWorker",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "ServiceWorkerContainer",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "ServiceWorkerRegistration",
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -2554,17 +2554,17 @@ pref("security.directory",              
 pref("signed.applets.codebase_principal_support", false);
 // security-sensitive dialogs should delay button enabling. In milliseconds.
 pref("security.dialog_enable_delay", 1000);
 pref("security.notification_enable_delay", 500);
 
 pref("security.csp.enable", true);
 pref("security.csp.experimentalEnabled", false);
 pref("security.csp.enableStrictDynamic", true);
-#ifdef EARLY_BETA_OR_EARLIER
+#ifdef NIGHTLY_BUILD
 pref("security.csp.enable_violation_events", true);
 #else
 pref("security.csp.enable_violation_events", false);
 #endif
 
 // Default Content Security Policy to apply to signed contents.
 pref("security.signed_content.CSP.default", "script-src 'self'; style-src 'self'");
 
--- a/testing/web-platform/meta/content-security-policy/style-src/style-src-imported-style-blocked.html.ini
+++ b/testing/web-platform/meta/content-security-policy/style-src/style-src-imported-style-blocked.html.ini
@@ -1,5 +1,6 @@
 [style-src-imported-style-blocked.html]
   type: testharness
+  prefs: [security.csp.enable_violation_events:true]
   [Should fire a securitypolicyviolation event]
     expected: FAIL