Issue 6538, 6781 - Implement script parsing for snippets

test/snippets.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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
 const {createSandbox} = require("./_common");
 
-let SnippetFilter = null;
 let Snippets = null;
 let parseScript = null;
-let ElemHide = null;
 let Filter = null;
 
 exports.setUp = function(callback)
 {
   let sandboxedRequire = createSandbox();
   (
-    {Filter, SnippetFilter} = sandboxedRequire("../lib/filterClasses"),
-    {ElemHide} = sandboxedRequire("../lib/elemHide"),
+    {Filter} = sandboxedRequire("../lib/filterClasses"),
     {Snippets, parseScript} = sandboxedRequire("../lib/snippets")
   );
 
   callback();
 };
 
 exports.testDomainRestrictions = function(test)
 {
-  function testSelectorMatches(description, filters, domain, expectedMatches)
+  function testScriptMatches(description, filters, domain, expectedMatches)
   {
     for (let filter of filters)
-    {
-      filter = Filter.fromText(filter);
-      if (filter instanceof SnippetFilter)
-        Snippets.add(filter);
-      else
-        ElemHide.add(filter);
-    }
+      Snippets.add(Filter.fromText(filter));
 
-    let matches = Snippets.getScriptsForDomain(domain)
-                  .map(filter => filter.text);
+    let matches = Snippets.getScriptsForDomain(domain);
     test.deepEqual(matches.sort(), expectedMatches.sort(), description);
 
     Snippets.clear();
-    ElemHide.clear();
   }
 
-  testSelectorMatches(
-    "Ignore selectors with exceptions",
-    [
-      "example.com#$#foo",
-      "example.com#$#bar",
-      "example.com#@#foo"
-    ],
-    "example.com",
-    ["example.com#$#bar"]
-  );
-  testSelectorMatches(
+  testScriptMatches(
     "Ignore filters that include parent domain but exclude subdomain",
     [
       "~www.example.com,example.com#$#foo"
     ],
     "www.example.com",
     []
   );
-  testSelectorMatches(
-    "Ignore filters with parent domain if exception matches subdomain",
-    [
-      "www.example.com#@#foo",
-      "example.com#$#foo"
-    ],
-    "www.example.com",
-    []
-  );
-  testSelectorMatches(
+  testScriptMatches(
     "Ignore filters for other subdomain",
     [
       "www.example.com#$#foo",
       "other.example.com#$#foo"
     ],
     "other.example.com",
-    ["other.example.com#$#foo"]
+    ["foo"]
   );
 
   test.done();
 };
 
 exports.testSnippetFiltersContainer = function(test)
 {
   function compareRules(description, domain, expectedMatches)
   {
-    let result = Snippets.getScriptsForDomain(domain)
-                 .map(filter => filter.text);
-    expectedMatches = expectedMatches.map(filter => filter.text);
+    let result = Snippets.getScriptsForDomain(domain);
+    expectedMatches = expectedMatches.map(filter => filter.script);
     test.deepEqual(result.sort(), expectedMatches.sort(), description);
   }
 
   let domainFilter = Filter.fromText("example.com#$#filter1");
   let subdomainFilter = Filter.fromText("www.example.com#$#filter2");
   let otherDomainFilter = Filter.fromText("other.example.com#$#filter3");
 
   Snippets.add(domainFilter);
   Snippets.add(subdomainFilter);
   Snippets.add(otherDomainFilter);
@@ skipping 54 matching lines @@
   checkParsedScript("Script with argument containing Unicode escape sequences",
                     "foo \\u0062\\ud83d\\ude42r " +
                     "'l\\ud83d\\ude02mbd\\ud83d\\ude02'", [
                       ["foo", "b\ud83d\ude42r", "l\ud83d\ude02mbd\ud83d\ude02"]
                     ]);
   checkParsedScript("Script with multiple commands", "foo; bar",
                     [["foo"], ["bar"]]);
   checkParsedScript("Script with multiple commands and multiple arguments each",
                     "foo 1 Hello; bar world! #",
                     [["foo", "1", "Hello"], ["bar", "world!", "#"]]);
   checkParsedScript("Script with multiple commands and multiple " +

[Manish Jethani, 2018/04/26 16:22:09]

Unrelated indentation update.

                     "escaped and quoted arguments each",
                     "foo 1 'Hello, \\'Tommy\\'!' ;" +
                     "bar Hi!\\ How\\ are\\ you? http://example.com", [
                       ["foo", "1", "Hello, 'Tommy'!"],
                       ["bar", "Hi! How are you?", "http://example.com"]
                     ]);
   checkParsedScript("Script with command names containing " +
                     "whitespace (spaces, tabs, newlines, etc.), " +
                     "quotes, and semicolons",
                     "fo\\'\\ \\ \\\t\\\n\\;o 1 2 3; 'b a  r' 1 2",
                     [["fo'  \t\n;o", "1", "2", "3"], ["b a  r", "1", "2"]]);
   checkParsedScript("Script containing Unicode composite characters",
                     "f\ud83d\ude42\ud83d\ude42 b\ud83d\ude02r",
                     [["f\ud83d\ude42\ud83d\ude42", "b\ud83d\ude02r"]]);
   checkParsedScript("Script with no-op commands", "foo; ;;; ;  ; bar 1",
                     [["foo"], ["bar", "1"]]);
 
   test.done();
 };