Issue 3143 - Filter elements with :-abp-has()

test/browser/elemHideEmulation.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 14 matching lines @@
 let myUrl = document.currentScript.src;
 
 exports.tearDown = function(callback)
 {
   let styleElements = document.head.getElementsByTagName("style");
   while (styleElements.length)
     styleElements[0].parentNode.removeChild(styleElements[0]);
 
   let child;
   while (child = document.body.firstChild)
-    document.body.removeChild(child);
+    child.parentNode.removeChild(child);
 
   callback();
 };
 
 function unexpectedError(error)
 {
   console.error(error);
   this.ok(false, "Unexpected error: " + error);
 }
 
@@ skipping 24 matching lines @@
   if (styleElements.length)
     styleElement = styleElements[0];
   else
   {
     styleElement = document.createElement("style");
     document.head.appendChild(styleElement);
   }
   styleElement.sheet.insertRule(rule, styleElement.sheet.cssRules.length);
 }
 
-// insert a <div> with a unique id and and empty CSS rule
+// insert a <div> with a unique id and a CSS rule
 // for the the selector matching the id.
 function createElementWithStyle(styleBlock, parent)
 {
   let element = document.createElement("div");
   element.id = findUniqueId();
   if (!parent)
     document.body.appendChild(element);
   else
     parent.appendChild(element);
   insertStyleRule("#" + element.id + " " + styleBlock);
   return element;
 }
 
-// Will ensure the class ElemHideEmulation is loaded
-// and then will call the callback.
-// NOTE: if it never loads, this will probably hang in an infinite
-// loop
+// Will ensure the class ElemHideEmulation is loaded.
+// NOTE: if it never loads, this will probably hang.
 function loadElemHideEmulation()
 {
   if (typeof ElemHideEmulation == "undefined")
   {
     return loadScript(myUrl + "/../../../lib/common.js").then(() =>
     {
       return loadScript(myUrl + "/../../../chrome/content/elemHideEmulation.js");
     }).then(() =>
     {
       return loadElemHideEmulation();
     });
   }
 
   return Promise.resolve();
 }
 
-// instantiate a ElemHideEmulation with @selectors.
+// Create a new ElemHideEmulation instance with @selectors.
 function applyElemHideEmulation(selectors)
 {
   return loadElemHideEmulation().then(() =>
   {
     let elemHideEmulation = new ElemHideEmulation(
       window,
       callback =>
       {
         let patterns = [];
         selectors.forEach(selector =>
         {
           patterns.push({selector});
         });
         callback(patterns);
       },
       newSelectors =>
       {
         if (!newSelectors.length)
           return;
         let selector = newSelectors.join(", ");
         insertStyleRule(selector + "{display: none !important;}");
       },
       elems =>
       {
-        if (!elems.length)
-          return;
         for (let elem of elems)
           elem.style.display = "none";
       }
     );
 
     elemHideEmulation.apply();
-    return Promise.resolve();
+    return Promise.resolve(elemHideEmulation);
   });
 }
 
