Issue 4327 - Prevent generic document blocking

test/abp2blocklist.js

Index: test/abp2blocklist.js
diff --git a/test/abp2blocklist.js b/test/abp2blocklist.js
index a7929ac6bb2377eb8a2f6840264f68cd093ea548..30b0e792e522a624becc06f94639e10c10a18175 100644
--- a/test/abp2blocklist.js
+++ b/test/abp2blocklist.js
@@ -71,7 +71,7 @@ exports.generateRules = {
     testRules(test, ["/foo", "||test.com", "http://example.com/foo"], [
       {trigger: {"url-filter": "^https?://.*/foo",
                  "resource-type": ["image", "style-sheet", "script", "font",
-                                   "media", "raw", "document"]},
+                                   "media", "raw"]},
        action: {type: "block"}},
       {trigger: {"url-filter": "^https?://([^/]+\\.)?test\\.com",
                  "url-filter-is-case-sensitive": true,
@@ -178,9 +178,8 @@ exports.generateRules = {
       test,
       ["1", "2$image", "3$stylesheet", "4$script", "5$font", "6$media",
        "7$popup", "8$object", "9$object_subrequest", "10$xmlhttprequest",
-       "11$ping", "12$subdocument", "13$other", "14$IMAGE",
-       "15$script,PING,Popup", "16$~image"],
-      [["image", "style-sheet", "script", "font", "media", "raw", "document" ],
+       "11$ping", "12$other", "13$IMAGE", "14$script,PING,Popup", "15$~image"],
+      [["image", "style-sheet", "script", "font", "media", "raw"],
        ["image"],
        ["style-sheet"],
        ["script"],
@@ -191,10 +190,17 @@ exports.generateRules = {
        ["raw"],
        ["raw"],
        ["raw"],
-       ["document"],
        ["raw"],
        ["image"],
        ["script", "popup", "raw" ],
+       ["style-sheet", "script", "font", "media", "raw"]],
+      rules => rules.map(rule => rule.trigger["resource-type"])
+    );
+
+    testRules(
+      test,
+      ["foo$subdocument", "||foo.com$subdocument", "||foo.com$~image"],
+      [["document"],
        ["style-sheet", "script", "font", "media", "raw", "document"]],
       rules => rules.map(rule => rule.trigger["resource-type"])
     );