diff --git a/content/base/test/Makefile.in b/content/base/test/Makefile.in index e8da16ec86c..a1c5253a74d 100644 --- a/content/base/test/Makefile.in +++ b/content/base/test/Makefile.in @@ -326,61 +326,6 @@ MOCHITEST_FILES_B = \ test_bug503481b.html \ file_bug503481b_inner.html \ test_viewport_scroll.html \ - test_CSP.html \ - file_CSP.sjs \ - file_CSP.css \ - file_CSP_main.html \ - file_CSP_main.html^headers^ \ - file_CSP_main_spec_compliant.html \ - file_CSP_main_spec_compliant.html^headers^ \ - file_CSP_main.js \ - file_CSP_main_spec_compliant.js \ - test_CSP_frameancestors.html \ - file_CSP_frameancestors.sjs \ - file_CSP_frameancestors_main.html \ - file_CSP_frameancestors_main.js \ - file_CSP_frameancestors_spec_compliant.sjs \ - file_CSP_frameancestors_main_spec_compliant.html \ - file_CSP_frameancestors_main_spec_compliant.js \ - test_CSP_inlinescript.html \ - file_CSP_inlinescript_main.html \ - file_CSP_inlinescript_main.html^headers^ \ - 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^ \ - test_CSP_evalscript.html \ - file_CSP_evalscript_main.html \ - file_CSP_evalscript_main.html^headers^ \ - file_CSP_evalscript_main.js \ - file_CSP_evalscript_main_allowed.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^ \ - test_CSP_evalscript_getCRMFRequest.html \ - file_CSP_evalscript_main_getCRMFRequest.html \ - file_CSP_evalscript_main_getCRMFRequest.html^headers^ \ - file_CSP_evalscript_main_getCRMFRequest.js \ - file_CSP_evalscript_main_allowed_getCRMFRequest.js \ - file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html \ - file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html^headers^ \ - file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html \ - file_CSP_evalscript_main_spec_compliant_allowed_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 \ - test_CSP_inlinestyle.html \ - file_CSP_inlinestyle_main.html \ - file_CSP_inlinestyle_main.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_bug768029.html \ - file_csp_bug768029.sjs \ - file_csp_bug773891.html \ - file_csp_bug773891.sjs \ test_bug540854.html \ bug540854.sjs \ test_bug548463.html \ @@ -395,10 +340,6 @@ MOCHITEST_FILES_B = \ test_bug557892.html \ file_bug557892.html \ test_bug559526.html \ - test_csp_redirects.html \ - file_csp_redirects_page.sjs \ - file_csp_redirects_main.html \ - file_csp_redirects_resource.sjs \ test_bug346485.html \ test_bug560780.html \ test_bug562652.html \ @@ -625,9 +566,6 @@ MOCHITEST_FILES_C= \ test_bug813919.html \ test_bug814576.html \ test_xhr_withCredentials.html \ - test_bothCSPheaders.html \ - file_bothCSPheaders.html \ - file_bothCSPheaders.html^headers^ \ badMessageEvent2.eventsource \ badMessageEvent2.eventsource^headers^ \ test_object.html \ @@ -636,29 +574,10 @@ MOCHITEST_FILES_C= \ test_bug869000.html \ test_bug869002.html \ test_bug876282.html \ - test_CSP_bug885433.html \ - file_CSP_bug885433_allows.html \ - file_CSP_bug885433_allows.html^headers^ \ - file_CSP_bug885433_blocks.html \ - file_CSP_bug885433_blocks.html^headers^ \ test_bug890580.html \ test_declare_stylesheet_obsolete.html \ variable_style_sheet.sjs \ test_processing_instruction_update_stylesheet.xhtml \ - test_CSP_bug888172.html \ - file_CSP_bug888172.html \ - file_CSP_bug888172.sjs \ - test_CSP_bug663567.html \ - file_CSP_bug663567_allows.xml \ - file_CSP_bug663567_allows.xml^headers^ \ - file_CSP_bug663567.xsl \ - file_CSP_bug663567_blocks.xml \ - file_CSP_bug663567_blocks.xml^headers^ \ - test_CSP_bug802872.html \ - file_CSP_bug802872.html \ - file_CSP_bug802872.html^headers^ \ - file_CSP_bug802872.js \ - file_CSP_bug802872.sjs \ test_bug907892.html \ file_bug907892.html \ $(NULL) diff --git a/content/base/test/chrome/Makefile.in b/content/base/test/chrome/Makefile.in index 412e4d35778..a7e8cea17b9 100644 --- a/content/base/test/chrome/Makefile.in +++ b/content/base/test/chrome/Makefile.in @@ -43,9 +43,7 @@ MOCHITEST_CHROME_FILES = \ test_bug682305.html \ test_bug780199.xul \ test_bug780529.xul \ - test_csp_bug768029.html \ test_bug800386.xul \ - test_csp_bug773891.html \ test_bug816340.xul \ file_bug816340.xul \ test_domparsing.xul \ diff --git a/content/base/test/csp/Makefile.in b/content/base/test/csp/Makefile.in new file mode 100644 index 00000000000..b5ea16d1b01 --- /dev/null +++ b/content/base/test/csp/Makefile.in @@ -0,0 +1,102 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DEPTH := @DEPTH@ +topsrcdir := @top_srcdir@ +srcdir := @srcdir@ +VPATH := @srcdir@ +relativesrcdir := @relativesrcdir@ + +include $(DEPTH)/config/autoconf.mk + +MOCHITEST_FILES := \ + test_CSP.html \ + file_CSP.sjs \ + file_CSP.css \ + file_CSP_main.html \ + file_CSP_main.html^headers^ \ + file_CSP_main_spec_compliant.html \ + file_CSP_main_spec_compliant.html^headers^ \ + file_CSP_main.js \ + file_CSP_main_spec_compliant.js \ + test_CSP_frameancestors.html \ + file_CSP_frameancestors.sjs \ + file_CSP_frameancestors_main.html \ + file_CSP_frameancestors_main.js \ + file_CSP_frameancestors_spec_compliant.sjs \ + file_CSP_frameancestors_main_spec_compliant.html \ + file_CSP_frameancestors_main_spec_compliant.js \ + test_CSP_inlinescript.html \ + file_CSP_inlinescript_main.html \ + file_CSP_inlinescript_main.html^headers^ \ + 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^ \ + test_CSP_evalscript.html \ + file_CSP_evalscript_main.html \ + file_CSP_evalscript_main.html^headers^ \ + file_CSP_evalscript_main.js \ + file_CSP_evalscript_main_allowed.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^ \ + test_CSP_evalscript_getCRMFRequest.html \ + file_CSP_evalscript_main_getCRMFRequest.html \ + file_CSP_evalscript_main_getCRMFRequest.html^headers^ \ + file_CSP_evalscript_main_getCRMFRequest.js \ + file_CSP_evalscript_main_allowed_getCRMFRequest.js \ + file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html \ + file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html^headers^ \ + file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html \ + file_CSP_evalscript_main_spec_compliant_allowed_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 \ + test_CSP_inlinestyle.html \ + file_CSP_inlinestyle_main.html \ + file_CSP_inlinestyle_main.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_bug768029.html \ + file_csp_bug768029.sjs \ + file_csp_bug773891.html \ + file_csp_bug773891.sjs \ + test_csp_redirects.html \ + file_csp_redirects_page.sjs \ + file_csp_redirects_main.html \ + file_csp_redirects_resource.sjs \ + test_bothCSPheaders.html \ + file_bothCSPheaders.html \ + file_bothCSPheaders.html^headers^ \ + test_CSP_bug663567.html \ + file_CSP_bug663567_allows.xml \ + file_CSP_bug663567_allows.xml^headers^ \ + file_CSP_bug663567.xsl \ + file_CSP_bug663567_blocks.xml \ + file_CSP_bug663567_blocks.xml^headers^ \ + test_CSP_bug802872.html \ + file_CSP_bug802872.html \ + file_CSP_bug802872.html^headers^ \ + file_CSP_bug802872.js \ + file_CSP_bug802872.sjs \ + test_CSP_bug885433.html \ + file_CSP_bug885433_allows.html \ + file_CSP_bug885433_allows.html^headers^ \ + file_CSP_bug885433_blocks.html \ + file_CSP_bug885433_blocks.html^headers^ \ + test_CSP_bug888172.html \ + file_CSP_bug888172.html \ + file_CSP_bug888172.sjs \ + $(NULL) + +MOCHITEST_CHROME_FILES := \ + test_csp_bug768029.html \ + test_csp_bug773891.html \ + $(NULL) + +include $(topsrcdir)/config/rules.mk diff --git a/content/base/test/file_CSP.css b/content/base/test/csp/file_CSP.css similarity index 82% rename from content/base/test/file_CSP.css rename to content/base/test/csp/file_CSP.css index 105b54b382b..f83930e541c 100644 --- a/content/base/test/file_CSP.css +++ b/content/base/test/csp/file_CSP.css @@ -12,7 +12,7 @@ } @font-face { font-family: "arbitrary_bad"; - src: url('http://example.org/tests/content/base/test/file_CSP.sjs?testid=font_bad&type=application/octet-stream'); + src: url('http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=font_bad&type=application/octet-stream'); } .div_arbitrary_good { font-family: "arbitrary_good"; } diff --git a/content/base/test/file_CSP.sjs b/content/base/test/csp/file_CSP.sjs similarity index 100% rename from content/base/test/file_CSP.sjs rename to content/base/test/csp/file_CSP.sjs diff --git a/content/base/test/file_CSP_bug663567.xsl b/content/base/test/csp/file_CSP_bug663567.xsl similarity index 100% rename from content/base/test/file_CSP_bug663567.xsl rename to content/base/test/csp/file_CSP_bug663567.xsl diff --git a/content/base/test/file_CSP_bug663567_allows.xml b/content/base/test/csp/file_CSP_bug663567_allows.xml similarity index 100% rename from content/base/test/file_CSP_bug663567_allows.xml rename to content/base/test/csp/file_CSP_bug663567_allows.xml diff --git a/content/base/test/file_CSP_bug663567_allows.xml^headers^ b/content/base/test/csp/file_CSP_bug663567_allows.xml^headers^ similarity index 100% rename from content/base/test/file_CSP_bug663567_allows.xml^headers^ rename to content/base/test/csp/file_CSP_bug663567_allows.xml^headers^ diff --git a/content/base/test/file_CSP_bug663567_blocks.xml b/content/base/test/csp/file_CSP_bug663567_blocks.xml similarity index 100% rename from content/base/test/file_CSP_bug663567_blocks.xml rename to content/base/test/csp/file_CSP_bug663567_blocks.xml diff --git a/content/base/test/file_CSP_bug663567_blocks.xml^headers^ b/content/base/test/csp/file_CSP_bug663567_blocks.xml^headers^ similarity index 100% rename from content/base/test/file_CSP_bug663567_blocks.xml^headers^ rename to content/base/test/csp/file_CSP_bug663567_blocks.xml^headers^ diff --git a/content/base/test/file_CSP_bug802872.html b/content/base/test/csp/file_CSP_bug802872.html similarity index 100% rename from content/base/test/file_CSP_bug802872.html rename to content/base/test/csp/file_CSP_bug802872.html diff --git a/content/base/test/file_CSP_bug802872.html^headers^ b/content/base/test/csp/file_CSP_bug802872.html^headers^ similarity index 100% rename from content/base/test/file_CSP_bug802872.html^headers^ rename to content/base/test/csp/file_CSP_bug802872.html^headers^ diff --git a/content/base/test/file_CSP_bug802872.js b/content/base/test/csp/file_CSP_bug802872.js similarity index 93% rename from content/base/test/file_CSP_bug802872.js rename to content/base/test/csp/file_CSP_bug802872.js index 09096f1d884..c4c2783923a 100644 --- a/content/base/test/file_CSP_bug802872.js +++ b/content/base/test/csp/file_CSP_bug802872.js @@ -8,7 +8,7 @@ function createAllowedEvent() { * Creates a new EventSource using 'http://mochi.test:8888'. Since all mochitests run on * 'http://mochi.test', a default-src of 'self' allows this request. */ - var src_event = new EventSource("http://mochi.test:8888/tests/content/base/test/file_CSP_bug802872.sjs"); + var src_event = new EventSource("http://mochi.test:8888/tests/content/base/test/csp/file_CSP_bug802872.sjs"); src_event.onmessage = function(e) { src_event.close(); @@ -26,7 +26,7 @@ function createBlockedEvent() { * creates a new EventSource using 'http://example.com'. This domain is not whitelisted by the * CSP of this page, therefore the CSP blocks this request. */ - var src_event = new EventSource("http://example.com/tests/content/base/test/file_CSP_bug802872.sjs"); + var src_event = new EventSource("http://example.com/tests/content/base/test/csp/file_CSP_bug802872.sjs"); src_event.onmessage = function(e) { src_event.close(); diff --git a/content/base/test/file_CSP_bug802872.sjs b/content/base/test/csp/file_CSP_bug802872.sjs similarity index 100% rename from content/base/test/file_CSP_bug802872.sjs rename to content/base/test/csp/file_CSP_bug802872.sjs diff --git a/content/base/test/file_CSP_bug885433_allows.html b/content/base/test/csp/file_CSP_bug885433_allows.html similarity index 100% rename from content/base/test/file_CSP_bug885433_allows.html rename to content/base/test/csp/file_CSP_bug885433_allows.html diff --git a/content/base/test/file_CSP_bug885433_allows.html^headers^ b/content/base/test/csp/file_CSP_bug885433_allows.html^headers^ similarity index 100% rename from content/base/test/file_CSP_bug885433_allows.html^headers^ rename to content/base/test/csp/file_CSP_bug885433_allows.html^headers^ diff --git a/content/base/test/file_CSP_bug885433_blocks.html b/content/base/test/csp/file_CSP_bug885433_blocks.html similarity index 100% rename from content/base/test/file_CSP_bug885433_blocks.html rename to content/base/test/csp/file_CSP_bug885433_blocks.html diff --git a/content/base/test/file_CSP_bug885433_blocks.html^headers^ b/content/base/test/csp/file_CSP_bug885433_blocks.html^headers^ similarity index 100% rename from content/base/test/file_CSP_bug885433_blocks.html^headers^ rename to content/base/test/csp/file_CSP_bug885433_blocks.html^headers^ diff --git a/content/base/test/file_CSP_bug888172.html b/content/base/test/csp/file_CSP_bug888172.html similarity index 100% rename from content/base/test/file_CSP_bug888172.html rename to content/base/test/csp/file_CSP_bug888172.html diff --git a/content/base/test/file_CSP_bug888172.sjs b/content/base/test/csp/file_CSP_bug888172.sjs similarity index 94% rename from content/base/test/file_CSP_bug888172.sjs rename to content/base/test/csp/file_CSP_bug888172.sjs index 23563e22e6c..8f06f516bfe 100644 --- a/content/base/test/file_CSP_bug888172.sjs +++ b/content/base/test/csp/file_CSP_bug888172.sjs @@ -39,5 +39,5 @@ function handleRequest(request, response) // Send HTML to test allowed/blocked behaviors response.setHeader("Content-Type", "text/html", false); - response.write(loadHTMLFromFile("tests/content/base/test/file_CSP_bug888172.html")); + response.write(loadHTMLFromFile("tests/content/base/test/csp/file_CSP_bug888172.html")); } diff --git a/content/base/test/file_CSP_evalscript_main.html b/content/base/test/csp/file_CSP_evalscript_main.html similarity index 100% rename from content/base/test/file_CSP_evalscript_main.html rename to content/base/test/csp/file_CSP_evalscript_main.html diff --git a/content/base/test/file_CSP_evalscript_main.html^headers^ b/content/base/test/csp/file_CSP_evalscript_main.html^headers^ similarity index 100% rename from content/base/test/file_CSP_evalscript_main.html^headers^ rename to content/base/test/csp/file_CSP_evalscript_main.html^headers^ diff --git a/content/base/test/file_CSP_evalscript_main.js b/content/base/test/csp/file_CSP_evalscript_main.js similarity index 100% rename from content/base/test/file_CSP_evalscript_main.js rename to content/base/test/csp/file_CSP_evalscript_main.js diff --git a/content/base/test/file_CSP_evalscript_main_allowed.js b/content/base/test/csp/file_CSP_evalscript_main_allowed.js similarity index 100% rename from content/base/test/file_CSP_evalscript_main_allowed.js rename to content/base/test/csp/file_CSP_evalscript_main_allowed.js diff --git a/content/base/test/file_CSP_evalscript_main_allowed_getCRMFRequest.js b/content/base/test/csp/file_CSP_evalscript_main_allowed_getCRMFRequest.js similarity index 100% rename from content/base/test/file_CSP_evalscript_main_allowed_getCRMFRequest.js rename to content/base/test/csp/file_CSP_evalscript_main_allowed_getCRMFRequest.js diff --git a/content/base/test/file_CSP_evalscript_main_getCRMFRequest.html b/content/base/test/csp/file_CSP_evalscript_main_getCRMFRequest.html similarity index 100% rename from content/base/test/file_CSP_evalscript_main_getCRMFRequest.html rename to content/base/test/csp/file_CSP_evalscript_main_getCRMFRequest.html diff --git a/content/base/test/file_CSP_evalscript_main_getCRMFRequest.html^headers^ b/content/base/test/csp/file_CSP_evalscript_main_getCRMFRequest.html^headers^ similarity index 100% rename from content/base/test/file_CSP_evalscript_main_getCRMFRequest.html^headers^ rename to content/base/test/csp/file_CSP_evalscript_main_getCRMFRequest.html^headers^ diff --git a/content/base/test/file_CSP_evalscript_main_getCRMFRequest.js b/content/base/test/csp/file_CSP_evalscript_main_getCRMFRequest.js similarity index 100% rename from content/base/test/file_CSP_evalscript_main_getCRMFRequest.js rename to content/base/test/csp/file_CSP_evalscript_main_getCRMFRequest.js diff --git a/content/base/test/file_CSP_evalscript_main_spec_compliant.html b/content/base/test/csp/file_CSP_evalscript_main_spec_compliant.html similarity index 100% rename from content/base/test/file_CSP_evalscript_main_spec_compliant.html rename to content/base/test/csp/file_CSP_evalscript_main_spec_compliant.html diff --git a/content/base/test/file_CSP_evalscript_main_spec_compliant.html^headers^ b/content/base/test/csp/file_CSP_evalscript_main_spec_compliant.html^headers^ similarity index 100% rename from content/base/test/file_CSP_evalscript_main_spec_compliant.html^headers^ rename to content/base/test/csp/file_CSP_evalscript_main_spec_compliant.html^headers^ diff --git a/content/base/test/file_CSP_evalscript_main_spec_compliant_allowed.html b/content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed.html similarity index 100% rename from content/base/test/file_CSP_evalscript_main_spec_compliant_allowed.html rename to content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed.html diff --git a/content/base/test/file_CSP_evalscript_main_spec_compliant_allowed.html^headers^ b/content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed.html^headers^ similarity index 100% rename from content/base/test/file_CSP_evalscript_main_spec_compliant_allowed.html^headers^ rename to content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed.html^headers^ diff --git a/content/base/test/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html b/content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html similarity index 100% rename from content/base/test/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html rename to content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html diff --git a/content/base/test/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html^headers^ b/content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html^headers^ similarity index 100% rename from content/base/test/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html^headers^ rename to content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html^headers^ diff --git a/content/base/test/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html b/content/base/test/csp/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html similarity index 100% rename from content/base/test/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html rename to content/base/test/csp/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html diff --git a/content/base/test/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html^headers^ b/content/base/test/csp/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html^headers^ similarity index 100% rename from content/base/test/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html^headers^ rename to content/base/test/csp/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html^headers^ diff --git a/content/base/test/file_CSP_evalscript_no_CSP_at_all.html b/content/base/test/csp/file_CSP_evalscript_no_CSP_at_all.html similarity index 100% rename from content/base/test/file_CSP_evalscript_no_CSP_at_all.html rename to content/base/test/csp/file_CSP_evalscript_no_CSP_at_all.html diff --git a/content/base/test/file_CSP_evalscript_no_CSP_at_all.html^headers^ b/content/base/test/csp/file_CSP_evalscript_no_CSP_at_all.html^headers^ similarity index 100% rename from content/base/test/file_CSP_evalscript_no_CSP_at_all.html^headers^ rename to content/base/test/csp/file_CSP_evalscript_no_CSP_at_all.html^headers^ diff --git a/content/base/test/file_CSP_evalscript_no_CSP_at_all.js b/content/base/test/csp/file_CSP_evalscript_no_CSP_at_all.js similarity index 100% rename from content/base/test/file_CSP_evalscript_no_CSP_at_all.js rename to content/base/test/csp/file_CSP_evalscript_no_CSP_at_all.js diff --git a/content/base/test/file_CSP_frameancestors.sjs b/content/base/test/csp/file_CSP_frameancestors.sjs similarity index 100% rename from content/base/test/file_CSP_frameancestors.sjs rename to content/base/test/csp/file_CSP_frameancestors.sjs diff --git a/content/base/test/file_CSP_frameancestors_main.html b/content/base/test/csp/file_CSP_frameancestors_main.html similarity index 100% rename from content/base/test/file_CSP_frameancestors_main.html rename to content/base/test/csp/file_CSP_frameancestors_main.html diff --git a/content/base/test/file_CSP_frameancestors_main.js b/content/base/test/csp/file_CSP_frameancestors_main.js similarity index 92% rename from content/base/test/file_CSP_frameancestors_main.js rename to content/base/test/csp/file_CSP_frameancestors_main.js index 7c5ae45ecea..0ca2828265e 100644 --- a/content/base/test/file_CSP_frameancestors_main.js +++ b/content/base/test/csp/file_CSP_frameancestors_main.js @@ -4,9 +4,9 @@ function setupFrames() { var $ = function(v) { return document.getElementById(v); } var base = { - self: '/tests/content/base/test/file_CSP_frameancestors.sjs', - a: 'http://mochi.test:8888/tests/content/base/test/file_CSP_frameancestors.sjs', - b: 'http://example.com/tests/content/base/test/file_CSP_frameancestors.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' }; diff --git a/content/base/test/file_CSP_frameancestors_main_spec_compliant.html b/content/base/test/csp/file_CSP_frameancestors_main_spec_compliant.html similarity index 100% rename from content/base/test/file_CSP_frameancestors_main_spec_compliant.html rename to content/base/test/csp/file_CSP_frameancestors_main_spec_compliant.html diff --git a/content/base/test/file_CSP_frameancestors_main_spec_compliant.js b/content/base/test/csp/file_CSP_frameancestors_main_spec_compliant.js similarity index 92% rename from content/base/test/file_CSP_frameancestors_main_spec_compliant.js rename to content/base/test/csp/file_CSP_frameancestors_main_spec_compliant.js index 7a30840a841..710f0cf38fa 100644 --- a/content/base/test/file_CSP_frameancestors_main_spec_compliant.js +++ b/content/base/test/csp/file_CSP_frameancestors_main_spec_compliant.js @@ -4,9 +4,9 @@ function setupFrames() { var $ = function(v) { return document.getElementById(v); } var base = { - self: '/tests/content/base/test/file_CSP_frameancestors_spec_compliant.sjs', - a: 'http://mochi.test:8888/tests/content/base/test/file_CSP_frameancestors_spec_compliant.sjs', - b: 'http://example.com/tests/content/base/test/file_CSP_frameancestors_spec_compliant.sjs' + 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' }; var host = { a: 'http://mochi.test:8888', b: 'http://example.com:80' }; diff --git a/content/base/test/file_CSP_frameancestors_spec_compliant.sjs b/content/base/test/csp/file_CSP_frameancestors_spec_compliant.sjs similarity index 100% rename from content/base/test/file_CSP_frameancestors_spec_compliant.sjs rename to content/base/test/csp/file_CSP_frameancestors_spec_compliant.sjs diff --git a/content/base/test/file_CSP_inlinescript_main.html b/content/base/test/csp/file_CSP_inlinescript_main.html similarity index 100% rename from content/base/test/file_CSP_inlinescript_main.html rename to content/base/test/csp/file_CSP_inlinescript_main.html diff --git a/content/base/test/file_CSP_inlinescript_main.html^headers^ b/content/base/test/csp/file_CSP_inlinescript_main.html^headers^ similarity index 100% rename from content/base/test/file_CSP_inlinescript_main.html^headers^ rename to content/base/test/csp/file_CSP_inlinescript_main.html^headers^ diff --git a/content/base/test/file_CSP_inlinescript_main_spec_compliant.html b/content/base/test/csp/file_CSP_inlinescript_main_spec_compliant.html similarity index 100% rename from content/base/test/file_CSP_inlinescript_main_spec_compliant.html rename to content/base/test/csp/file_CSP_inlinescript_main_spec_compliant.html diff --git a/content/base/test/file_CSP_inlinescript_main_spec_compliant.html^headers^ b/content/base/test/csp/file_CSP_inlinescript_main_spec_compliant.html^headers^ similarity index 100% rename from content/base/test/file_CSP_inlinescript_main_spec_compliant.html^headers^ rename to content/base/test/csp/file_CSP_inlinescript_main_spec_compliant.html^headers^ diff --git a/content/base/test/file_CSP_inlinescript_main_spec_compliant_allowed.html b/content/base/test/csp/file_CSP_inlinescript_main_spec_compliant_allowed.html similarity index 100% rename from content/base/test/file_CSP_inlinescript_main_spec_compliant_allowed.html rename to content/base/test/csp/file_CSP_inlinescript_main_spec_compliant_allowed.html diff --git a/content/base/test/file_CSP_inlinescript_main_spec_compliant_allowed.html^headers^ b/content/base/test/csp/file_CSP_inlinescript_main_spec_compliant_allowed.html^headers^ similarity index 100% rename from content/base/test/file_CSP_inlinescript_main_spec_compliant_allowed.html^headers^ rename to content/base/test/csp/file_CSP_inlinescript_main_spec_compliant_allowed.html^headers^ diff --git a/content/base/test/file_CSP_inlinestyle_main.html b/content/base/test/csp/file_CSP_inlinestyle_main.html similarity index 100% rename from content/base/test/file_CSP_inlinestyle_main.html rename to content/base/test/csp/file_CSP_inlinestyle_main.html diff --git a/content/base/test/file_CSP_inlinestyle_main.html^headers^ b/content/base/test/csp/file_CSP_inlinestyle_main.html^headers^ similarity index 100% rename from content/base/test/file_CSP_inlinestyle_main.html^headers^ rename to content/base/test/csp/file_CSP_inlinestyle_main.html^headers^ diff --git a/content/base/test/file_CSP_inlinestyle_main_spec_compliant.html b/content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant.html similarity index 100% rename from content/base/test/file_CSP_inlinestyle_main_spec_compliant.html rename to content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant.html diff --git a/content/base/test/file_CSP_inlinestyle_main_spec_compliant.html^headers^ b/content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant.html^headers^ similarity index 100% rename from content/base/test/file_CSP_inlinestyle_main_spec_compliant.html^headers^ rename to content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant.html^headers^ diff --git a/content/base/test/file_CSP_inlinestyle_main_spec_compliant_allowed.html b/content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant_allowed.html similarity index 100% rename from content/base/test/file_CSP_inlinestyle_main_spec_compliant_allowed.html rename to content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant_allowed.html diff --git a/content/base/test/file_CSP_inlinestyle_main_spec_compliant_allowed.html^headers^ b/content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant_allowed.html^headers^ similarity index 100% rename from content/base/test/file_CSP_inlinestyle_main_spec_compliant_allowed.html^headers^ rename to content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant_allowed.html^headers^ diff --git a/content/base/test/file_CSP_main.html b/content/base/test/csp/file_CSP_main.html similarity index 66% rename from content/base/test/file_CSP_main.html rename to content/base/test/csp/file_CSP_main.html index e117b1366df..e78d0d8d8d0 100644 --- a/content/base/test/file_CSP_main.html +++ b/content/base/test/csp/file_CSP_main.html @@ -1,7 +1,7 @@ + href='http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=style_bad&type=text/css' /> @@ -13,13 +13,13 @@ - - - - + + + + - - + + diff --git a/content/base/test/file_CSP_main.html^headers^ b/content/base/test/csp/file_CSP_main.html^headers^ similarity index 100% rename from content/base/test/file_CSP_main.html^headers^ rename to content/base/test/csp/file_CSP_main.html^headers^ diff --git a/content/base/test/file_CSP_main.js b/content/base/test/csp/file_CSP_main.js similarity index 72% rename from content/base/test/file_CSP_main.js rename to content/base/test/csp/file_CSP_main.js index 27dfcc914ab..96645d6c5b7 100644 --- a/content/base/test/file_CSP_main.js +++ b/content/base/test/csp/file_CSP_main.js @@ -3,14 +3,14 @@ try { var xhr_good = new XMLHttpRequest(); - var xhr_good_uri ="http://mochi.test:8888/tests/content/base/test/file_CSP.sjs?testid=xhr_good"; + var xhr_good_uri ="http://mochi.test:8888/tests/content/base/test/csp/file_CSP.sjs?testid=xhr_good"; xhr_good.open("GET", xhr_good_uri, true); xhr_good.send(null); } catch(e) {} try { var xhr_bad = new XMLHttpRequest(); - var xhr_bad_uri ="http://example.com/tests/content/base/test/file_CSP.sjs?testid=xhr_bad"; + var xhr_bad_uri ="http://example.com/tests/content/base/test/csp/file_CSP.sjs?testid=xhr_bad"; xhr_bad.open("GET", xhr_bad_uri, true); xhr_bad.send(null); } catch(e) {} diff --git a/content/base/test/file_CSP_main_spec_compliant.html b/content/base/test/csp/file_CSP_main_spec_compliant.html similarity index 63% rename from content/base/test/file_CSP_main_spec_compliant.html rename to content/base/test/csp/file_CSP_main_spec_compliant.html index 0cdd269ca86..b672baa5915 100644 --- a/content/base/test/file_CSP_main_spec_compliant.html +++ b/content/base/test/csp/file_CSP_main_spec_compliant.html @@ -1,7 +1,7 @@ + href='http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=style_spec_compliant_bad&type=text/css' /> @@ -14,7 +14,7 @@ } @font-face { font-family: "arbitrary_bad"; - src: url('http://example.org/tests/content/base/test/file_CSP.sjs?testid=font_spec_compliant_bad&type=application/octet-stream'); + src: url('http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=font_spec_compliant_bad&type=application/octet-stream'); } .div_arbitrary_good { font-family: "arbitrary_good"; } @@ -23,13 +23,13 @@ - - - - + + + + - - + + diff --git a/content/base/test/file_CSP_main_spec_compliant.html^headers^ b/content/base/test/csp/file_CSP_main_spec_compliant.html^headers^ similarity index 100% rename from content/base/test/file_CSP_main_spec_compliant.html^headers^ rename to content/base/test/csp/file_CSP_main_spec_compliant.html^headers^ diff --git a/content/base/test/file_CSP_main_spec_compliant.js b/content/base/test/csp/file_CSP_main_spec_compliant.js similarity index 68% rename from content/base/test/file_CSP_main_spec_compliant.js rename to content/base/test/csp/file_CSP_main_spec_compliant.js index 9f8a5a8fcbb..b9058584be9 100644 --- a/content/base/test/file_CSP_main_spec_compliant.js +++ b/content/base/test/csp/file_CSP_main_spec_compliant.js @@ -3,14 +3,14 @@ try { var xhr_good = new XMLHttpRequest(); - var xhr_good_uri ="http://mochi.test:8888/tests/content/base/test/file_CSP.sjs?testid=xhr_spec_compliant_good"; + var xhr_good_uri ="http://mochi.test:8888/tests/content/base/test/csp/file_CSP.sjs?testid=xhr_spec_compliant_good"; xhr_good.open("GET", xhr_good_uri, true); xhr_good.send(null); } catch(e) {} try { var xhr_bad = new XMLHttpRequest(); - var xhr_bad_uri ="http://example.com/tests/content/base/test/file_CSP.sjs?testid=xhr_spec_compliant_bad"; + var xhr_bad_uri ="http://example.com/tests/content/base/test/csp/file_CSP.sjs?testid=xhr_spec_compliant_bad"; xhr_bad.open("GET", xhr_bad_uri, true); xhr_bad.send(null); } catch(e) {} diff --git a/content/base/test/file_bothCSPheaders.html b/content/base/test/csp/file_bothCSPheaders.html similarity index 100% rename from content/base/test/file_bothCSPheaders.html rename to content/base/test/csp/file_bothCSPheaders.html diff --git a/content/base/test/file_bothCSPheaders.html^headers^ b/content/base/test/csp/file_bothCSPheaders.html^headers^ similarity index 100% rename from content/base/test/file_bothCSPheaders.html^headers^ rename to content/base/test/csp/file_bothCSPheaders.html^headers^ diff --git a/content/base/test/file_csp_bug768029.html b/content/base/test/csp/file_csp_bug768029.html similarity index 60% rename from content/base/test/file_csp_bug768029.html rename to content/base/test/csp/file_csp_bug768029.html index 7d86e0cf955..d7f2730e6c7 100644 --- a/content/base/test/file_csp_bug768029.html +++ b/content/base/test/csp/file_csp_bug768029.html @@ -10,14 +10,14 @@ + href="http://example.com/tests/content/base/test/csp/file_csp_bug768029.sjs?type=style&origin=cross_origin" /> - + - + Test for CSP applied to (simulated) app. diff --git a/content/base/test/file_csp_bug768029.sjs b/content/base/test/csp/file_csp_bug768029.sjs similarity index 100% rename from content/base/test/file_csp_bug768029.sjs rename to content/base/test/csp/file_csp_bug768029.sjs diff --git a/content/base/test/file_csp_bug773891.html b/content/base/test/csp/file_csp_bug773891.html similarity index 60% rename from content/base/test/file_csp_bug773891.html rename to content/base/test/csp/file_csp_bug773891.html index 90b124f8c19..563e5f1699c 100644 --- a/content/base/test/file_csp_bug773891.html +++ b/content/base/test/csp/file_csp_bug773891.html @@ -10,14 +10,14 @@ + href="http://example.com/tests/content/base/test/csp/file_csp_bug773891.sjs?type=style&origin=cross_origin" /> - + - + Test for CSP applied to (simulated) app. diff --git a/content/base/test/file_csp_bug773891.sjs b/content/base/test/csp/file_csp_bug773891.sjs similarity index 100% rename from content/base/test/file_csp_bug773891.sjs rename to content/base/test/csp/file_csp_bug773891.sjs diff --git a/content/base/test/file_csp_redirects_main.html b/content/base/test/csp/file_csp_redirects_main.html similarity index 96% rename from content/base/test/file_csp_redirects_main.html rename to content/base/test/csp/file_csp_redirects_main.html index 3d1e66c6597..102f7469282 100644 --- a/content/base/test/file_csp_redirects_main.html +++ b/content/base/test/csp/file_csp_redirects_main.html @@ -9,7 +9,7 @@