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 349 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, expectation)
+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 = {};
-  elems.parent = document.getElementById("parent");
-  elems.middle = document.getElementById("middle");
-  elems.inside = document.getElementById("inside");
-  elems.sibling = document.getElementById("sibling");
-  elems.sibling2 = document.getElementById("sibling2");
-  elems.toHide = document.getElementById("tohide");

[Wladimir Palant, 2017/08/16 08:17:16]

Please assign a proper object literal:

  let elems = {
    parent: document.getElementById(...),
    ...
  };

[hub, 2017/08/16 15:30:46]

Done.

+  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(() =>
   {
-    if (typeof expectation == "function")
-      return expectation(elems);

[Wladimir Palant, 2017/08/16 08:17:15]

Handling the expectations here for two scenarios but outside for one more is
inconsistent. I think that this function should generally get an `expected`
parameter like:

  {
    parent: true,
    middle: true,
    inside: true,
    sibling: true,
    sibling2: true,
    toHide: false
  }

[hub, 2017/08/16 15:30:45]

Done.

-
-    expectVisible(test, elems.parent);
-    expectVisible(test, elems.middle);
-    expectVisible(test, elems.inside);
-    expectVisible(test, elems.sibling);
-    expectVisible(test, elems.sibling2);
-    expectHidden(test, elems.toHide);
+    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)
 {
-  runTestPseudoClassHasSelectorWithHasAndWithSuffixSibling(test, "div:-abp-has(:-abp-has(div.inside)) + div > div");
+  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");
+    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", (elems) =>
-    {
-      expectVisible(test, elems.parent);
-      expectVisible(test, elems.middle);
-      expectVisible(test, elems.inside);
-      expectVisible(test, elems.sibling);
-      expectVisible(test, elems.sibling2);
-      expectVisible(test, elems.toHide);
-    });
+    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>
@@ skipping 41 matching lines @@
   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());
 };