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

Delta Between Two Patch Sets: test/cssRules.js

Issue 29354864: Issue 4223 - Migrate some more of adblockplustests (Closed)
Left Patch Set: Created Sept. 25, 2016, 1:38 p.m.
Right Patch Set: Addressed final nit Created Oct. 4, 2016, 12:16 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « test/_common.js ('k') | test/domainRestrictions.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 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
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 "use strict"; 18 "use strict";
19 19
20 let common = require("common"); 20 let {createSandbox} = require("./_common");
21 21
22 let {CSSPropertyFilter} = require("filterClasses"); 22 let CSSPropertyFilter = null;
23 let {CSSRules} = require("cssRules"); 23 let CSSRules = null;
24 let {ElemHide} = require("elemHide"); 24 let ElemHide = null;
25 let {Filter} = require("filterClasses"); 25 let Filter = null;
26 26
27 exports.setUp = function(callback) 27 exports.setUp = function(callback)
28 { 28 {
29 common.prepareFilterComponents.call(this, true); 29 let sandboxedRequire = createSandbox();
Wladimir Palant 2016/09/26 09:40:58 Saving and restoring data is a hack that was neces
kzar 2016/09/29 15:53:09 Cool idea, it works great as you suggested except
30 (
31 {Filter, CSSPropertyFilter} = sandboxedRequire("../lib/filterClasses"),
32 {CSSRules} = sandboxedRequire("../lib/cssRules"),
33 {ElemHide} = sandboxedRequire("../lib/elemHide")
34 );
30 35
31 callback(); 36 callback();
32 }; 37 };
33
34 exports.tearDown = function(callback)
35 {
36 common.restoreFilterComponents.call(this);
37
38 callback();
39 }
40 38
41 exports.testDomainRestrictions = function(test) 39 exports.testDomainRestrictions = function(test)
42 { 40 {
43 function testSelectorMatches(description, filters, domain, expectedMatches) 41 function testSelectorMatches(description, filters, domain, expectedMatches)
44 { 42 {
45 for (let filter of filters) 43 for (let filter of filters)
46 { 44 {
47 filter = Filter.fromText(filter); 45 filter = Filter.fromText(filter);
48 if (filter instanceof CSSPropertyFilter) 46 if (filter instanceof CSSPropertyFilter)
49 CSSRules.add(filter); 47 CSSRules.add(filter);
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 127
130 CSSRules.clear(); 128 CSSRules.clear();
131 compareRules( 129 compareRules(
132 "Return no filters after clearing", 130 "Return no filters after clearing",
133 "www.example.com", 131 "www.example.com",
134 [] 132 []
135 ); 133 );
136 134
137 test.done(); 135 test.done();
138 }; 136 };
LEFTRIGHT

Powered by Google App Engine
This is Rietveld