Title: [271063] trunk/LayoutTests
Revision
271063
Author
[email protected]
Date
2020-12-22 13:18:52 -0800 (Tue, 22 Dec 2020)

Log Message

Remove non-inclusive language from tests in http/tests/contentextensions/
https://bugs.webkit.org/show_bug.cgi?id=220094

Reviewed by Alex Christensen.

* 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.

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (271062 => 271063)


--- trunk/LayoutTests/ChangeLog	2020-12-22 20:40:46 UTC (rev 271062)
+++ trunk/LayoutTests/ChangeLog	2020-12-22 21:18:52 UTC (rev 271063)
@@ -1,3 +1,23 @@
+2020-12-22  Beth Dakin  <[email protected]>
+
+        Remove non-inclusive language from tests in http/tests/contentextensions/
+        https://bugs.webkit.org/show_bug.cgi?id=220094
+
+        Reviewed by Alex Christensen.
+
+        * 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  Rob Buis  <[email protected]>
 
         Support aspect-ratio on positioned elements

Copied: trunk/LayoutTests/http/tests/contentextensions/allowlist-expected.txt (from rev 271062, trunk/LayoutTests/http/tests/contentextensions/whitelist-expected.txt) (0 => 271063)


--- trunk/LayoutTests/http/tests/contentextensions/allowlist-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/allowlist-expected.txt	2020-12-22 21:18:52 UTC (rev 271063)
@@ -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."

Copied: trunk/LayoutTests/http/tests/contentextensions/allowlist.html (from rev 271062, trunk/LayoutTests/http/tests/contentextensions/whitelist.html) (0 => 271063)


--- trunk/LayoutTests/http/tests/contentextensions/allowlist.html	                        (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/allowlist.html	2020-12-22 21:18:52 UTC (rev 271063)
@@ -0,0 +1 @@
+This should load successfully.

Copied: trunk/LayoutTests/http/tests/contentextensions/allowlist.html.json (from rev 271062, trunk/LayoutTests/http/tests/contentextensions/basic-filter.html.json) (0 => 271063)


--- trunk/LayoutTests/http/tests/contentextensions/allowlist.html.json	                        (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/allowlist.html.json	2020-12-22 21:18:52 UTC (rev 271063)
@@ -0,0 +1,18 @@
+[
+    {
+        "action": {
+            "type": "block"
+        },
+        "trigger": {
+            "url-filter": ".*"
+        }
+    },
+    {
+        "action": {
+            "type": "ignore-previous-rules"
+        },
+        "trigger": {
+            "url-filter": "allowlist"
+        }
+    }
+]

Modified: trunk/LayoutTests/http/tests/contentextensions/basic-filter.html (271062 => 271063)


--- trunk/LayoutTests/http/tests/contentextensions/basic-filter.html	2020-12-22 20:40:46 UTC (rev 271062)
+++ trunk/LayoutTests/http/tests/contentextensions/basic-filter.html	2020-12-22 21:18:52 UTC (rev 271063)
@@ -1,8 +1,8 @@
 <body>
 The images below should load.<br>
 <img src=""
-<img src=""
-<img src=""
+<img src=""
+<img src=""
 The images below should be blocked.<br>
 <img src=""
 <img src=""

Modified: trunk/LayoutTests/http/tests/contentextensions/basic-filter.html.json (271062 => 271063)


--- trunk/LayoutTests/http/tests/contentextensions/basic-filter.html.json	2020-12-22 20:40:46 UTC (rev 271062)
+++ trunk/LayoutTests/http/tests/contentextensions/basic-filter.html.json	2020-12-22 21:18:52 UTC (rev 271063)
@@ -12,7 +12,7 @@
             "type": "ignore-previous-rules"
         },
         "trigger": {
-            "url-filter": ".*whitelist"
+            "url-filter": ".allowlist"
         }
     }
 ]

Modified: trunk/LayoutTests/http/tests/contentextensions/crash-xhr.html.json (271062 => 271063)


--- trunk/LayoutTests/http/tests/contentextensions/crash-xhr.html.json	2020-12-22 20:40:46 UTC (rev 271062)
+++ trunk/LayoutTests/http/tests/contentextensions/crash-xhr.html.json	2020-12-22 21:18:52 UTC (rev 271063)
@@ -12,7 +12,7 @@
             "type": "ignore-previous-rules"
         },
         "trigger": {
-            "url-filter": ".*whitelist"
+            "url-filter": ".*allowlist"
         }
     }
 ]

Modified: trunk/LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined-expected.txt (271062 => 271063)


--- trunk/LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined-expected.txt	2020-12-22 20:40:46 UTC (rev 271062)
+++ trunk/LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined-expected.txt	2020-12-22 21:18:52 UTC (rev 271063)
@@ -9,7 +9,7 @@
 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

Modified: trunk/LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined.html (271062 => 271063)


--- trunk/LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined.html	2020-12-22 20:40:46 UTC (rev 271062)
+++ trunk/LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined.html	2020-12-22 21:18:52 UTC (rev 271063)
@@ -1,7 +1,7 @@
 <body>
 The images below should load.<br>
 <img src=""
-<img src=""
+<img src=""
 <img src=""
 <img src=""
 <img src=""
@@ -22,5 +22,5 @@
 <img src=""
 <img src=""
 <img src=""
-<img src=""
+<img src=""
 </body>

Modified: trunk/LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined.html.json (271062 => 271063)


--- trunk/LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined.html.json	2020-12-22 20:40:46 UTC (rev 271062)
+++ trunk/LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined.html.json	2020-12-22 21:18:52 UTC (rev 271063)
@@ -44,7 +44,7 @@
             "type": "ignore-previous-rules"
         },
         "trigger": {
-            "url-filter": "abcd.*whitelist"
+            "url-filter": "abcd.*allowlist"
         }
     },
     {

Deleted: trunk/LayoutTests/http/tests/contentextensions/whitelist-expected.txt (271062 => 271063)


--- trunk/LayoutTests/http/tests/contentextensions/whitelist-expected.txt	2020-12-22 20:40:46 UTC (rev 271062)
+++ trunk/LayoutTests/http/tests/contentextensions/whitelist-expected.txt	2020-12-22 21:18:52 UTC (rev 271063)
@@ -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."

Deleted: trunk/LayoutTests/http/tests/contentextensions/whitelist.html (271062 => 271063)


--- trunk/LayoutTests/http/tests/contentextensions/whitelist.html	2020-12-22 20:40:46 UTC (rev 271062)
+++ trunk/LayoutTests/http/tests/contentextensions/whitelist.html	2020-12-22 21:18:52 UTC (rev 271063)
@@ -1 +0,0 @@
-This should load successfully.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to