cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(core): use addCustomEqualityTester instead of overriding toEqual (#22983)

Browse Source 
This propagates other custom equality testers added by users. Additionally, if
an Angular project is using jasmine 2.6+, it will allow Jasmine's custom object
differ to print out pretty test error messages.

fixes #22939

PR Close #22983
This commit is contained in:
Kevin Villela
2018-03-25 12:11:49 -07:00
committed by Miško Hevery
parent c94a2c9e3f
commit 0922228024
3 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
packages/platform-browser/testing/src/matchers.ts
View File

@ -112,29 +112,23 @@ export const expect: (actual: any) => NgMatchers = <any>_global.expect;
};
_global.beforeEach(function() {
jasmine.addMatchers({
// Custom handler for Map as Jasmine does not support it yet
toEqual: function(util) {
return {
compare: function(actual: any, expected: any) {
return {pass: util.equals(actual, expected, [compareMap])};
}
};
function compareMap(actual: any, expected: any): boolean {
if (actual instanceof Map) {
let pass = actual.size === expected.size;
if (pass) {
actual.forEach((v: any, k: any) => { pass = pass && util.equals(v, expected.get(k)); });
}
return pass;
} else {
// TODO(misko): we should change the return, but jasmine.d.ts is not null safe
return undefined !;
}
// Custom handler for Map as we use Jasmine 2.4, and support for maps is not
// added until Jasmine 2.6.
jasmine.addCustomEqualityTester(function compareMap(actual: any, expected: any): boolean {
if (actual instanceof Map) {
let pass = actual.size === expected.size;
if (pass) {
actual.forEach((v: any, k: any) => {
pass = pass && jasmine.matchersUtil.equals(v, expected.get(k));
});
}
},
return pass;
} else {
// TODO(misko): we should change the return, but jasmine.d.ts is not null safe
return undefined !;
}
});
jasmine.addMatchers({
toBePromise: function() {
return {
compare: function(actual: any) {