Issue 5436 - Allow relative selectors in :-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 71 matching lines @@
   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.
-// NOTE: if it never loads, this will probably hang.
-function loadElemHideEmulation()
+// Pass true when it calls itself.
+function loadElemHideEmulation(inside)
 {
   if (typeof ElemHideEmulation == "undefined")
   {
+    if (inside)
+      return Promise.reject("Failed to load ElemHideEmulation.");
+
     return loadScript(myUrl + "/../../../lib/common.js").then(() =>
     {
       return loadScript(myUrl + "/../../../chrome/content/elemHideEmulation.js");
     }).then(() =>
     {
-      return loadElemHideEmulation();
+      return loadElemHideEmulation(true);
     });
   }
 
   return Promise.resolve();
 }
 
 // Create a new ElemHideEmulation instance with @selectors.
 function applyElemHideEmulation(selectors)
 {
   return loadElemHideEmulation().then(() =>
@@ skipping 152 matching lines @@
       expectVisible(test, toHide);
       window.setTimeout(() =>
       {
         expectHidden(test, toHide);
         resolve();
       }, 4000);
     });
   }).catch(unexpectedError.bind(test)).then(() => test.done());
 };
 
+exports.testPseudoClassWithPropBeforeSelector = function(test)
+{
+  let parent = createElementWithStyle("{}");
+  let child = createElementWithStyle("{background-color: #000}", parent);
+  insertStyleRule(`#${child.id}::before {content: "publicite"}`);
+
+  applyElemHideEmulation(
+    ["div:-abp-properties(content: \"publicite\")"]
+  ).then(() =>
+  {
+    expectHidden(test, child);
+    expectVisible(test, parent);
+  }).catch(unexpectedError.bind(test)).then(() => test.done());
+};
+
 exports.testPseudoClassHasSelector = function(test)
 {
   let toHide = createElementWithStyle("{}");
   applyElemHideEmulation(
     ["div:-abp-has(div)"]
   ).then(() =>
   {
     expectVisible(test, toHide);
   }).catch(unexpectedError.bind(test)).then(() => test.done());
 };
@@ skipping 57 matching lines @@
     ["div:-abp-has(div) + div > div"]
   ).then(() =>
   {
     expectVisible(test, parent);
     expectVisible(test, middle);
     expectVisible(test, sibling);
     expectHidden(test, toHide);
   }).catch(unexpectedError.bind(test)).then(() => test.done());
 };
 
