github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5545 from zacharydenton/patch-1

Browse Source 
Improve error message when value is null.
This commit is contained in:
Sashko Stubailo
2015-10-26 12:21:55 -07:00
parent 2dee90c577 a7d90f6b59
commit 6cdd344e7f
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/check/match.js
View File

@@ -152,7 +152,7 @@ var testSubtree = function (value, pattern) {
if (typeof value === typeofChecks[i][1])
return false;
return {
message: "Expected " + typeofChecks[i][1] + ", got " + typeof value,
message: "Expected " + typeofChecks[i][1] + ", got " + (value === null ? "null" : typeof value),
path: ""
};
}

31
packages/check/match_test.js
View File

@@ -282,6 +282,37 @@ Tinytest.add("check - Match error path", function (test) {
match({ "return": 0 }, { "return": String }, "[\"return\"]");
});
Tinytest.add("check - Match error message", function (test) {
var match = function (value, pattern, expectedMessage) {
try {
check(value, pattern);
} catch (err) {
if (err.message !== "Match error: " + expectedMessage)
test.fail({
type: "match-error-message",
message: "The message of Match.Error doesn't match.",
pattern: JSON.stringify(pattern),
value: JSON.stringify(value),
errorMessage: err.message,
expectedErrorMessage: expectedMessage
});
}
};
match(2, String, "Expected string, got number");
match({key: 0}, Number, "Expected number, got object");
match(null, Boolean, "Expected boolean, got null");
match("string", undefined, "Expected undefined, got string");
match(true, null, "Expected null, got true");
match("bar", "foo", "Expected foo, got \"bar\"");
match(3.14, Match.Integer, "Expected Integer, got 3.14");
match(false, [Boolean], "Expected array, got false");
match([null, null], [String], "Expected string, got null in field [0]");
match(2, {key: 2}, "Expected object, got number");
match(null, {key: 2}, "Expected object, got null");
match(new Date, {key: 2}, "Expected plain object");
});
// Regression test for https://github.com/meteor/meteor/issues/2136
Meteor.isServer && Tinytest.addAsync("check - non-fiber check works", function (test, onComplete) {
var Fiber = Npm.require('fibers');