+// internals testing
+
 exports.testParseSelectorContent = function(test)
 {
   loadElemHideEmulation().then(() =>
   {
-    let parsed = parseSelectorContent("> div) > div", 0);
+    let parsed = parseSelectorContent(":-abp-has(> div) > div", 10);
+    test.equal(parsed.text, "> div");
+    test.equal(parsed.end, 15);
+
+    parsed = parseSelectorContent("> div) > div", 0);
     test.equal(parsed.text, "> div");
     test.equal(parsed.end, 5);
-
-    parsed = parseSelectorContent("\"> div\") > div", 0);
-    test.equal(parsed.text, "\"> div\"");
-    test.equal(parsed.end, 7);
-    parsed = parseSelectorContent(" \"> div\" ) > div", 0);
-    test.equal(parsed.text, " \"> div\" ");
-    test.equal(parsed.end, 9);
 
     // parens not closed.
     parsed = parseSelectorContent("> div > div", 0);
     test.equal(parsed, null);
   }).catch(unexpectedError.bind(test)).then(() => test.done());
 };
 
 exports.testParseSelector = function(test)
 {
   loadElemHideEmulation().then(() =>
   {
-    let {selectors, hide} = parseSelector("");
+    let selectors = parseSelector("");
     test.equal(selectors.length, 0);
-    test.ok(!hide);
 
     let selector = "div > :-abp-properties('background-color: rgb(0, 0, 0)')";
-    let parsed = parseSelector(selector);
-    test.equal(parsed.selectors.length, 2);
-    test.ok(!parsed.hide);
-    test.ok(parsed.selectors[0] instanceof PlainSelector);
-    test.ok(parsed.selectors[1] instanceof PropsSelector);
+    selectors = parseSelector(selector);
+    test.equal(selectors.length, 2);
+    test.ok(selectors[0] instanceof PlainSelector);
+    test.ok(selectors[1] instanceof PropsSelector);
 
     selector = "div > :-abp-has(> div.inside) > div";
-    parsed = parseSelector(selector);
-    test.equal(parsed.selectors.length, 3);
-    test.ok(parsed.hide);
-    test.ok(parsed.selectors[0] instanceof PlainSelector);
-    test.ok(parsed.selectors[1] instanceof HasSelector);
-    test.ok(parsed.selectors[2] instanceof PlainSelector);
+    selectors = parseSelector(selector);
+    test.equal(selectors.length, 3);
+    test.ok(selectors[0] instanceof PlainSelector);
+    test.ok(selectors[1] instanceof HasSelector);
+    test.ok(selectors[2] instanceof PlainSelector);
 
     selector = "div > div:-abp-has(> div.inside) > div";
-    parsed = parseSelector(selector);
-
-    test.equal(parsed.selectors.length, 3);
-    test.ok(parsed.hide);
-    test.ok(parsed.selectors[0] instanceof PlainSelector);
-    test.ok(parsed.selectors[1] instanceof HasSelector);
-    test.ok(parsed.selectors[2] instanceof PlainSelector);
+    selectors = parseSelector(selector);
+
+    test.equal(selectors.length, 3);
+    test.ok(selectors[0] instanceof PlainSelector);
+    test.ok(selectors[1] instanceof HasSelector);
+    test.ok(selectors[2] instanceof PlainSelector);
 
     selector = "div > :-abp-has(> div.inside) > :-abp-properties(background-color: rgb(0, 0, 0))";
-    parsed = parseSelector(selector);
-
-    test.equal(parsed.selectors.length, 4);
-    test.ok(parsed.hide);
-    test.ok(parsed.selectors[0] instanceof PlainSelector);
-    test.ok(parsed.selectors[1] instanceof HasSelector);
-    test.ok(parsed.selectors[2] instanceof PlainSelector);
-    test.ok(parsed.selectors[3] instanceof PropsSelector);
+    selectors = parseSelector(selector);
+
+    test.equal(selectors.length, 4);
+    test.ok(selectors[0] instanceof PlainSelector);
+    test.ok(selectors[1] instanceof HasSelector);
+    test.ok(selectors[2] instanceof PlainSelector);
+    test.ok(selectors[3] instanceof PropsSelector);
 
     selector = "div > :-abp-has(> div.inside > :-abp-properties(background-color: rgb(0, 0, 0))";
-    parsed = parseSelector(selector);
-    test.equal(parsed.selectors, null);
+    selectors = parseSelector(selector);
+    test.equal(selectors, null);
 
     // -abp-has-unsupported() is unknown. Ensure we fail parsing.
     selector = 'div[arial-label="Story"]:-abp-has(> div > div > span > span:-abp-unsupported("Suggested Post"))';
-    parsed = parseSelector(selector);
-    test.equal(parsed.selectors, null);
+    selectors = parseSelector(selector);
+    test.equal(selectors, null);
   }).catch(unexpectedError.bind(test)).then(() => test.done());
 };
 
 function buildDom(doc)
 {
   doc.body.innerHTML = `<div id="parent">
     <div id="middle">
       <div id="middle1"><div id="inside" class="inside"></div></div>
     </div>
     <div id="sibling">
@@ skipping 90 matching lines @@
     let selectors = splitSelector("div:-abp-has(div) > [-abp-properties='background-color: rgb(0, 0, 0)'] > span");
     test.ok(selectors);
     test.equal(selectors.length, 1, "There is only one selector");
 
     selectors = splitSelector("div:-abp-has(div), [-abp-properties='background-color: rgb(0, 0, 0)']");
     test.ok(selectors);
     test.equal(selectors.length, 2, "There are two selectors");
   }).catch(unexpectedError.bind(test)).then(() => test.done());
 };
 
+// API testing
+
 exports.testVerbatimPropertySelector = function(test)
 {
   let toHide = createElementWithStyle("{background-color: #000}");
   applyElemHideEmulation(
     [":-abp-properties(background-color: rgb(0, 0, 0))"]
   ).then(() =>
   {
     expectHidden(test, toHide);
   }).catch(unexpectedError.bind(test)).then(() => test.done());
 };
@@ skipping 243 matching lines @@
   let parent = createElementWithStyle("{}");
   let child = createElementWithStyle("{background-color: #000}", parent);
   applyElemHideEmulation(
     ["div:-abp-has(:-abp-properties(background-color: rgb(0, 0, 0)))"]
   ).then(() =>
   {
     expectVisible(test, child);
     expectHidden(test, parent);
   }).catch(unexpectedError.bind(test)).then(() => test.done());
 };