<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[196879] trunk/LayoutTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196879">196879</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-21 15:02:37 -0800 (Sun, 21 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionsblockcspreportexpectedtxt">trunk/LayoutTests/http/tests/contentextensions/block-csp-report-expected.txt</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestscontentextensionsblockcookiesincspreportphpjson">trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-csp-report.php.json</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionsblockcspreportphpjson">trunk/LayoutTests/http/tests/contentextensions/block-csp-report.php.json</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionshideoncspreportphpjson">trunk/LayoutTests/http/tests/contentextensions/hide-on-csp-report.php.json</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestscontentextensionsblockcookiesincspreporthtmljson">trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-csp-report.html.json</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionsblockcspreporthtmljson">trunk/LayoutTests/http/tests/contentextensions/block-csp-report.html.json</a></li>
<li><a href="#trunkLayoutTestshttptestscontentextensionshideoncspreporthtmljson">trunk/LayoutTests/http/tests/contentextensions/hide-on-csp-report.html.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196878 => 196879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-21 21:37:42 UTC (rev 196878)
+++ trunk/LayoutTests/ChangeLog 2016-02-21 23:02:37 UTC (rev 196879)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-02-21 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><ins>+ 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 <dabates@apple.com>
+
</ins><span class="cx"> Attempt to fix the Content Extension test failures following <https://trac.webkit.org/changeset/196875>
</span><span class="cx"> (https://bugs.webkit.org/show_bug.cgi?id=154307)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsblockcookiesincspreporthtmljson"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-csp-report.html.json (196878 => 196879)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>-[
- {
- "trigger": {
- "url-filter": "save-ping.php"
- },
- "action": {
- "type": "block-cookies"
- }
- }
-]
</del></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsblockcookiesincspreportphpjsonfromrev196878trunkLayoutTestshttptestscontentextensionsblockcookiesincspreporthtmljson"></a>
<div class="copfile"><h4>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)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+[
+ {
+ "trigger": {
+ "url-filter": "save-ping.php"
+ },
+ "action": {
+ "type": "block-cookies"
+ }
+ }
+]
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsblockcspreportexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/contentextensions/block-csp-report-expected.txt (196878 => 196879)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> CONSOLE MESSAGE: Refused to load the image 'http://localhost/foo.png' because it violates the following Content Security Policy directive: "img-src 'self'".
</span><span class="cx">
</span><del>-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
</del><ins>+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
</ins><span class="cx"> This test creates a CSP violation report, but the report URL matches a 'block' rule.
</span><span class="cx">
</span><span class="cx"> --------
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsblockcspreporthtmljson"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/contentextensions/block-csp-report.html.json (196878 => 196879)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>-[
- {
- "trigger": {
- "url-filter": "save-ping.php"
- },
- "action": {
- "type": "block"
- }
- }
-]
</del></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionsblockcspreportphpjsonfromrev196878trunkLayoutTestshttptestscontentextensionsblockcspreporthtmljson"></a>
<div class="copfile"><h4>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)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+[
+ {
+ "trigger": {
+ "url-filter": "save-ping.php"
+ },
+ "action": {
+ "type": "block"
+ }
+ }
+]
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionshideoncspreporthtmljson"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/contentextensions/hide-on-csp-report.html.json (196878 => 196879)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>-[
- {
- "trigger": {
- "url-filter": "save-ping.php"
- },
- "action": {
- "type": "css-display-none",
- "selector": ".foo"
- }
- }
-]
</del></span></pre></div>
<a id="trunkLayoutTestshttptestscontentextensionshideoncspreportphpjsonfromrev196878trunkLayoutTestshttptestscontentextensionshideoncspreporthtmljson"></a>
<div class="copfile"><h4>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)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+[
+ {
+ "trigger": {
+ "url-filter": "save-ping.php"
+ },
+ "action": {
+ "type": "css-display-none",
+ "selector": ".foo"
+ }
+ }
+]
</ins></span></pre>
</div>
</div>
</body>
</html>