Issue 7428, 7400 - Add test case for nested :-abp-properties()

test/browser/elemHideEmulation.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 511 matching lines @@
     middile: true,
     inside: true,
     sibling: true,
     sibling2: true,
     toHide: true
   };
   runTestPseudoClassHasSelectorWithHasAndWithSuffixSibling(
     test, "div:-abp-has(> span:-abp-contains(Advertisment))", expectations);
 };
 
-// See issue https://issues.adblockplus.org/ticket/7359
-async function runTestCombinatorQualifier(test, selector)
+async function runTestQualifier(test, selector)
 {
   testDocument.body.innerHTML = `
-<style>
-span::before {
-  content: "any";
-}
-</style>
-<div id="toHide">
-  <a>
-    <p>
-      <span></span>
-    </p>
-  </a>
-</div>
-`;
+    <style>
+    span::before {
+      content: "any";
+    }
+    </style>
+    <div id="toHide">
+      <a>
+        <p>
+          <span></span>
+        </p>
+      </a>
+    </div>`;
+
   if (await applyElemHideEmulation(test, [selector]))
-  {
     expectHidden(test, testDocument.getElementById("toHide"));
-  }
-
-  test.done();
-}
-
+
+  test.done();
+}
+
+// See issue https://issues.adblockplus.org/ticket/7428
 exports.testPropertySelectorCombinatorQualifier = function(test)
 {
-  runTestCombinatorQualifier(
+  runTestQualifier(
     test,
     "div:-abp-has(> a p > :-abp-properties(content: \"any\"))"
   );
 };
 
-exports.testPropertySelectorCombinatorQualifier2 = function(test)
-{
-  runTestCombinatorQualifier(

[Manish Jethani, 2019/04/02 06:29:10]

Can this (and possibly more tests in the future) be included in
`testPropertySelectorCombinatorQualifier()` and `test.done()` be moved out of
the `runTestCombinatorQualifier()` function?

[hub, 2019/04/02 14:29:11]

Done

+// See issue https://issues.adblockplus.org/ticket/7359
+exports.testPropertySelectorCombinatorQualifierNested = function(test)
+{
+  runTestQualifier(
     test,
-    "div:-abp-has(> a p:-abp-has(> span:-abp-properties(content: \"any\")))"
+    "div:-abp-has(> a p:-abp-has(> :-abp-properties(content: \"any\")))"
   );
 };
 
+// See issue https://issues.adblockplus.org/ticket/7400
+exports.testPropertySelectorIdenticalTypeQualifier = function(test)
+{
+  runTestQualifier(
+    test,
+    "div:-abp-has(span:-abp-properties(content: \"any\"))"
+  );
+};
+
+// See issue https://issues.adblockplus.org/ticket/7400
+exports.testPropertySelectorIdenticalTypeQualifierNested = function(test)
+{
+  runTestQualifier(
+    test,
+    "div:-abp-has(p:-abp-has(span:-abp-properties(content: \"any\")))"
+  );
+};
+
 async function runTestPseudoClassContains(test, selector, expectations)
 {
-  testDocument.body.innerHTML = `  <style type="text/css">
-    body {
-      margin: 0;
-      padding: 0;
-    }
-    .transparent {
-      opacity: 0;
-      position: absolute;
-      display: block;
-    }
-    .zerosize {
-      font-size: 0;
-    }
-    div {
-      display: block;
-    }
-    .a {
-      display: inline-block;
-      white-space: pre-wrap;
-    }
-    .disp_none {
-      display: none;
-    }
-    .vis_hid {
-      visibility: hidden;
-    }
-    .vis_collapse {
-      visibility: collapse;
-    }
-    .same_colour {
-      color: rgb(255,255,255);
-      background-color: rgb(255,255,255);
-    }
-    #label {
-      overflow-wrap: break-word;
-    }
-  </style>
-    <div id="parent">
+  testDocument.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 \ud83d\ude42!</div>
       </div>
       <div id="sibling2">
         <div id="sibling21"><div id="sibling211" class="inside">Ad*</div></div>
       </div>
-      <div id="label"><div id="content"><div class="a transparent">Sp</div><div class="a">Sp</div><div class="a zerosize">S</div><div class="a transparent">on</div><div class="a">on</div><div class="a zerosize">S</div></div></div>
-      <div id="label2"><div class="a vis_hid">Visibility: hidden</div><div class="a">S</div><div class="a vis_collapse">Visibility: collapse</div><div class="a">p</div><div class="a disp_none">Display: none</div><div class="a">o</div><div class="a same_colour">Same colour</div><div class="a">n</div></div>
-      <article id="article"><div style="display: none"><div>Spon</div></div></article>
-      <article id="article2"><div><div>Spon</div></div></article>
     </div>`;
   let elems = {
     parent: testDocument.getElementById("parent"),
     middle: testDocument.getElementById("middle"),
     inside: testDocument.getElementById("inside"),
     sibling: testDocument.getElementById("sibling"),
     sibling2: testDocument.getElementById("sibling2"),
-    toHide: testDocument.getElementById("tohide"),
-    label: testDocument.getElementById("label"),
-    label2: testDocument.getElementById("label2"),
-    article: testDocument.getElementById("article"),
-    article2: testDocument.getElementById("article2")
+    toHide: testDocument.getElementById("tohide")
   };
 
   if (await applyElemHideEmulation(test, [selector]))
     compareExpectations(test, elems, expectations);
 
   test.done();
 }
 
 exports.testPseudoClassContainsText = function(test)
 {
@@ skipping 14 matching lines @@
   let expectations = {
     parent: true,
     middle: true,
     inside: true,
     sibling: false,
     sibling2: true,
     toHide: true
   };
   runTestPseudoClassContains(
     test, "#parent div:-abp-contains(/to\\shide/)", expectations);
-};
-
-exports.testPseudoClassContainsVisibleText = function(test)
-{
-  let expectations = {
-    parent: true,
-    middle: true,
-    inside: true,
-    sibling: true,
-    sibling2: true,
-    toHide: true,
-    label: false,
-    label2: false,
-    article: true,
-    article2: true
-  };
-  runTestPseudoClassContains(
-    test, "#parent div:-abp-contains-visible(Spon)", expectations);
-};
-
-exports.testPseudoClassContainsVisibleTextParentVisibility = function(test)
-{
-  let expectations = {
-    parent: true,
-    middle: true,
-    inside: true,
-    sibling: true,
-    sibling2: true,
-    toHide: true,
-    label: true,
-    label2: true,
-    article: true,
-    article2: false
-  };
-  runTestPseudoClassContains(
-    test, "article:-abp-contains-visible(Spon)", expectations);
 };
 
 exports.testPseudoClassContainsRegexpIFlag = function(test)
 {
   let expectations = {
     parent: true,
     middle: true,
     inside: true,
     sibling: false,
     sibling2: true,
@@ skipping 469 matching lines @@
     {
       if (element.id == "n2" || element.id == "n2_3")
         expectProcessed(test, element, element.id);
       else
         expectNotProcessed(test, element, element.id);
     }
   }
 
   test.done();
 };