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 47 matching lines @@
   -----END RSA PRIVATE KEY-----
   */
   let publickey = "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALZc50pEXnz9TSRozwM04rryuaXl/wgUFqV9FHq8HDlkdKvRU0hXhb/AKrSpCJ0NCxHtal1l/kHYlHG9e7Ev6+MCAwEAAQ";
 
   /**
    * Content:
    * /test\0127.0.0.1:1234\0Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:30.0) Gecko/20100101 Firefox/30.0
    */
   let adblockkey = "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALZc50pEXnz9TSRozwM04rryuaXl/wgUFqV9FHq8HDlkdKvRU0hXhb/AKrSpCJ0NCxHtal1l/kHYlHG9e7Ev6+MCAwEAAQ==_gM4C/j8KkD2byPeP+THXk1GbLTUm5y+5jbdhcMtnzPMgImIfge0dGCtfU9cxLpe8BnqnEGNhTxpuu4pZxjOHYQ==";
 
+  let dispatchReadyEvent = "document.dispatchEvent(new CustomEvent('abp:frameready', {bubbles: true}));";
+
   let tests = [
     [
       "HTML image with relative URL",
       '<img src="test.gif">',
       "http://127.0.0.1:1234/test.gif", "image", false, false
     ],
     [
       "HTML image with absolute URL",
       '<img src="http://localhost:1234/test.gif">',
       "http://localhost:1234/test.gif", "image", true, false
@@ skipping 17 matching lines @@
       "Dynamically inserted image button",
       '<div id="insert"></div>' +
       '<script>' +
         'window.addEventListener("DOMContentLoaded", function()' +
         '{' +
           'var div = document.getElementById("insert");' +
           'div.innerHTML = \'<input type="image" id="image" src="test.gif">\';' +
           'var image = document.getElementById("image");' +
           'image.onload = image.onerror = function ()' +
           '{' +
-            'document.dispatchEvent(new CustomEvent("abp:frameready", {bubbles: true}));' +
+            dispatchReadyEvent +
           '};' +
         '}, false);' +
       '</script>',
       "http://127.0.0.1:1234/test.gif", "image", false, true
     ],
     [
       "CSS background-image",
       '<div style="background-image: url(test.gif)"></div>',
       "http://127.0.0.1:1234/test.gif", "image", false, false
     ],
@@ skipping 94 matching lines @@
           'xmlDoc.async = false;' +
           'xmlDoc.load("test.xml");' +
         '}' +
         'catch(e){}' +
       '</script>',
       "http://127.0.0.1:1234/test.xml", "xmlhttprequest", false, false
     ],
     [
       "Web worker",
       '<script>' +
-        'var e = new CustomEvent(\'abp:frameready\', {bubbles: true});' +
         'try' +
         '{' +
           'var worker = new Worker("test.js");' +
           'worker.onerror = function(event)' +
           '{' +
             'event.preventDefault();' +
-            'document.dispatchEvent(e);' +
+            dispatchReadyEvent +
           '};' +
         '}' +
-        'catch (x)' +
+        'catch (e)' +
         '{' +
-          'document.dispatchEvent(e);' +
+          dispatchReadyEvent +
         '}' +
       '</script>',
       "http://127.0.0.1:1234/test.js", "script", false, true
     ],
   ];
 
   if (window.navigator.mimeTypes["application/x-shockwave-flash"] && window.navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin)
   {
     tests.push([
       "HTML embed (Flash)",
@@ skipping 46 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)
-        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)
+      defaultMatcher.add(Filter.fromText("@@||127.0.0.1:1234/test|$genericblock,sitekey=" + publickey));
 
     if (!explicitEvent)
     {
       if (body.indexOf("2000/svg") >= 0)
       {
-        // SVG image: add an onload attribute to the document element
-        body = body.replace(/(<svg\b)/, '$1 onload="this.dispatchEvent(new CustomEvent(\'abp:frameready\', {bubbles: true}));"');
+        // SVG image: add an onload attribute to the document element and keep
+        // polling until the document is really loaded.
+        body = body.replace(/(<svg\b)/, '$1 onload="if (document.readyState != \'complete\') setTimeout(arguments.callee.bind(this), 0); else ' + dispatchReadyEvent + '"');
       }
       else
       {
         // HTML data: wrap it into a <body> tag
-        body = '<body onload="this.dispatchEvent(new CustomEvent(\'abp:frameready\', {bubbles: true}));">' + body + '</body>';
+        body = '<body onload="' + dispatchReadyEvent + '">' + body + '</body>';
       }
     }
 
     let serverHit = false;
     server.registerPathHandler("/test", function(metadata, response)
     {
       response.setStatusLine("1.1", "200", "OK");
 
       let contentType = "text/html";
       if (body.indexOf("2000/svg") >= 0)
@@ skipping 25 matching lines @@
 
       // Work around weird Firefox behavior, where worker scripts succesfully load with empty 404 pages.
       var error = "<b>Not found...<b>";
       response.bodyOutputStream.write(error, error.length);
     });
 
     policyHits = [];
     var callback = function()
     {
       let expectedStatus = "allowed";
-      if (stage == 3 || stage == 6)
+      if (stage == 3)
         equal(policyHits.length, 0, "Number of policy hits");
       // We cannot rely on the correctness of policy hits for sitekey filters due to blocking
       // filter hits being counted even if the resource doesn't end up getting blocked
-      else if (stage != 5)
+      else if (stage != 5 && stage != 6 && stage != 8)
       {
         equal(policyHits.length, 1, "Number of policy hits");
         if (policyHits.length == 1)
         {
           let [wnd, node, item] = policyHits[0];
 
           equal(item.location, expectedURL, "Request URL");
 
           expectedStatus = (stage == 1 ? "allowed" : "blocked");
           let actualStatus = (item.filter ? "blocked" : "allowed");
@@ skipping 15 matching lines @@
     frame.setAttribute("src", "http://127.0.0.1:1234/test");
   }
 
   let stageDescriptions = {
     1: "running without filters",
     2: "running with filter %S",
     3: "running with filter %S and site exception",
     4: "running with filter %S and exception not applicable to sites",
     5: "running with filter %S and sitekey exception",
     6: "running with filter %S and $genericblock exception",
-    7: "running with filter %S$domain=127.0.0.1 and $genericblock exception"
+    7: "running with filter %S$domain=127.0.0.1 and $genericblock exception",
+    8: "running with filter %S and $genericblock,sitekey exception"
   };
 
   for (let test = 0; test < tests.length; test++)
   {
     let [name, body, expectedURL, expectedType, expectedDomain, expectedThirdParty] = tests[test];
     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));
     }
   }
 })();