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

martiansnoop · thePunderWoman · commit 87dc8511ccb9 · 2021-04-23T09:44:53.000-07:00
Also preserve any other properties that the user may have decorated $interval with. PR Close #30229
diff --git a/packages/upgrade/static/src/upgrade_module.ts b/packages/upgrade/static/src/upgrade_module.ts
@@ -116,7 +116,7 @@ import {NgAdapterInjector} from './util';
  *
  * {@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'}
  *
@@ -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;
                 }
               ]);

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ import {NgAdapterInjector} from './util';`
`116`	`116`	`*`
`117`	`117`	`* {@example upgrade/static/ts/full/module.ts region='bootstrap-ng1'}`
`118`	`118`	`*`
`119`		- * Finally, kick off the whole process, by bootstraping your top level Angular `NgModule`.
	`119`	+ * Finally, kick off the whole process, by bootstrapping your top level Angular `NgModule`.
`120`	`120`	`*`
`121`	`121`	`* {@example upgrade/static/ts/full/module.ts region='bootstrap-ng2'}`
`122`	`122`	`*`
`@@ -236,7 +236,17 @@ export class UpgradeModule {`
`236`	`236`	`});`
`237`	`237`	`};`
`238`	`238`
`239`		`- (wrappedInterval as any)['cancel'] = intervalDelegate.cancel;`
	`239`	`+ (Object.keys(intervalDelegate) as (keyof IIntervalService)[])`
	`240`	`+ .forEach(prop => (wrappedInterval as any)[prop] = intervalDelegate[prop]);`
	`241`	`+`
	`242`	+ // the `flush` method will be present when ngMocks is used
	`243`	`+ if (intervalDelegate.hasOwnProperty('flush')) {`
	`244`	`+ (wrappedInterval as any)['flush'] = () => {`
	`245`	`+ (intervalDelegate as any)['flush']();`
	`246`	`+ return wrappedInterval;`
	`247`	`+ };`
	`248`	`+ }`
	`249`	`+`
`240`	`250`	`return wrappedInterval;`
`241`	`251`	`}`
`242`	`252`	`]);`