⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 196879 in webkit


Ignore:
Timestamp:
Feb 21, 2016, 3:02:37 PM (11 years ago)
Author:
dbates@webkit.org
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.
Location:
trunk/LayoutTests
Files:
2 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r196878 r196879  
     12016-02-21  Daniel Bates  <dabates@apple.com>
     2
     3        Another attempt to fix the Content Extension test failures following <https://trac.webkit.org/changeset/196875>
     4        (https://bugs.webkit.org/show_bug.cgi?id=154307)
     5
     6        Rename Content Extension JSON files so that they are associated with tests http/tests/contentextensions/block-cookies-in-csp-report.php
     7        http/tests/contentextensions/block-csp-report.php and http/tests/contentextensions/hide-on-csp-report.php. These
     8        files were formerly named block-cookies-in-csp-report.html, block-csp-report.html, and hide-on-csp-report.html,
     9        respectively, prior to <https://trac.webkit.org/changeset/196878>. Also, update expected result for test block-csp-report.html
     10        following <https://trac.webkit.org/changeset/196878>.
     11
     12        * http/tests/contentextensions/block-cookies-in-csp-report.php.json: Renamed from LayoutTests/http/tests/contentextensions/block-cookies-in-csp-report.html.json.
     13        * http/tests/contentextensions/block-csp-report-expected.txt:
     14        * http/tests/contentextensions/block-csp-report.php.json: Renamed from LayoutTests/http/tests/contentextensions/block-csp-report.html.json.
     15        * http/tests/contentextensions/hide-on-csp-report.php.json: Renamed from LayoutTests/http/tests/contentextensions/hide-on-csp-report.html.json.
     16
    1172016-02-21  Daniel Bates  <dabates@apple.com>
    218

  • trunk/LayoutTests/http/tests/contentextensions/block-csp-report-expected.txt

    r191167 r196879  
    11CONSOLE MESSAGE: Refused to load the image 'http://localhost/foo.png' because it violates the following Content Security Policy directive: "img-src 'self'".
    22
    3 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
     3CONSOLE 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
    44This test creates a CSP violation report, but the report URL matches a 'block' rule. 
    55
Note: See TracChangeset for help on using the changeset viewer.