Issue 616 - Add tests for $generichide and $genericblock

chrome/content/tests/policy.js

 (function()
 {
   let server = null;
   let frame = null;
   let requestNotifier = null;
   let httpProtocol = null;
 
   module("Content policy", {
     setup: function()
     {
@@ skipping 279 matching lines @@
       if (prevWnd == wnd && prevItem.location == item.location && prevItem.type == item.type && prevItem.docDomain == item.docDomain)
         policyHits.pop();
     }
     policyHits.push([wnd, node, item]);
   }
 
   function runTest([name, body, expectedURL, expectedType, expectedThirdParty, explicitEvent], stage)
   {
     defaultMatcher.clear();
 
-    if (stage > 1)
-      if (stage == 7)

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

I think this block can be simplified:

if (stage == 7)
  defaultMatcher.add(Filter.fromText(expectedURL + "$domain=127.0.0.1"));
else if (stage > 1)
  defaultMatcher.add(Filter.fromText(expectedURL));

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

Done.

-        defaultMatcher.add(Filter.fromText(expectedURL + "$domain=127.0.0.1"));
-      else
-        defaultMatcher.add(Filter.fromText(expectedURL));
+    if (stage == 7)
+      defaultMatcher.add(Filter.fromText(expectedURL + "$domain=127.0.0.1"));
+    else if (stage > 1)
+      defaultMatcher.add(Filter.fromText(expectedURL));
 
     if (stage == 3)
       defaultMatcher.add(Filter.fromText("@@||127.0.0.1:1234/test|$document"));
     if (stage == 4)
       defaultMatcher.add(Filter.fromText("@@||127.0.0.1:1234/test|$~document"));
     if (stage == 5)
       defaultMatcher.add(Filter.fromText("@@||127.0.0.1:1234/test|$document,sitekey=" + publickey));
     if (stage == 6 || stage == 7)
       defaultMatcher.add(Filter.fromText("@@||127.0.0.1:1234/test|$genericblock"));
     if (stage == 8)
@@ skipping 106 matching lines @@
     for (let stage = 1; stage in stageDescriptions; stage++)
     {
       let stageDescription = stageDescriptions[stage];
       if (stageDescription.indexOf("%S") >= 0)
         stageDescription = stageDescription.replace("%S", expectedURL);
 
       asyncTest(name + " (" + stageDescription + ")", runTest.bind(null, tests[test], stage));
     }
   }
 })();