Issue 5339 - Properly select element for pseudo-element

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 70 matching lines @@
   let element = document.createElement("div");
   element.id = findUniqueId();
   if (!parent)
     document.body.appendChild(element);
   else
     parent.appendChild(element);
   insertStyleRule("#" + element.id + " " + styleBlock);
   return element;
 }
 
-function createPseudoElementWithStyle(element, pseudo, styleBlock)
-{
-  insertStyleRule(`#${element.id}${pseudo} ${styleBlock}`);
-}
-
 // 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 141 matching lines @@
 {
   let toHide = createElementWithStyle("{}");
   applyElemHideEmulation(
     [":-abp-properties(background-color: rgb(0, 0, 0))"]
   ).then(() =>
   {
     expectVisible(test, toHide);
     insertStyleRule("#" + toHide.id + " {background-color: #000}");
     return new Promise((resolve, reject) =>
     {
+      // Re-evaluation will only happen after a few seconds
+      expectVisible(test, toHide);
       window.setTimeout(() =>
       {
         expectHidden(test, toHide);
         resolve();
-      }, 0);
+      }, 4000);
     });
   }).catch(unexpectedError.bind(test)).then(() => test.done());
 };
 
-exports.testPropertySelectorForPseudoElementBefore = function(test)
-{
-  let toHide = createElementWithStyle("{background-color: #000}");
-  createPseudoElementWithStyle(toHide, "::before", "{content: \"publicite\"}");
-  applyElemHideEmulation(
-    [":-abp-properties-before(content: \"publicite\")"]
-  ).then(() =>
-  {
-    expectHidden(test, toHide);
-  }).catch(unexpectedError.bind(test)).then(() => test.done());
-};
-
-exports.testPropertySelectorForPseudoElementAfter = function(test)
-{
-  let toHide = createElementWithStyle("{background-color: #000}");
-  createPseudoElementWithStyle(toHide, "::after", "{content: \"publicite\"}");
-  applyElemHideEmulation(
-    [":-abp-properties-after(content: \"publicite\")"]
-  ).then(() =>
-  {
-    expectHidden(test, toHide);
+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(() =>
   {
@@ skipping 100 matching lines @@
     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");
-};
-
 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">
@@ skipping 26 matching lines @@
   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.testPseudoClassHasSelectorWithPropAfterSelector = function(test)
-{
-  let parent = createElementWithStyle("{}");
-  let child = createElementWithStyle("{background-color: #000}", parent);
-  createPseudoElementWithStyle(child, "::before", "{content: \"publicite\"}");
-
-  applyElemHideEmulation(
-    ["div:-abp-has(:-abp-properties-before(content: \"publicite\"))"]
+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());
 };