| Index: test/matcher.js |
| =================================================================== |
| --- a/test/matcher.js |
| +++ b/test/matcher.js |
| @@ -83,18 +83,18 @@ |
| test.equal(result, expected, "combinedMatch(" + location + ", " + contentType + ", " + docDomain + ", " + (thirdParty ? "third-party" : "first-party") + ", " + (sitekey || "no-sitekey") + ", " + (specificOnly ? "specificOnly" : "not-specificOnly") + ") with:\n" + filters.join("\n")); |
| // Generic whitelisting rules can match for specificOnly searches, so we |
| // can't easily know which rule will match for these whitelisting tests |
| if (specificOnly) |
| continue; |
| // For next run: add whitelisting filters for filters that aren't already |
| - filters = filters.map(text => text.substr(0, 2) == "@@" ? text : "@@" + text); |
| - if (expected && expected.substr(0, 2) != "@@") |
| + filters = filters.map(text => text.substring(0, 2) == "@@" ? text : "@@" + text); |
| + if (expected && expected.substring(0, 2) != "@@") |
| expected = "@@" + expected; |
| } |
| } |
| function checkSearch(test, filters, location, contentType, docDomain, |
| thirdParty, sitekey, specificOnly, filterType, |
| expected) |
| { |