Issue 4327 - Prevent generic document blocking

test/abp2blocklist.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 53 matching lines @@
     testRules(test, ["~test.com##whatever"], []);
 
     test.done();
   },
 
   testRequestFilters: function(test)
   {
     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,
                  "resource-type": ["image", "style-sheet", "script", "font",
                                    "media", "raw", "document"]},
        action: {type: "block"}},
       {trigger: {"url-filter": "http://example\\.com/foo",
                  "resource-type": ["image", "style-sheet", "script", "font",
                                    "media", "raw", "document"]},
        action: {type: "block"}}
@@ skipping 88 matching lines @@
 
     test.done();
   },
 
   testRequestTypeMapping: function(test)
   {
     testRules(
       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"],
        ["font"],
        ["media"],
        ["popup"],
        ["media"],
        ["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"])
     );
 
     test.done();
   },
 
   testUnsupportedfilters: function(test)
   {
     // These types of filters are currently completely unsupported.
@@ skipping 18 matching lines @@
   testUnicode: function(test)
   {
     testRules(test, ["$domain=🐈.cat"], ["xn--zn8h.cat", "www.xn--zn8h.cat"],
               rules => rules[0]["trigger"]["if-domain"]);
     testRules(test, ["🐈$domain=🐈.cat"], []);
     testRules(test, ["###🐈"], []);
 
     test.done();
   }
 };