Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: test/snippets.js

Issue 29865583: Issue 6886 - Return snippet filters instead of just scripts (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Created Aug. 27, 2018, 3:08 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« lib/snippets.js ('K') | « lib/snippets.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-present eyeo GmbH 3 * Copyright (C) 2006-present eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 30 matching lines...) Expand all
41 exports.testDomainRestrictions = function(test) 41 exports.testDomainRestrictions = function(test)
42 { 42 {
43 function testScriptMatches(description, filters, domain, expectedMatches) 43 function testScriptMatches(description, filters, domain, expectedMatches)
44 { 44 {
45 for (let filter of filters.map(Filter.fromText)) 45 for (let filter of filters.map(Filter.fromText))
46 { 46 {
47 if (filter instanceof SnippetFilter) 47 if (filter instanceof SnippetFilter)
48 Snippets.add(filter); 48 Snippets.add(filter);
49 } 49 }
50 50
51 let matches = Snippets.getScriptsForDomain(domain); 51 let matches = Snippets.getSnippetsForDomain(domain);
Manish Jethani 2018/08/27 05:40:10 I think it would be cleaner to keep the call to `t
hub 2018/08/27 12:14:35 Done.
52 test.deepEqual(matches.sort(), expectedMatches.sort(), description); 52 test.deepEqual(matches.map(elem => elem.script).sort(), expectedMatches.sort (), description);
53 53
54 Snippets.clear(); 54 Snippets.clear();
55 } 55 }
56 56
57 testScriptMatches( 57 testScriptMatches(
58 "Ignore generic filters", 58 "Ignore generic filters",
59 [ 59 [
60 "#$#foo-1", "example.com#$#foo-2", 60 "#$#foo-1", "example.com#$#foo-2",
61 "~example.com#$#foo-3" 61 "~example.com#$#foo-3"
62 ], 62 ],
(...skipping 18 matching lines...) Expand all
81 ["foo-2"] 81 ["foo-2"]
82 ); 82 );
83 83
84 test.done(); 84 test.done();
85 }; 85 };
86 86
87 exports.testSnippetFiltersContainer = function(test) 87 exports.testSnippetFiltersContainer = function(test)
88 { 88 {
89 function compareRules(description, domain, expectedMatches) 89 function compareRules(description, domain, expectedMatches)
90 { 90 {
91 let result = Snippets.getScriptsForDomain(domain); 91 let result = Snippets.getSnippetsForDomain(domain);
92 expectedMatches = expectedMatches.map(filter => filter.script);
93 test.deepEqual(result.sort(), expectedMatches.sort(), description); 92 test.deepEqual(result.sort(), expectedMatches.sort(), description);
94 } 93 }
95 94
96 let domainFilter = Filter.fromText("example.com#$#filter1"); 95 let domainFilter = Filter.fromText("example.com#$#filter1");
97 let subdomainFilter = Filter.fromText("www.example.com#$#filter2"); 96 let subdomainFilter = Filter.fromText("www.example.com#$#filter2");
98 let otherDomainFilter = Filter.fromText("other.example.com#$#filter3"); 97 let otherDomainFilter = Filter.fromText("other.example.com#$#filter3");
99 98
100 Snippets.add(domainFilter); 99 Snippets.add(domainFilter);
101 Snippets.add(subdomainFilter); 100 Snippets.add(subdomainFilter);
102 Snippets.add(otherDomainFilter); 101 Snippets.add(otherDomainFilter);
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 // between executions. In the example below, assertFoo does not find 456 but 280 // between executions. In the example below, assertFoo does not find 456 but
282 // it doesn't find 123 either. It's the initial value 0. 281 // it doesn't find 123 either. It's the initial value 0.
283 new Function( 282 new Function(
284 compileScript("setFoo 456; assertFoo 0", [ 283 compileScript("setFoo 456; assertFoo 0", [
285 ...libraries, "let foo = 1; exports.setFoo = value => { foo = value; };" 284 ...libraries, "let foo = 1; exports.setFoo = value => { foo = value; };"
286 ]) 285 ])
287 )(); 286 )();
288 287
289 test.done(); 288 test.done();
290 }; 289 };
OLDNEW
« lib/snippets.js ('K') | « lib/snippets.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld