- Revision
- 196879
- Author
- [email protected]
- Date
- 2016-02-21 15:02:37 -0800 (Sun, 21 Feb 2016)
Log Message
Another attempt to fix the Content Extension test failures following <https://trac.webkit.org/changeset/196875>
(https://bugs.webkit.org/show_bug.cgi?id=154307)
Rename Content Extension JSON files so that they are associated with tests http/tests/contentextensions/block-cookies-in-csp-report.php
http/tests/contentextensions/block-csp-report.php and http/tests/contentextensions/hide-on-csp-report.php. These
files were formerly named block-cookies-in-csp-report.html, block-csp-report.html, and hide-on-csp-report.html,
respectively, prior to <https://trac.webkit.org/changeset/196878>. Also, update expected result for test block-csp-report.html
following <https://trac.webkit.org/changeset/196878>.
* http/tests/contentextensions/block-cookies-in-csp-report.php.json: Renamed from LayoutTests/http/tests/contentextensions/block-cookies-in-csp-report.html.json.
* http/tests/contentextensions/block-csp-report-expected.txt:
* http/tests/contentextensions/block-csp-report.php.json: Renamed from LayoutTests/http/tests/contentextensions/block-csp-report.html.json.
* http/tests/contentextensions/hide-on-csp-report.php.json: Renamed from LayoutTests/http/tests/contentextensions/hide-on-csp-report.html.json.
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (196878 => 196879)
--- trunk/LayoutTests/ChangeLog 2016-02-21 21:37:42 UTC (rev 196878)
+++ trunk/LayoutTests/ChangeLog 2016-02-21 23:02:37 UTC (rev 196879)
@@ -1,5 +1,21 @@
2016-02-21 Daniel Bates <[email protected]>
+ Another attempt to fix the Content Extension test failures following <https://trac.webkit.org/changeset/196875>
+ (https://bugs.webkit.org/show_bug.cgi?id=154307)
+
+ Rename Content Extension JSON files so that they are associated with tests http/tests/contentextensions/block-cookies-in-csp-report.php
+ http/tests/contentextensions/block-csp-report.php and http/tests/contentextensions/hide-on-csp-report.php. These
+ files were formerly named block-cookies-in-csp-report.html, block-csp-report.html, and hide-on-csp-report.html,
+ respectively, prior to <https://trac.webkit.org/changeset/196878>. Also, update expected result for test block-csp-report.html
+ following <https://trac.webkit.org/changeset/196878>.
+
+ * http/tests/contentextensions/block-cookies-in-csp-report.php.json: Renamed from LayoutTests/http/tests/contentextensions/block-cookies-in-csp-report.html.json.
+ * http/tests/contentextensions/block-csp-report-expected.txt:
+ * http/tests/contentextensions/block-csp-report.php.json: Renamed from LayoutTests/http/tests/contentextensions/block-csp-report.html.json.
+ * http/tests/contentextensions/hide-on-csp-report.php.json: Renamed from LayoutTests/http/tests/contentextensions/hide-on-csp-report.html.json.
+
+2016-02-21 Daniel Bates <[email protected]>
+
Attempt to fix the Content Extension test failures following <https://trac.webkit.org/changeset/196875>
(https://bugs.webkit.org/show_bug.cgi?id=154307)
Deleted: trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-csp-report.html.json (196878 => 196879)
--- trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-csp-report.html.json 2016-02-21 21:37:42 UTC (rev 196878)
+++ trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-csp-report.html.json 2016-02-21 23:02:37 UTC (rev 196879)
@@ -1,10 +0,0 @@
-[
- {
- "trigger": {
- "url-filter": "save-ping.php"
- },
- "action": {
- "type": "block-cookies"
- }
- }
-]
Copied: trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-csp-report.php.json (from rev 196878, trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-csp-report.html.json) (0 => 196879)
--- trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-csp-report.php.json (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-csp-report.php.json 2016-02-21 23:02:37 UTC (rev 196879)
@@ -0,0 +1,10 @@
+[
+ {
+ "trigger": {
+ "url-filter": "save-ping.php"
+ },
+ "action": {
+ "type": "block-cookies"
+ }
+ }
+]
Modified: trunk/LayoutTests/http/tests/contentextensions/block-csp-report-expected.txt (196878 => 196879)
--- trunk/LayoutTests/http/tests/contentextensions/block-csp-report-expected.txt 2016-02-21 21:37:42 UTC (rev 196878)
+++ trunk/LayoutTests/http/tests/contentextensions/block-csp-report-expected.txt 2016-02-21 23:02:37 UTC (rev 196879)
@@ -1,6 +1,6 @@
CONSOLE MESSAGE: Refused to load the image 'http://localhost/foo.png' because it violates the following Content Security Policy directive: "img-src 'self'".
-CONSOLE MESSAGE: line 34: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/block-csp-report.html from loading a resource from http://localhost:8000/contentextensions/resources/save-ping.php?test=contentextensions-block-csp-report
+CONSOLE MESSAGE: line 33: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/block-csp-report.php from loading a resource from http://localhost:8000/contentextensions/resources/save-ping.php?test=contentextensions-block-csp-report
This test creates a CSP violation report, but the report URL matches a 'block' rule.
--------
Deleted: trunk/LayoutTests/http/tests/contentextensions/block-csp-report.html.json (196878 => 196879)
--- trunk/LayoutTests/http/tests/contentextensions/block-csp-report.html.json 2016-02-21 21:37:42 UTC (rev 196878)
+++ trunk/LayoutTests/http/tests/contentextensions/block-csp-report.html.json 2016-02-21 23:02:37 UTC (rev 196879)
@@ -1,10 +0,0 @@
-[
- {
- "trigger": {
- "url-filter": "save-ping.php"
- },
- "action": {
- "type": "block"
- }
- }
-]
Copied: trunk/LayoutTests/http/tests/contentextensions/block-csp-report.php.json (from rev 196878, trunk/LayoutTests/http/tests/contentextensions/block-csp-report.html.json) (0 => 196879)
--- trunk/LayoutTests/http/tests/contentextensions/block-csp-report.php.json (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/block-csp-report.php.json 2016-02-21 23:02:37 UTC (rev 196879)
@@ -0,0 +1,10 @@
+[
+ {
+ "trigger": {
+ "url-filter": "save-ping.php"
+ },
+ "action": {
+ "type": "block"
+ }
+ }
+]
Deleted: trunk/LayoutTests/http/tests/contentextensions/hide-on-csp-report.html.json (196878 => 196879)
--- trunk/LayoutTests/http/tests/contentextensions/hide-on-csp-report.html.json 2016-02-21 21:37:42 UTC (rev 196878)
+++ trunk/LayoutTests/http/tests/contentextensions/hide-on-csp-report.html.json 2016-02-21 23:02:37 UTC (rev 196879)
@@ -1,11 +0,0 @@
-[
- {
- "trigger": {
- "url-filter": "save-ping.php"
- },
- "action": {
- "type": "css-display-none",
- "selector": ".foo"
- }
- }
-]
Copied: trunk/LayoutTests/http/tests/contentextensions/hide-on-csp-report.php.json (from rev 196878, trunk/LayoutTests/http/tests/contentextensions/hide-on-csp-report.html.json) (0 => 196879)
--- trunk/LayoutTests/http/tests/contentextensions/hide-on-csp-report.php.json (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/hide-on-csp-report.php.json 2016-02-21 23:02:37 UTC (rev 196879)
@@ -0,0 +1,11 @@
+[
+ {
+ "trigger": {
+ "url-filter": "save-ping.php"
+ },
+ "action": {
+ "type": "css-display-none",
+ "selector": ".foo"
+ }
+ }
+]
