Issue 5345 - Whitelist $elemhide and $generichide domains where possible

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 34 matching lines @@
       {trigger: {"url-filter": "^https?://([^/:]*\\.)?test\\.com[/:]",
                  "url-filter-is-case-sensitive": true},
        action: {type: "css-display-none", selector: ".whatever"}}
     ]);
 
     test.done();
   },
 
   testElementHidingExceptions: function(test)
   {
-    // Element hiding rules should be in the following order: (1) generic
-    // rules, (2) exceptions for generic rules, (3) domain-specific rules,
-    // (4) exceptions for all rules.
     testRules(test, [
       "##.whatever",
       "test.com###something",
       "@@||special.test.com^$elemhide",
-      "@@||test.com^$generichide"
+      "@@||test.com^$generichide",
+      "@@^something^$elemhide",
+      "@@^anything^$generichide"
     ], [
-      ["^https?://", "css-display-none"],
-      ["^https?://([^/]+\\.)?test\\.com", "ignore-previous-rules"],
-      ["^https?://([^/:]*\\.)?test\\.com[/:]", "css-display-none"],
-      ["^https?://([^/]+\\.)?special\\.test\\.com", "ignore-previous-rules"]
+      ["^https?://", ["*test.com", "*special.test.com"]],
+      ["^https?://([^/:]*\\.)?test\\.com[/:]", ["*special.test.com"]]
     ], rules => rules.map(rule => [rule.trigger["url-filter"],
-                                   rule.action.type]));
+                                   rule.trigger["unless-domain"]]));
 
     testRules(test, ["#@#whatever"], []);
     testRules(test, ["test.com#@#whatever"], []);
     testRules(test, ["~test.com#@#whatever"], []);
 
     // We currently completely ignore any element hiding filters that have the
     // same selector as an element hiding exception. In these examples #whatever
     // should be hidden for all domains not ending in test.com instead of
     // nowhere!
     testRules(test, ["test.com#@#whatever", "##whatever"], []);
@@ skipping 195 matching lines @@
   testUnicode: function(test)
   {
     testRules(test, ["$domain=🐈.cat"], ["*xn--zn8h.cat"],
               rules => rules[0]["trigger"]["if-domain"]);
     testRules(test, ["🐈$domain=🐈.cat"], []);
     testRules(test, ["###🐈"], []);
 
     test.done();
   }
 };