mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-10-31 15:42:59 +00:00
Code Issues Releases Wiki Activity

Refactored filter tests to use nifty spyOn method (#5550)

Browse Source
This commit is contained in:
Cameron Fischer
2021-03-18 04:57:21 -04:00
committed by GitHub
parent a6958bfe85
commit 427eb6d085
1 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
editions/test/tiddlers/tests/test-filters.js
View File

@@ -14,22 +14,6 @@ Tests the filtering mechanism.
/* global $tw, require */ /* global $tw, require */
"use strict"; "use strict";
// This wrapper method is used to collect warnings which should be emitted
// by certain deprecated tests.
function collectLog(block) {
var messages = [];
var oldLog = console.log;
console.log = function(a) {
messages.push(Array.prototype.join.call(arguments, " "));
}
try {
block();
} finally {
console.log = oldLog;
}
return messages;
};
describe("Filter tests", function() { describe("Filter tests", function() {
// Test filter parsing // Test filter parsing
@@ -265,14 +249,12 @@ function runTests(wiki) {
// The following 2 tests should write a log -> WARNING: Filter modifier has a deprecated regexp operand XXXX // The following 2 tests should write a log -> WARNING: Filter modifier has a deprecated regexp operand XXXX
// The test should pass anyway. // The test should pass anyway.
it("should handle the field operator with a regular expression operand", function() { it("should handle the field operator with a regular expression operand", function() {
var warnings = collectLog(function() { spyOn(console, 'log');
expect(wiki.filterTiddlers("[modifier/JoeBloggs/]").join(",")).toBe("TiddlerOne"); expect(wiki.filterTiddlers("[modifier/JoeBloggs/]").join(",")).toBe("TiddlerOne");
}); expect(console.log).toHaveBeenCalledWith("WARNING: Filter", "modifier", "has a deprecated regexp operand", /JoeBloggs/);
expect(warnings).toEqual(["WARNING: Filter modifier has a deprecated regexp operand /JoeBloggs/"]); console.log.calls.reset();
warnings = collectLog(function() {
expect(wiki.filterTiddlers("[modifier/Jo/]").join(",")).toBe("TiddlerOne,$:/TiddlerTwo,Tiddler Three,a fourth tiddler,one"); expect(wiki.filterTiddlers("[modifier/Jo/]").join(",")).toBe("TiddlerOne,$:/TiddlerTwo,Tiddler Three,a fourth tiddler,one");
}); expect(console.log).toHaveBeenCalledWith("WARNING: Filter", "modifier", "has a deprecated regexp operand", /Jo/);
expect(warnings).toEqual(["WARNING: Filter modifier has a deprecated regexp operand /Jo/"]);
}); });
it("should handle the prefix operator", function() { it("should handle the prefix operator", function() {