Bug 988616 - Rename CSP test files to remove unnecessary "spec_compliant" refs r=sstamm r=ckerschb
☠☠ backed out by d9d27a66ee94 ☠ ☠
authorGarrett Robinson <grobinson@mozilla.com>
Wed, 04 Jun 2014 15:24:39 -0700
changeset 207023 1be4b65524738fc43bec68ab1aa260aa65306ce7
parent 207022 bf40eebc65434dd7030506fb1dd6f1e64f34418f
child 207024 948a658c002ba13c6f647b99dbb8bb8a5a017b20
push id494
push userraliiev@mozilla.com
push dateMon, 25 Aug 2014 18:42:16 +0000
treeherdermozilla-release@a3cc3e46b571 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssstamm, ckerschb
bugs988616
milestone32.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 988616 - Rename CSP test files to remove unnecessary "spec_compliant" refs r=sstamm r=ckerschb
content/base/test/csp/file_CSP_evalscript_main.html
content/base/test/csp/file_CSP_evalscript_main.html^headers^
content/base/test/csp/file_CSP_evalscript_main_allowed.html
content/base/test/csp/file_CSP_evalscript_main_allowed.html^headers^
content/base/test/csp/file_CSP_evalscript_main_allowed_getCRMFRequest.html
content/base/test/csp/file_CSP_evalscript_main_allowed_getCRMFRequest.html^headers^
content/base/test/csp/file_CSP_evalscript_main_getCRMFRequest.html^headers^
content/base/test/csp/file_CSP_evalscript_main_spec_compliant.html
content/base/test/csp/file_CSP_evalscript_main_spec_compliant.html^headers^
content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed.html
content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed.html^headers^
content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html
content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html^headers^
content/base/test/csp/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html
content/base/test/csp/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html^headers^
content/base/test/csp/file_CSP_frameancestors.sjs
content/base/test/csp/file_CSP_frameancestors_main.html
content/base/test/csp/file_CSP_frameancestors_main.js
content/base/test/csp/file_CSP_frameancestors_main_spec_compliant.html
content/base/test/csp/file_CSP_frameancestors_main_spec_compliant.js
content/base/test/csp/file_CSP_frameancestors_spec_compliant.sjs
content/base/test/csp/file_CSP_inlinescript_main.html
content/base/test/csp/file_CSP_inlinescript_main.html^headers^
content/base/test/csp/file_CSP_inlinescript_main_allowed.html
content/base/test/csp/file_CSP_inlinescript_main_allowed.html^headers^
content/base/test/csp/file_CSP_inlinescript_main_spec_compliant.html
content/base/test/csp/file_CSP_inlinescript_main_spec_compliant.html^headers^
content/base/test/csp/file_CSP_inlinescript_main_spec_compliant_allowed.html
content/base/test/csp/file_CSP_inlinescript_main_spec_compliant_allowed.html^headers^
content/base/test/csp/file_CSP_inlinestyle_main.html
content/base/test/csp/file_CSP_inlinestyle_main.html^headers^
content/base/test/csp/file_CSP_inlinestyle_main_allowed.html
content/base/test/csp/file_CSP_inlinestyle_main_allowed.html^headers^
content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant.html
content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant.html^headers^
content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant_allowed.html
content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant_allowed.html^headers^
content/base/test/csp/file_CSP_main.html
content/base/test/csp/file_CSP_main.html^headers^
content/base/test/csp/file_CSP_main.js
content/base/test/csp/file_CSP_main_spec_compliant.html
content/base/test/csp/file_CSP_main_spec_compliant.html^headers^
content/base/test/csp/file_CSP_main_spec_compliant.js
content/base/test/csp/mochitest.ini
content/base/test/csp/test_CSP.html
content/base/test/csp/test_CSP_evalscript.html
content/base/test/csp/test_CSP_evalscript_getCRMFRequest.html
content/base/test/csp/test_CSP_frameancestors.html
content/base/test/csp/test_CSP_inlinescript.html
content/base/test/csp/test_CSP_inlinestyle.html
rename from content/base/test/csp/file_CSP_evalscript_main_spec_compliant.html
rename to content/base/test/csp/file_CSP_evalscript_main.html
rename from content/base/test/csp/file_CSP_evalscript_main_spec_compliant.html^headers^
rename to content/base/test/csp/file_CSP_evalscript_main.html^headers^
rename from content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed.html
rename to content/base/test/csp/file_CSP_evalscript_main_allowed.html
rename from content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed.html^headers^
rename to content/base/test/csp/file_CSP_evalscript_main_allowed.html^headers^
rename from content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html
rename to content/base/test/csp/file_CSP_evalscript_main_allowed_getCRMFRequest.html
rename from content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html^headers^
rename to content/base/test/csp/file_CSP_evalscript_main_allowed_getCRMFRequest.html^headers^
--- a/content/base/test/csp/file_CSP_evalscript_main_getCRMFRequest.html^headers^
+++ b/content/base/test/csp/file_CSP_evalscript_main_getCRMFRequest.html^headers^
@@ -1,2 +1,2 @@
 Cache-Control: no-cache
