Merge pull request #6701 from angular/fix_jasmine

Fix jasmine: message is optional in CustomMatcherResult.
This commit is contained in:
Alex Eagle committed 2015-11-10 12:56:37 -08:00
commit 785c18f0c8
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -813,7 +813,7 @@ var customMatchers: jasmine.CustomMatcherFactories = {
if (expected === undefined) {
expected = '';
}
var result: jasmine.CustomMatcherResult = { pass: false, message: ''};
var result: jasmine.CustomMatcherResult = { pass: false };
result.pass = util.equals(actual.hyuk, "gawrsh" + expected, customEqualityTesters);
+1 -1
View File
@@ -129,7 +129,7 @@ declare module jasmine {
interface CustomMatcherResult {
pass: boolean;
message: string;
message?: string;
}
interface MatchersUtil {