Issue 616 - Add tests for $generichide and $genericblock

chrome/content/tests/elemhide.js

Index: chrome/content/tests/elemhide.js
diff --git a/chrome/content/tests/elemhide.js b/chrome/content/tests/elemhide.js
index c1b9d7a6c9433e8b1826bbf6fdd2587a6953db57..719d61da5cb6757f65ab11b379daa348ccc04cc8 100644
--- a/chrome/content/tests/elemhide.js
+++ b/chrome/content/tests/elemhide.js
@@ -106,6 +106,13 @@
     [["localhost.###test1"], ["visible", "visible"]],
     [["localhost.,localhost###test1"], ["hidden", "visible"]],
     [["localhost.,foo.###test1"], ["visible", "visible"]],
+
+    [["#div(test1)", "@@localhost$generichide"], ["visible", "visible"]],
+    [["#div(test1)", "@@localhost$genericblock"], ["hidden", "visible"]],
+    [["localhost#div(test1)", "@@localhost$generichide"], ["hidden", "visible"]],
+    [["~example.com#div(test1)", "@@localhost$generichide"], ["visible", "visible"]],
+    [["~example.com#div(test1)", "@@localhost$genericblock"], ["hidden", "visible"]],
+    [["~example.com,localhost#div(test1)", "@@localhost$generichide"], ["hidden", "visible"]],
   ];
 
   function runTest([filters, expected], stage)
@@ -138,11 +145,15 @@
         });
       }, false, true);
       frame.setAttribute("src", "http://localhost:1234/test");
-    }
-    FilterNotifier.addListener(listener);
+    };
 
     for (let filter of filters)
-      ElemHide.add(Filter.fromText(filter));
+      if (filter.substr(0, 2) == "@@")

[Felix Dahlke, 2015/09/28 18:24:07]

How I understand it, what you want to check for here is whether the filter is
NOT an element hiding rule, right? If so, I think it would make more sense to
create the filter Object (you'll call `Filter.fromText(filter)` either way),
then check if that one is an element hiding rule.

[kzar, 2015/09/29 11:07:01]

Done.

+        defaultMatcher.add(Filter.fromText(filter));
+      else
+        ElemHide.add(Filter.fromText(filter));
+
+    FilterNotifier.addListener(listener);
     ElemHide.isDirty = true;
     ElemHide.apply();
   }