Issue 6886 - Return snippet filters instead of just scripts

test/snippets.js

Index: test/snippets.js
===================================================================
--- a/test/snippets.js
+++ b/test/snippets.js
@@ -43,18 +43,18 @@
   function testScriptMatches(description, filters, domain, expectedMatches)
   {
     for (let filter of filters.map(Filter.fromText))
     {
       if (filter instanceof SnippetFilter)
         Snippets.add(filter);
     }
 
-    let matches = Snippets.getScriptsForDomain(domain);
-    test.deepEqual(matches.sort(), expectedMatches.sort(), description);
+    let matches = Snippets.getSnippetsForDomain(domain);

[Manish Jethani, 2018/08/27 05:40:10]

I think it would be cleaner to keep the call to `test.deepEqual` free of this
additional mapping, so perhaps we could do this:

  let matches = Snippets.getFiltersForDomain(domain).map(({script}) => script);

[hub, 2018/08/27 12:14:35]

Done.

+    test.deepEqual(matches.map(elem => elem.script).sort(), expectedMatches.sort(), description);
 
     Snippets.clear();
   }
 
   testScriptMatches(
     "Ignore generic filters",
     [
       "#$#foo-1", "example.com#$#foo-2",
@@ -83,18 +83,17 @@
 
   test.done();
 };
 
 exports.testSnippetFiltersContainer = function(test)
 {
   function compareRules(description, domain, expectedMatches)
   {
-    let result = Snippets.getScriptsForDomain(domain);
-    expectedMatches = expectedMatches.map(filter => filter.script);
+    let result = Snippets.getSnippetsForDomain(domain);
     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);