honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(upgrade): preserve $interval.flush when ngMocks is being used (#30229)

Browse Source 
Also preserve any other properties that the user may have decorated
$interval with.

PR Close #30229
This commit is contained in:
Emily Wenberg 2019-05-01 11:35:41 -07:00 committed by Jessica Janiuk
parent 81f61b276b
commit 98fc4f4b2f
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/upgrade/static/src/upgrade_module.ts
View File

@ -116,7 +116,7 @@ import {NgAdapterInjector} from './util';
* *
* {@example upgrade/static/ts/full/module.ts region='bootstrap-ng1'} * {@example upgrade/static/ts/full/module.ts region='bootstrap-ng1'}
* *
* Finally, kick off the whole process, by bootstraping your top level Angular `NgModule`. * Finally, kick off the whole process, by bootstrapping your top level Angular `NgModule`.
* *
* {@example upgrade/static/ts/full/module.ts region='bootstrap-ng2'} * {@example upgrade/static/ts/full/module.ts region='bootstrap-ng2'}
* *
@ -236,7 +236,17 @@ export class UpgradeModule {
}); });
}; };
(wrappedInterval as any)['cancel'] = intervalDelegate.cancel; (Object.keys(intervalDelegate) as (keyof IIntervalService)[])
.forEach(prop => (wrappedInterval as any)[prop] = intervalDelegate[prop]);
// the `flush` method will be present when ngMocks is used
if (intervalDelegate.hasOwnProperty('flush')) {
(wrappedInterval as any)['flush'] = () => {
(intervalDelegate as any)['flush']();
return wrappedInterval;
};
}
return wrappedInterval; return wrappedInterval;
} }
]); ]);