-function runTestPseudoClassHasSelectorWithHasAndWithSuffixSibling(test, selector)
+function runTestPseudoClassHasSelectorWithHasAndWithSuffixSibling(test, selector, expectations)
+{
+  document.body.innerHTML = `<div id="parent">
+      <div id="middle">
+        <div id="middle1"><div id="inside" class="inside"></div></div>
+      </div>
+      <div id="sibling">
+        <div id="tohide">to hide</div>
+      </div>
+      <div id="sibling2">
+        <div id="sibling21"><div id="sibling211" class="inside"></div></div>
+      </div>
+    </div>`;
+  let elems = {
+    parent: document.getElementById("parent"),
+    middle: document.getElementById("middle"),
+    inside: document.getElementById("inside"),
+    sibling: document.getElementById("sibling"),
+    sibling2: document.getElementById("sibling2"),
+    toHide: document.getElementById("tohide")
+  };
+
+  insertStyleRule(".inside {}");
+
+  applyElemHideEmulation(
+    [selector]
+  ).then(() =>
+  {
+    for (let elem in expectations)
+      if (elems[elem])
+      {
+        if (expectations[elem])
+          expectVisible(test, elems[elem]);
+        else
+          expectHidden(test, elems[elem]);
+      }
+  }).catch(unexpectedError.bind(test)).then(() => test.done());
+}
+
+exports.testPseudoClassHasSelectorWithHasAndWithSuffixSibling = function(test)
+{
+  let expectations = {
+    parent: true,
+    middile: true,
+    inside: true,
+    sibling: true,
+    sibling2: true,
+    toHide: false
+  };
+  runTestPseudoClassHasSelectorWithHasAndWithSuffixSibling(
+    test, "div:-abp-has(:-abp-has(div.inside)) + div > div", expectations);
+};
+
+exports.testPseudoClassHasSelectorWithHasAndWithSuffixSibling2 = function(test)
+{
+  let expectations = {
+    parent: true,
+    middile: true,
+    inside: true,
+    sibling: true,
+    sibling2: true,
+    toHide: false
+  };
+  runTestPseudoClassHasSelectorWithHasAndWithSuffixSibling(
+    test, "div:-abp-has(:-abp-has(> div.inside)) + div > div", expectations);
+};
+
+exports.testPseudoClassHasSelectorWithSuffixSiblingNoop = function(test)
+{
+  let expectations = {
+    parent: true,
+    middile: true,
+    inside: true,
+    sibling: true,
+    sibling2: true,
+    toHide: true
+  };
+  runTestPseudoClassHasSelectorWithHasAndWithSuffixSibling(
+    test, "div:-abp-has(> body div.inside) + div > div", expectations);
+};
+
+exports.testPseudoClassContains = function(test)
 {
   document.body.innerHTML = `<div id="parent">
       <div id="middle">
         <div id="middle1"><div id="inside" class="inside"></div></div>
       </div>
       <div id="sibling">
         <div id="tohide">to hide</div>
       </div>
       <div id="sibling2">
         <div id="sibling21"><div id="sibling211" class="inside"></div></div>
       </div>
     </div>`;
   let parent = document.getElementById("parent");
   let middle = document.getElementById("middle");
   let inside = document.getElementById("inside");
   let sibling = document.getElementById("sibling");
   let sibling2 = document.getElementById("sibling2");
   let toHide = document.getElementById("tohide");
 
-  insertStyleRule(".inside {}");
-
-  applyElemHideEmulation(
-    [selector]
+  applyElemHideEmulation(
+    ["#parent div:-abp-contains(to hide)"]
   ).then(() =>
   {
     expectVisible(test, parent);
     expectVisible(test, middle);
     expectVisible(test, inside);
-    expectVisible(test, sibling);
+    expectHidden(test, sibling);
     expectVisible(test, sibling2);
     expectHidden(test, toHide);
   }).catch(unexpectedError.bind(test)).then(() => test.done());
-}
-
-exports.testPseudoClassHasSelectorWithHasAndWithSuffixSibling = function(test)
-{
-  runTestPseudoClassHasSelectorWithHasAndWithSuffixSibling(test, "div:-abp-has(:-abp-has(div.inside)) + div > div");
-};
-
-exports.testPseudoClassHasSelectorWithHasAndWithSuffixSibling2 = function(test)
-{
-  runTestPseudoClassHasSelectorWithHasAndWithSuffixSibling(test, "div:-abp-has(:-abp-has(> div.inside)) + div > div");

[Wladimir Palant, 2017/08/10 13:39:47]

It's probably a good idea to test whether :scope actually has an effect rather
than being treated as :root. So we should test that "div:-abp-has(> div.inside)
+ div > div" won't hide anything.

[Wladimir Palant, 2017/08/10 13:42:17]

Sorry, that should rather be "div:-abp-has(> body div.inside) + div > div"

[hub, 2017/08/14 14:25:32]

Done.

 };

[hub, 2017/07/20 19:21:42]

This is the test that was removed as it failed.

 
 exports.testPseudoClassHasSelectorWithPropSelector = function(test)
 {
   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());
 };
 
 exports.testPseudoClassHasSelectorWithPropSelector2 = function(test)
 {
   let parent = createElementWithStyle("{}");
   let child = createElementWithStyle("{}", parent);
   insertStyleRule("body #" + parent.id + " > div { background-color: #000}");
   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());
 };