-X-Content-Security-Policy: default-src 'self'
+Content-Security-Policy: default-src 'self'
deleted file mode 100644
--- a/content/base/test/csp/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-  <head>
-    <title>CSP eval script tests</title>
-    <script type="application/javascript"
-             src="file_CSP_evalscript_main_getCRMFRequest.js"></script>
-  </head>
-  <body>
-
-    Foo.
-
-  </body>
-</html>
deleted file mode 100644
--- a/content/base/test/csp/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html^headers^
+++ /dev/null
@@ -1,2 +0,0 @@
-Cache-Control: no-cache
-Content-Security-Policy: default-src 'self'
rename from content/base/test/csp/file_CSP_frameancestors_spec_compliant.sjs
rename to content/base/test/csp/file_CSP_frameancestors.sjs
--- a/content/base/test/csp/file_CSP_frameancestors_spec_compliant.sjs
+++ b/content/base/test/csp/file_CSP_frameancestors.sjs
@@ -25,19 +25,19 @@ function handleRequest(request, response
       response.write('window.parent.parent.parent.postMessage({call: "frameLoaded", testname: "' + query['scriptedreport'] + '", uri: "window.location.toString()"}, "*");');
     else
       response.write('window.parent.parent.postMessage({call: "frameLoaded", testname: "' + query['scriptedreport'] + '", uri: "window.location.toString()"}, "*");');
   } else if (query['internalframe']) {
     // spit back an internal iframe (one that might be blocked)
     response.setHeader("Content-Type", "text/html", false);
     response.write('<html><head>');
     if (query['double'])
-      response.write('<script src="file_CSP_frameancestors_spec_compliant.sjs?double=1&scriptedreport=' + query['testid'] + '"></script>');
+      response.write('<script src="file_CSP_frameancestors.sjs?double=1&scriptedreport=' + query['testid'] + '"></script>');
     else
-      response.write('<script src="file_CSP_frameancestors_spec_compliant.sjs?scriptedreport=' + query['testid'] + '"></script>');
+      response.write('<script src="file_CSP_frameancestors.sjs?scriptedreport=' + query['testid'] + '"></script>');
     response.write('</head><body>');
     response.write(unescape(query['internalframe']));
     response.write('</body></html>');
   } else if (query['externalframe']) {
     // spit back an internal iframe (one that won't be blocked, and probably
     // has no CSP)
     response.setHeader("Content-Type", "text/html", false);
     response.write('<html><head>');
rename from content/base/test/csp/file_CSP_frameancestors_main_spec_compliant.html
rename to content/base/test/csp/file_CSP_frameancestors_main.html
--- a/content/base/test/csp/file_CSP_frameancestors_main_spec_compliant.html
+++ b/content/base/test/csp/file_CSP_frameancestors_main.html
@@ -1,14 +1,14 @@
 <html>
   <head>
     <title>CSP frame ancestors tests</title>
 
     <!-- this page shouldn't have a CSP, just the sub-pages. -->
-    <script src='file_CSP_frameancestors_main_spec_compliant.js'></script>
+    <script src='file_CSP_frameancestors_main.js'></script>
 
   </head>
   <body>
 
 <!-- These iframes will get populated by the attached javascript. -->
 <tt>  aa_allow:   /* innermost frame allows a */</tt><br/>
 <iframe id='aa_allow_spec_compliant'></iframe><br/>
 
rename from content/base/test/csp/file_CSP_frameancestors_main_spec_compliant.js
rename to content/base/test/csp/file_CSP_frameancestors_main.js
--- a/content/base/test/csp/file_CSP_frameancestors_main_spec_compliant.js
+++ b/content/base/test/csp/file_CSP_frameancestors_main.js
@@ -1,17 +1,17 @@
 // Script to populate the test frames in the frame ancestors mochitest.
 //
 function setupFrames() {
 
   var $ = function(v) { return document.getElementById(v); }
   var base = {
-        self: '/tests/content/base/test/csp/file_CSP_frameancestors_spec_compliant.sjs',
-        a: 'http://mochi.test:8888/tests/content/base/test/csp/file_CSP_frameancestors_spec_compliant.sjs',
-        b: 'http://example.com/tests/content/base/test/csp/file_CSP_frameancestors_spec_compliant.sjs'
+        self: '/tests/content/base/test/csp/file_CSP_frameancestors.sjs',
+        a: 'http://mochi.test:8888/tests/content/base/test/csp/file_CSP_frameancestors.sjs',
+        b: 'http://example.com/tests/content/base/test/csp/file_CSP_frameancestors.sjs'
   };
 
   var host = { a: 'http://mochi.test:8888', b: 'http://example.com:80' };
 
   var innerframeuri = null;
   var elt = null;
 
   elt = $('aa_allow_spec_compliant');
rename from content/base/test/csp/file_CSP_inlinescript_main_spec_compliant.html
rename to content/base/test/csp/file_CSP_inlinescript_main.html
rename from content/base/test/csp/file_CSP_inlinescript_main_spec_compliant.html^headers^
rename to content/base/test/csp/file_CSP_inlinescript_main.html^headers^
rename from content/base/test/csp/file_CSP_inlinescript_main_spec_compliant_allowed.html
rename to content/base/test/csp/file_CSP_inlinescript_main_allowed.html
rename from content/base/test/csp/file_CSP_inlinescript_main_spec_compliant_allowed.html^headers^
rename to content/base/test/csp/file_CSP_inlinescript_main_allowed.html^headers^
rename from content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant.html
rename to content/base/test/csp/file_CSP_inlinestyle_main.html
rename from content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant.html^headers^
rename to content/base/test/csp/file_CSP_inlinestyle_main.html^headers^
rename from content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant_allowed.html
rename to content/base/test/csp/file_CSP_inlinestyle_main_allowed.html
rename from content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant_allowed.html^headers^
rename to content/base/test/csp/file_CSP_inlinestyle_main_allowed.html^headers^
rename from content/base/test/csp/file_CSP_main_spec_compliant.html
rename to content/base/test/csp/file_CSP_main.html
--- a/content/base/test/csp/file_CSP_main_spec_compliant.html
+++ b/content/base/test/csp/file_CSP_main.html
@@ -41,15 +41,15 @@
     <object width="10" height="10">
       <param name="movie" value="file_CSP.sjs?testid=object_spec_compliant_good&type=application/x-shockwave-flash">
       <embed src="file_CSP.sjs?testid=object_spec_compliant_good&type=application/x-shockwave-flash"></embed>
     </object>
 
     <!-- XHR tests... they're taken care of in this script,
          and since the URI doesn't have any 'testid' values,
          it will just be ignored by the test framework.  -->
-    <script src='file_CSP_main_spec_compliant.js'></script>
+    <script src='file_CSP_main.js'></script>
 
     <!-- Support elements for the @font-face test -->
     <div class="div_arbitrary_good">arbitrary good</div>
     <div class="div_arbitrary_bad">arbitrary_bad</div>
   </body>
 </html>
rename from content/base/test/csp/file_CSP_main_spec_compliant.html^headers^
rename to content/base/test/csp/file_CSP_main.html^headers^
rename from content/base/test/csp/file_CSP_main_spec_compliant.js
rename to content/base/test/csp/file_CSP_main.js
--- a/content/base/test/csp/mochitest.ini
+++ b/content/base/test/csp/mochitest.ini
@@ -16,41 +16,41 @@ support-files =
   file_CSP_bug885433_blocks.html
   file_CSP_bug885433_blocks.html^headers^
   file_CSP_bug888172.html
   file_CSP_bug888172.sjs
   file_CSP_evalscript_main.js
   file_CSP_evalscript_main_allowed.js
   file_CSP_evalscript_main_allowed_getCRMFRequest.js
   file_CSP_evalscript_main_getCRMFRequest.js
-  file_CSP_evalscript_main_spec_compliant.html
-  file_CSP_evalscript_main_spec_compliant.html^headers^
-  file_CSP_evalscript_main_spec_compliant_allowed.html
-  file_CSP_evalscript_main_spec_compliant_allowed.html^headers^
-  file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html
-  file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html^headers^
-  file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html
-  file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html^headers^
+  file_CSP_evalscript_main.html
+  file_CSP_evalscript_main.html^headers^
+  file_CSP_evalscript_main_allowed.html
+  file_CSP_evalscript_main_allowed.html^headers^
+  file_CSP_evalscript_main_allowed_getCRMFRequest.html
+  file_CSP_evalscript_main_allowed_getCRMFRequest.html^headers^
+  file_CSP_evalscript_main_getCRMFRequest.html
+  file_CSP_evalscript_main_getCRMFRequest.html^headers^
   file_CSP_evalscript_no_CSP_at_all.html
   file_CSP_evalscript_no_CSP_at_all.html^headers^
   file_CSP_evalscript_no_CSP_at_all.js
-  file_CSP_frameancestors_main_spec_compliant.html
-  file_CSP_frameancestors_main_spec_compliant.js
-  file_CSP_frameancestors_spec_compliant.sjs
-  file_CSP_inlinescript_main_spec_compliant.html
-  file_CSP_inlinescript_main_spec_compliant.html^headers^
-  file_CSP_inlinescript_main_spec_compliant_allowed.html
-  file_CSP_inlinescript_main_spec_compliant_allowed.html^headers^
-  file_CSP_inlinestyle_main_spec_compliant.html
-  file_CSP_inlinestyle_main_spec_compliant.html^headers^
-  file_CSP_inlinestyle_main_spec_compliant_allowed.html
-  file_CSP_inlinestyle_main_spec_compliant_allowed.html^headers^
-  file_CSP_main_spec_compliant.html
-  file_CSP_main_spec_compliant.html^headers^
-  file_CSP_main_spec_compliant.js
+  file_CSP_frameancestors_main.html
+  file_CSP_frameancestors_main.js
+  file_CSP_frameancestors.sjs
+  file_CSP_inlinescript_main.html
+  file_CSP_inlinescript_main.html^headers^
+  file_CSP_inlinescript_main_allowed.html
+  file_CSP_inlinescript_main_allowed.html^headers^
+  file_CSP_inlinestyle_main.html
+  file_CSP_inlinestyle_main.html^headers^
+  file_CSP_inlinestyle_main_allowed.html
+  file_CSP_inlinestyle_main_allowed.html^headers^
+  file_CSP_main.html
+  file_CSP_main.html^headers^
+  file_CSP_main.js
   file_bug836922_npolicies.html
   file_bug836922_npolicies.html^headers^
   file_bug836922_npolicies_ro_violation.sjs
   file_bug836922_npolicies_violation.sjs
   file_bug886164.html
   file_bug886164.html^headers^
   file_bug886164_2.html
   file_bug886164_2.html^headers^
--- a/content/base/test/csp/test_CSP.html
+++ b/content/base/test/csp/test_CSP.html
@@ -106,14 +106,14 @@ SpecialPowers.pushPrefEnv(
           // blocks loading the resource until the user interacts with a
           // corresponding widget, which breaks the media_* tests. We set it
           // back to the default used by desktop Firefox to get consistent
           // behavior.
           ["media.preload.default", 2]]},
     function() {
       // save this for last so that our listeners are registered.
       // ... this loads the testbed of good and bad requests.
-      document.getElementById('cspframe').src = 'file_CSP_main_spec_compliant.html';
+      document.getElementById('cspframe').src = 'file_CSP_main.html';
     });
 </script>
 </pre>
 </body>
 </html>
