Issue 4326 - || should match subdomains too

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 55 matching lines @@
     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"]},
        action: {type: "block"}},
-      {trigger: {"url-filter": "^https?://test\\.com",
+      {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"}}
     ]);
 
+    testRules(test, ["||example.com"], [
+      {trigger: {"url-filter": "^https?://([^/]+\\.)?example\\.com",
+                 "url-filter-is-case-sensitive": true,
+                 "resource-type": ["image", "style-sheet", "script", "font",
+                                   "media", "raw", "document"]},
+
+       action: {type: "block"}}
+    ]);
+
+
     test.done();
   },
 
   testRequestFilterExceptions: function(test)
   {
     testRules(test, ["@@example.com"], [
       {trigger: {"url-filter": "^https?://.*example\\.com",
                  "resource-type": ["image", "style-sheet", "script", "font",
                                    "media", "raw", "document"]},
        action: {type: "ignore-previous-rules"}}
     ]);
 
+    testRules(test, ["@@||example.com"], [
+      {trigger: {"url-filter": "^https?://([^/]+\\.)?example\\.com",
+                 "url-filter-is-case-sensitive": true,
+                 "resource-type": ["image", "style-sheet", "script", "font",
+                                   "media", "raw", "document"]},
+       action: {type: "ignore-previous-rules"}}
+    ]);
+
     test.done();
   },
 
   testElementIDattributeFormat: function(test)
   {
     testRules(test,
               ["###example", "test.com###EXAMPLE"],
               ["[id=example]", "[id=EXAMPLE]"],
               rules => rules.map(rule => rule.action.selector));
 
     test.done();
   },
 
   testDomainWhitelisting: function(test)
   {
     testRules(test, ["@@||example.com^$document"], [
       {trigger: {"url-filter": ".*",
                  "if-domain": ["example.com", "www.example.com"]},
        action: {type: "ignore-previous-rules"}}
     ]);
     testRules(test, ["@@||example.com^$document,image"], [
       {trigger: {"url-filter": ".*",
                  "if-domain": ["example.com", "www.example.com"]},
        action: {type: "ignore-previous-rules"}},
-      {trigger: {"url-filter": "^https?://example\\.com",
+      {trigger: {"url-filter": "^https?://([^/]+\\.)?example\\.com",
                  "url-filter-is-case-sensitive": true,
                  "resource-type": ["image"]},
        action: {type: "ignore-previous-rules"}}
     ]);
     testRules(test, ["@@||example.com/path^$font,document"], [
-      {trigger: {"url-filter": "^https?://example\\.com/path",
+      {trigger: {"url-filter": "^https?://([^/]+\\.)?example\\.com/path",
                  "resource-type": ["font"]},
        action: {type: "ignore-previous-rules"}}
     ]);
 
     test.done();
   },
 
   testRuleOrdering: function(test)
   {
     testRules(
@@ skipping 67 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();
   }
 };