Issue 6034 - :-abp-contains() accept a regular expression

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 356 matching lines @@
   }
 }
 
 function runTestPseudoClassHasSelectorWithHasAndWithSuffixSibling(test, selector, expectations)
 {
   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</div>
+        <div id="tohide"><span>to hide</span></div>
       </div>
       <div id="sibling2">
         <div id="sibling21"><div id="sibling211" class="inside"></div></div>
       </div>
     </div>`;
   let elems = {
     parent: testDocument.getElementById("parent"),
     middle: testDocument.getElementById("middle"),
     inside: testDocument.getElementById("inside"),
     sibling: testDocument.getElementById("sibling"),
@@ skipping 32 matching lines @@
     middile: true,
     inside: true,
     sibling: true,
     sibling2: true,
     toHide: false
   };
   runTestPseudoClassHasSelectorWithHasAndWithSuffixSibling(
     test, "div:-abp-has(:-abp-has(> div.inside)) + div > div", expectations);
 };
 
+exports.testPseudoClassHasSelectorWithHasAndWithSuffixSibling3 = function(test)
+{
+  let expectations = {
+    parent: true,
+    middile: true,
+    inside: true,
+    sibling: true,
+    sibling2: true,
+    toHide: false
+  };
+  runTestPseudoClassHasSelectorWithHasAndWithSuffixSibling(
+    test, "div:-abp-has(> div:-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);
 };
 
-function runTestPseudClassContains(test, selector, expectations)

[kzar, 2018/01/08 15:29:35]

Nit: Typo "Pseudo"

[hub, 2018/01/08 16:29:51]

Done.

+exports.testPseudoClassHasSelectorWithSuffixSiblingContains = function(test)
+{
+  let expectations = {
+    parent: true,
+    middile: true,
+    inside: true,
+    sibling: true,
+    sibling2: true,
+    toHide: true
+  };
+  runTestPseudoClassHasSelectorWithHasAndWithSuffixSibling(
+    test, "div:-abp-has(> span:-abp-contains(Advertisment))", expectations);
+};
+
+function runTestPseudoClassContains(test, selector, expectations)
 {
   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</div>
       </div>
       <div id="sibling2">
-        <div id="sibling21"><div id="sibling211" class="inside"></div></div>
+        <div id="sibling21"><div id="sibling211" class="inside">Ad*</div></div>
       </div>
     </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")
   };
 
   applyElemHideEmulation(
     [selector]
   ).then(
     () => compareExpectations(test, elems, expectations)
   ).catch(unexpectedError.bind(test)).then(() => test.done());
 }
 
 exports.testPseudoClassContainsText = function(test)
 {
   let expectations = {
     parent: true,
     middle: true,
     inside: true,
     sibling: false,
     sibling2: true,
     toHide: false
   };
-  runTestPseudClassContains(
+  runTestPseudoClassContains(
     test, "#parent div:-abp-contains(to hide)", expectations);
 };
 
 exports.testPseudoClassContainsRegexp = function(test)
 {
   let expectations = {
     parent: true,
     middle: true,
     inside: true,
     sibling: false,
     sibling2: true,
     toHide: false
   };
-  runTestPseudClassContains(
+  runTestPseudoClassContains(
     test, "#parent div:-abp-contains(/to\\shide/)", expectations);
+};
+
+exports.testPseudoClassContainsRegexpIFlag = function(test)
+{
+  let expectations = {
+    parent: true,
+    middle: true,
+    inside: true,
+    sibling: false,
+    sibling2: true,
+    toHide: false
+  };
+  runTestPseudoClassContains(
+    test, "#parent div:-abp-contains(/to\\sHide/i)", expectations);
+};
+
+exports.testPseudoClassContainsWildcardNoMatch = function(test)
+{
+  let expectations = {
+    parent: true,
+    middle: true,
+    inside: true,
+    sibling: true,
+    sibling2: true,
+    toHide: true
+  };
+  // this filter shouldn't match anything as "*" has no meaning.
+  runTestPseudoClassContains(
+    test, "#parent div:-abp-contains(to *hide)", expectations);
+};
+
+exports.testPseudoClassContainsWildcardMatch = function(test)
+{
+  let expectations = {
+    parent: true,
+    middle: true,
+    inside: true,
+    sibling: true,
+    sibling2: false,
+    toHide: true
+  };
+  runTestPseudoClassContains(
+    test, "#parent div:-abp-contains(Ad*)", expectations);
 };
 
 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(() =>
   {
@@ skipping 102 matching lines @@
     expectVisible(test, child2);
     return timeout(REFRESH_INTERVAL);
   }).then(() =>
   {
     expectHidden(test, parent);
     expectVisible(test, child);
     expectHidden(test, sibling);
     expectVisible(test, child2);
   }).catch(unexpectedError.bind(test)).then(() => test.done());
 };