Issue 5248 - Use wildcard to match any subdomains

test/abp2blocklist.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 115 matching lines @@
               ["[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"]},
+                 "if-domain": ["*example.com"]},
        action: {type: "ignore-previous-rules"}}
     ]);
     testRules(test, ["@@||example.com^$document,image"], [
       {trigger: {"url-filter": ".*",
-                 "if-domain": ["example.com", "www.example.com"]},
+                 "if-domain": ["*example.com"]},
        action: {type: "ignore-previous-rules"}},
       {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",
                  "resource-type": ["font"]},
        action: {type: "ignore-previous-rules"}}
@@ skipping 54 matching lines @@
   {
     // These types of filters are currently completely unsupported.
     testRules(test, ["foo$sitekey=bar", "@@foo$genericblock",
                      "@@bar$generichide"], []);
 
     test.done();
   },
 
   testFilterOptions: function(test)
   {
-    testRules(test, ["1$domain=foo.com"], ["foo.com", "www.foo.com"],
+    testRules(test, ["1$domain=foo.com"], ["*foo.com"],
               rules => rules[0]["trigger"]["if-domain"]);
-    testRules(test, ["2$domain=third-party"], ["third-party"],

[Manish Jethani, 2017/05/16 01:08:27]

This test was wrong, I've fixed it.

-              rules => rules[0]["trigger"]["if-domain"]);
+    testRules(test, ["2$third-party"], ["third-party"],
+              rules => rules[0]["trigger"]["load-type"]);
     testRules(test, ["foo$match_case"], true,
               rules => rules[0]["trigger"]["url-filter-is-case-sensitive"]);
 
     test.done();
   },
 
   testUnicode: function(test)
   {
-    testRules(test, ["$domain=🐈.cat"], ["xn--zn8h.cat", "www.xn--zn8h.cat"],
+    testRules(test, ["$domain=🐈.cat"], ["*xn--zn8h.cat"],
               rules => rules[0]["trigger"]["if-domain"]);
     testRules(test, ["🐈$domain=🐈.cat"], []);
     testRules(test, ["###🐈"], []);
 
     test.done();
   }
 };