Attachment 416676 Details for Bug 220094 – Patch

[patch] Patch

for-review.txt (text/plain), 10.12 KB, created by Beth Dakin on 2020-12-22 11:11:07 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Beth Dakin

Created: 2020-12-22 11:11:07 PST

Size: 10.12 KB

patch

obsolete

>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 271058)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,23 @@
>+2020-12-22 Beth Dakin <bdakin@apple.com>
>+
>+ Remove non-inclusive language from tests in http/tests/contentextensions/
>+ https://bugs.webkit.org/show_bug.cgi?id=220094
>+
>+ Reviewed by NOBODY (OOPS!).
>+
>+ * http/tests/contentextensions/allowlist-expected.txt: Copied from http/tests/contentextensions/whitelist-expected.txt.
>+ * http/tests/contentextensions/allowlist.html: Copied from http/tests/contentextensions/whitelist.html.
>+ * http/tests/contentextensions/allowlist.html.json: Copied from http/tests/contentextensions/whitelist.html.json.
>+ * http/tests/contentextensions/basic-filter.html:
>+ * http/tests/contentextensions/basic-filter.html.json:
>+ * http/tests/contentextensions/crash-xhr.html.json:
>+ * http/tests/contentextensions/filters-with-quantifiers-combined-expected.txt:
>+ * http/tests/contentextensions/filters-with-quantifiers-combined.html:
>+ * http/tests/contentextensions/filters-with-quantifiers-combined.html.json:
>+ * http/tests/contentextensions/whitelist-expected.txt: Removed.
>+ * http/tests/contentextensions/whitelist.html: Removed.
>+ * http/tests/contentextensions/whitelist.html.json: Removed.
>+
> 2020-12-22 Philippe Normand <pnormand@igalia.com>
> 
> REGRESSION(r270612) [GStreamer][MSE] Some play/seek related failures
>Index: LayoutTests/http/tests/contentextensions/allowlist-expected.txt
>===================================================================
>--- LayoutTests/http/tests/contentextensions/allowlist-expected.txt	(revision 271054)	(from LayoutTests/http/tests/contentextensions/whitelist-expected.txt:271054)
>+++ LayoutTests/http/tests/contentextensions/allowlist-expected.txt	(working copy)
>@@ -0,0 +1,7 @@
>+layer at (0,0) size 800x600
>+ RenderView at (0,0) size 800x600
>+layer at (0,0) size 800x600
>+ RenderBlock {HTML} at (0,0) size 800x600
>+ RenderBody {BODY} at (8,8) size 784x584
>+ RenderText {#text} at (0,0) size 192x18
>+ text run at (0,0) width 192: "This should load successfully."
>Index: LayoutTests/http/tests/contentextensions/allowlist.html
>===================================================================
>--- LayoutTests/http/tests/contentextensions/allowlist.html	(revision 271054)	(from LayoutTests/http/tests/contentextensions/whitelist.html:271054)
>+++ LayoutTests/http/tests/contentextensions/allowlist.html	(working copy)
>@@ -0,0 +1 @@
>+This should load successfully.
>Index: LayoutTests/http/tests/contentextensions/allowlist.html.json
>===================================================================
>--- LayoutTests/http/tests/contentextensions/allowlist.html.json	(revision 271054)	(from LayoutTests/http/tests/contentextensions/whitelist.html.json:271054)
>+++ LayoutTests/http/tests/contentextensions/allowlist.html.json	(working copy)
>@@ -0,0 +1,18 @@
>+[
>+ {
>+ "action": {
>+ "type": "block"
>+ },
>+ "trigger": {
>+ "url-filter": ".*"
>+ }
>+ },
>+ {
>+ "action": {
>+ "type": "ignore-previous-rules"
>+ },
>+ "trigger": {
>+ "url-filter": "whitelist"
>+ }
>+ }
>+]
>Index: LayoutTests/http/tests/contentextensions/allowlist.html.json
>===================================================================
>--- LayoutTests/http/tests/contentextensions/allowlist.html.json	(revision 271054)
>+++ LayoutTests/http/tests/contentextensions/allowlist.html.json	(working copy)
>@@ -12,7 +12,7 @@
> "type": "ignore-previous-rules"
> },
> "trigger": {
>- "url-filter": "whitelist"
>+ "url-filter": "allowlist"
> }
> }
> ]
>Index: LayoutTests/http/tests/contentextensions/basic-filter.html
>===================================================================
>--- LayoutTests/http/tests/contentextensions/basic-filter.html	(revision 271054)
>+++ LayoutTests/http/tests/contentextensions/basic-filter.html	(working copy)
>@@ -1,8 +1,8 @@
> <body>
> The images below should load. 
> <img src="http://127.0.0.1:8000/resources/square100.png?not_local_host"> 
>-<img src="http://localhost:8000/resources/square100.png?whitelist"> 
>-<img src="http://127.0.0.1:8000/resources/square100.png?whitelist_before_localhost"> 
>+<img src="http://localhost:8000/resources/square100.png?allowlist"> 
>+<img src="http://127.0.0.1:8000/resources/square100.png?allowlist_before_localhost"> 
> The images below should be blocked. 
> <img src="http://localhost:8000/resources/square100.png"> 
> <img src="http://127.0.0.1:8000/resources/square100.png?localhost_not_at_end"> 
>Index: LayoutTests/http/tests/contentextensions/basic-filter.html.json
>===================================================================
>--- LayoutTests/http/tests/contentextensions/basic-filter.html.json	(revision 271054)
>+++ LayoutTests/http/tests/contentextensions/basic-filter.html.json	(working copy)
>@@ -12,7 +12,7 @@
> "type": "ignore-previous-rules"
> },
> "trigger": {
>- "url-filter": ".*whitelist"
>+ "url-filter": ".allowlist"
> }
> }
> ]
>Index: LayoutTests/http/tests/contentextensions/crash-xhr.html.json
>===================================================================
>--- LayoutTests/http/tests/contentextensions/crash-xhr.html.json	(revision 271054)
>+++ LayoutTests/http/tests/contentextensions/crash-xhr.html.json	(working copy)
>@@ -12,7 +12,7 @@
> "type": "ignore-previous-rules"
> },
> "trigger": {
>- "url-filter": ".*whitelist"
>+ "url-filter": ".*allowlist"
> }
> }
> ]
>Index: LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined-expected.txt
>===================================================================
>--- LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined-expected.txt	(revision 271054)
>+++ LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined-expected.txt	(working copy)
>@@ -9,7 +9,7 @@ CONSOLE MESSAGE: Content blocker prevent
> CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?wxyabc
> CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?wxydefabc
> CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?acbwxy
>-CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?abcacbdefabcdjklwhitelistwxy
>+CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?abcacbdefabcdjklallowlistwxy
> layer at (0,0) size 785x952
> RenderView at (0,0) size 785x600
> layer at (0,0) size 785x952
>Index: LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined.html
>===================================================================
>--- LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined.html	(revision 271054)
>+++ LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined.html	(working copy)
>@@ -1,7 +1,7 @@
> <body>
> The images below should load. 
> <img src="http://127.0.0.1:8000/resources/square100.png"> 
>-<img src="http://127.0.0.1:8000/resources/square100.png?abcabcdwhitelist"> 
>+<img src="http://127.0.0.1:8000/resources/square100.png?abcabcdallowlist"> 
> <img src="http://127.0.0.1:8000/resources/square100.png?abccccccc"> 
> <img src="http://127.0.0.1:8000/resources/square100.png?defffffff"> 
> <img src="http://127.0.0.1:8000/resources/square100.png?jkljkljkl"> 
>@@ -22,5 +22,5 @@ The images below should be blocked. 
> <img src="http://localhost:8000/resources/square100.png?wxyabc"> 
> <img src="http://localhost:8000/resources/square100.png?wxydefabc"> 
> <img src="http://localhost:8000/resources/square100.png?acbwxy"> 
>-<img src="http://localhost:8000/resources/square100.png?abcacbdefabcdjklwhitelistwxy"> 
>+<img src="http://localhost:8000/resources/square100.png?abcacbdefabcdjklallowlistwxy"> 
> </body>
>Index: LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined.html.json
>===================================================================
>--- LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined.html.json	(revision 271054)
>+++ LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined.html.json	(working copy)
>@@ -44,7 +44,7 @@
> "type": "ignore-previous-rules"
> },
> "trigger": {
>- "url-filter": "abcd.*whitelist"
>+ "url-filter": "abcd.*allowlist"
> }
> },
> {
>Index: LayoutTests/http/tests/contentextensions/whitelist-expected.txt
>===================================================================
>--- LayoutTests/http/tests/contentextensions/whitelist-expected.txt	(revision 271054)
>+++ LayoutTests/http/tests/contentextensions/whitelist-expected.txt	(nonexistent)
>@@ -1,7 +0,0 @@
>-layer at (0,0) size 800x600
>- RenderView at (0,0) size 800x600
>-layer at (0,0) size 800x600
>- RenderBlock {HTML} at (0,0) size 800x600
>- RenderBody {BODY} at (8,8) size 784x584
>- RenderText {#text} at (0,0) size 192x18
>- text run at (0,0) width 192: "This should load successfully."
>Index: LayoutTests/http/tests/contentextensions/whitelist.html
>===================================================================
>--- LayoutTests/http/tests/contentextensions/whitelist.html	(revision 271054)
>+++ LayoutTests/http/tests/contentextensions/whitelist.html	(nonexistent)
>@@ -1 +0,0 @@
>-This should load successfully.

Actions: View | Formatted Diff | Diff

Attachments on bug 220094: 416676