--- a/content/base/test/csp/test_CSP_evalscript.html
+++ b/content/base/test/csp/test_CSP_evalscript.html
@@ -46,15 +46,15 @@ var checkTestResults = function() {
 // set up and go
 SimpleTest.waitForExplicitFinish();
 
 SpecialPowers.pushPrefEnv(
   {'set':[["security.csp.speccompliant", true]]},
     function() {
       // save this for last so that our listeners are registered.
       // ... this loads the testbed of good and bad requests.
-      document.getElementById('cspframe').src = 'file_CSP_evalscript_main_spec_compliant.html';
-      document.getElementById('cspframe2').src = 'file_CSP_evalscript_main_spec_compliant_allowed.html';
+      document.getElementById('cspframe').src = 'file_CSP_evalscript_main.html';
+      document.getElementById('cspframe2').src = 'file_CSP_evalscript_main_allowed.html';
     });
 </script>
 </pre>
 </body>
 </html>
--- a/content/base/test/csp/test_CSP_evalscript_getCRMFRequest.html
+++ b/content/base/test/csp/test_CSP_evalscript_getCRMFRequest.html
@@ -48,16 +48,16 @@ var checkTestResults = function() {
 // set up and go
 SimpleTest.waitForExplicitFinish();
 
 SpecialPowers.pushPrefEnv(
   {'set':[["security.csp.speccompliant", true]]},
     function() {
       // save this for last so that our listeners are registered.
       // ... this loads the testbed of good and bad requests.
-      document.getElementById('cspframe').src = 'file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html';
-      document.getElementById('cspframe2').src = 'file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html';
+      document.getElementById('cspframe').src = 'file_CSP_evalscript_main_getCRMFRequest.html';
+      document.getElementById('cspframe2').src = 'file_CSP_evalscript_main_allowed_getCRMFRequest.html';
       document.getElementById('cspframe3').src = 'file_CSP_evalscript_no_CSP_at_all.html';
     });
 </script>
 </pre>
 </body>
 </html>
--- a/content/base/test/csp/test_CSP_frameancestors.html
+++ b/content/base/test/csp/test_CSP_frameancestors.html
@@ -108,15 +108,15 @@ window.examiner = new examiner();
 SimpleTest.waitForExplicitFinish();
 
 // added this so the tests run even if we don't flip the pref on by default.
 SpecialPowers.pushPrefEnv(
   {'set':[["security.csp.speccompliant", true]]},
   function() {
     // save this for last so that our listeners are registered.
     // ... this loads the testbed of good and bad requests.
-    document.getElementById('cspframe').src = 'file_CSP_frameancestors_main_spec_compliant.html';
+    document.getElementById('cspframe').src = 'file_CSP_frameancestors_main.html';
   });
 
 </script>
 </pre>
 </body>
 </html>
--- a/content/base/test/csp/test_CSP_inlinescript.html
+++ b/content/base/test/csp/test_CSP_inlinescript.html
@@ -101,17 +101,17 @@ function clickit2() {
   sendMouseEvent({type:'click'}, a, cspframe2.contentWindow);
 }
 
 SpecialPowers.pushPrefEnv(
   {'set':[["security.csp.speccompliant", true]]},
   function() {
     // save this for last so that our listeners are registered.
     // ... this loads the testbed of good and bad requests.
-    document.getElementById('cspframe1').src = 'file_CSP_inlinescript_main_spec_compliant.html';
+    document.getElementById('cspframe1').src = 'file_CSP_inlinescript_main.html';
     document.getElementById('cspframe1').addEventListener('load', clickit1, false);
-    document.getElementById('cspframe2').src = 'file_CSP_inlinescript_main_spec_compliant_allowed.html';
+    document.getElementById('cspframe2').src = 'file_CSP_inlinescript_main_allowed.html';
     document.getElementById('cspframe2').addEventListener('load', clickit2, false);
   });
 </script>
 </pre>
 </body>
 </html>
--- a/content/base/test/csp/test_CSP_inlinestyle.html
+++ b/content/base/test/csp/test_CSP_inlinestyle.html
@@ -94,18 +94,18 @@ function checkIfDone() {
     SimpleTest.finish();
 }
 
 SpecialPowers.pushPrefEnv(
   {'set':[["security.csp.speccompliant", true]]},
   function() {
     // save this for last so that our listeners are registered.
     // ... this loads the testbed of good and bad requests.
-    document.getElementById('cspframe1').src = 'file_CSP_inlinestyle_main_spec_compliant.html';
+    document.getElementById('cspframe1').src = 'file_CSP_inlinestyle_main.html';
     document.getElementById('cspframe1').addEventListener('load', checkStylesSpecCompliant, false);
-    document.getElementById('cspframe2').src = 'file_CSP_inlinestyle_main_spec_compliant_allowed.html';
+    document.getElementById('cspframe2').src = 'file_CSP_inlinestyle_main_allowed.html';
     document.getElementById('cspframe2').addEventListener('load', checkStylesSpecCompliantAllowed, false);
   }
 );
 </script>
 </pre>
 </body>
 </html>