Skip to content

Commit 5a3e206

Browse files
crisbetojosephperrott
authored andcommitted
refactor: remove calls to deprecated rxjs subscribe signature (#16164)
1 parent 3b1ae05 commit 5a3e206

File tree

14 files changed

+31
-32
lines changed

14 files changed

+31
-32
lines changed

src/cdk/drag-drop/directives/drag.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,8 +434,7 @@ describe('CdkDrag', () => {
434434
fixture.detectChanges();
435435

436436
const spy = jasmine.createSpy('move spy');
437-
const subscription = fixture.componentInstance.dragInstance.moved
438-
.subscribe(undefined, undefined, spy);
437+
const subscription = fixture.componentInstance.dragInstance.moved.subscribe({complete: spy});
439438

440439
fixture.destroy();
441440
expect(spy).toHaveBeenCalled();

src/cdk/drag-drop/drag-drop-registry.spec.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,8 @@ describe('DragDropRegistry', () => {
143143
it('should complete the pointer event streams on destroy', () => {
144144
const pointerUpSpy = jasmine.createSpy('pointerUp complete spy');
145145
const pointerMoveSpy = jasmine.createSpy('pointerMove complete spy');
146-
const pointerUpSubscription = registry.pointerUp.subscribe(undefined, undefined, pointerUpSpy);
147-
const pointerMoveSubscription =
148-
registry.pointerMove.subscribe(undefined, undefined, pointerMoveSpy);
146+
const pointerUpSubscription = registry.pointerUp.subscribe({complete: pointerUpSpy});
147+
const pointerMoveSubscription = registry.pointerMove.subscribe({complete: pointerMoveSpy});
149148

150149
registry.ngOnDestroy();
151150

src/cdk/layout/breakpoints-observer.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ describe('BreakpointObserver', () => {
7171

7272
it('completes all events when the breakpoint manager is destroyed', fakeAsync(() => {
7373
const firstTest = jasmine.createSpy('test1');
74-
breakpointObserver.observe('test1').subscribe(undefined, undefined, firstTest);
74+
breakpointObserver.observe('test1').subscribe({complete: firstTest});
7575
const secondTest = jasmine.createSpy('test2');
76-
breakpointObserver.observe('test2').subscribe(undefined, undefined, secondTest);
76+
breakpointObserver.observe('test2').subscribe({complete: secondTest});
7777

7878
flush();
7979
expect(firstTest).not.toHaveBeenCalled();

src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ describe('OverlayKeyboardDispatcher', () => {
9090
const overlayRef = overlay.create();
9191
const completeSpy = jasmine.createSpy('keydown complete spy');
9292

93-
overlayRef.keydownEvents().subscribe(undefined, undefined, completeSpy);
93+
overlayRef.keydownEvents().subscribe({complete: completeSpy});
9494

9595
overlayRef.dispose();
9696

src/cdk/overlay/overlay.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ describe('Overlay', () => {
261261
let attachCompleteSpy = jasmine.createSpy('attachCompleteSpy spy');
262262
let detachCompleteSpy = jasmine.createSpy('detachCompleteSpy spy');
263263

264-
overlayRef.attachments().subscribe(undefined, undefined, attachCompleteSpy);
265-
overlayRef.detachments().subscribe(disposeSpy, undefined, detachCompleteSpy);
264+
overlayRef.attachments().subscribe({complete: attachCompleteSpy});
265+
overlayRef.detachments().subscribe({next: disposeSpy, complete: detachCompleteSpy});
266266

267267
overlayRef.attach(componentPortal);
268268
overlayRef.dispose();
@@ -276,8 +276,8 @@ describe('Overlay', () => {
276276
let overlayRef = overlay.create();
277277
let callbackOrder: string[] = [];
278278

279-
overlayRef.attachments().subscribe(undefined, undefined, () => callbackOrder.push('attach'));
280-
overlayRef.detachments().subscribe(undefined, undefined, () => callbackOrder.push('detach'));
279+
overlayRef.attachments().subscribe({complete: () => callbackOrder.push('attach')});
280+
overlayRef.detachments().subscribe({complete: () => callbackOrder.push('detach')});
281281

282282
overlayRef.attach(componentPortal);
283283
overlayRef.dispose();
@@ -677,7 +677,7 @@ describe('Overlay', () => {
677677

678678
let completeHandler = jasmine.createSpy('backdrop complete handler');
679679

680-
overlayRef.backdropClick().subscribe(undefined, undefined, completeHandler);
680+
overlayRef.backdropClick().subscribe({complete: completeHandler});
681681
overlayRef.dispose();
682682

683683
expect(completeHandler).toHaveBeenCalled();

src/cdk/overlay/position/connected-position-strategy.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ describe('ConnectedPositionStrategy', () => {
413413

414414
const completeHandler = jasmine.createSpy('complete handler');
415415

416-
positionStrategy.onPositionChange.subscribe(undefined, undefined, completeHandler);
416+
positionStrategy.onPositionChange.subscribe({complete: completeHandler});
417417
attachOverlay(positionStrategy);
418418
positionStrategy.dispose();
419419

src/cdk/scrolling/scroll-dispatcher.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ describe('ScrollDispatcher', () => {
9393

9494
it('should complete the `scrolled` stream on destroy', () => {
9595
const completeSpy = jasmine.createSpy('complete spy');
96-
const subscription = scroll.scrolled(0).subscribe(undefined, undefined, completeSpy);
96+
const subscription = scroll.scrolled(0).subscribe({complete: completeSpy});
9797

9898
scroll.ngOnDestroy();
9999

@@ -105,7 +105,7 @@ describe('ScrollDispatcher', () => {
105105
it('should complete the scrollable stream when it is destroyed', () => {
106106
const scrollable = fixture.componentInstance.scrollable;
107107
const spy = jasmine.createSpy('complete spy');
108-
const subscription = scrollable.elementScrolled().subscribe(undefined, undefined, spy);
108+
const subscription = scrollable.elementScrolled().subscribe({complete: spy});
109109

110110
fixture.destroy();
111111
expect(spy).toHaveBeenCalled();

src/cdk/text-field/autofill.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ describe('AutofillMonitor', () => {
143143
const autofillStream = autofillMonitor.monitor(element);
144144
const spy = jasmine.createSpy('autofillStream complete');
145145

146-
autofillStream.subscribe(undefined, undefined, spy);
146+
autofillStream.subscribe({complete: spy});
147147
expect(spy).not.toHaveBeenCalled();
148148

149149
autofillMonitor.stopMonitoring(element);

src/material/chips/chip-list.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ describe('MatChipList', () => {
544544

545545
it('should complete the stateChanges stream on destroy', () => {
546546
const spy = jasmine.createSpy('stateChanges complete');
547-
const subscription = chipListInstance.stateChanges.subscribe(undefined, undefined, spy);
547+
const subscription = chipListInstance.stateChanges.subscribe({complete: spy});
548548

549549
fixture.destroy();
550550
expect(spy).toHaveBeenCalled();

src/material/core/option/option.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ describe('MatOption component', () => {
2626
const optionInstance: MatOption =
2727
fixture.debugElement.query(By.directive(MatOption)).componentInstance;
2828
const completeSpy = jasmine.createSpy('complete spy');
29-
const subscription = optionInstance._stateChanges.subscribe(undefined, undefined, completeSpy);
29+
const subscription = optionInstance._stateChanges.subscribe({complete: completeSpy});
3030

3131
fixture.destroy();
3232
expect(completeSpy).toHaveBeenCalled();

src/material/datepicker/calendar.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ describe('MatCalendar', () => {
148148

149149
it('should complete the stateChanges stream', () => {
150150
const spy = jasmine.createSpy('complete spy');
151-
const subscription = calendarInstance.stateChanges.subscribe(undefined, undefined, spy);
151+
const subscription = calendarInstance.stateChanges.subscribe({complete: spy});
152152

153153
fixture.destroy();
154154

src/material/menu/menu-trigger.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,10 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy {
294294
// Interrupt if the content got re-attached.
295295
takeUntil(menu.lazyContent._attached)
296296
)
297-
.subscribe(() => menu.lazyContent!.detach(), undefined, () => {
297+
.subscribe({
298+
next: () => menu.lazyContent!.detach(),
298299
// No matter whether the content got re-attached, reset the menu.
299-
this._resetMenu();
300+
complete: () => this._resetMenu()
300301
});
301302
} else {
302303
this._resetMenu();

src/material/snack-bar/snack-bar.spec.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ describe('MatSnackBar', () => {
174174
expect(overlayContainerElement.childElementCount)
175175
.toBeGreaterThan(0, 'Expected overlay container element to have at least one child');
176176

177-
snackBarRef.afterDismissed().subscribe(undefined, undefined, dismissCompleteSpy);
177+
snackBarRef.afterDismissed().subscribe({complete: dismissCompleteSpy});
178178

179179
snackBarRef.dismiss();
180180
viewContainerFixture.detectChanges(); // Run through animations for dismissal
@@ -278,7 +278,7 @@ describe('MatSnackBar', () => {
278278
let snackBarRef2 = snackBar.open(simpleMessage, undefined, config2);
279279

280280
viewContainerFixture.detectChanges();
281-
snackBarRef.afterDismissed().subscribe(undefined, undefined, dismissCompleteSpy);
281+
snackBarRef.afterDismissed().subscribe({complete: dismissCompleteSpy});
282282
flush();
283283

284284
expect(dismissCompleteSpy).toHaveBeenCalled();
@@ -344,8 +344,8 @@ describe('MatSnackBar', () => {
344344
const snackBarRef = snackBar.open('Some content', 'Dismiss');
345345
viewContainerFixture.detectChanges();
346346

347-
snackBarRef.afterDismissed().subscribe(undefined, undefined, dismissCompleteSpy);
348-
snackBarRef.onAction().subscribe(undefined, undefined, actionCompleteSpy);
347+
snackBarRef.afterDismissed().subscribe({complete: dismissCompleteSpy});
348+
snackBarRef.onAction().subscribe({complete: actionCompleteSpy});
349349

350350
let actionButton =
351351
overlayContainerElement.querySelector('button.mat-button') as HTMLButtonElement;
@@ -365,8 +365,8 @@ describe('MatSnackBar', () => {
365365
const snackBarRef = snackBar.open('Some content');
366366
viewContainerFixture.detectChanges();
367367

368-
snackBarRef.afterDismissed().subscribe(undefined, undefined, dismissCompleteSpy);
369-
snackBarRef.onAction().subscribe(undefined, undefined, actionCompleteSpy);
368+
snackBarRef.afterDismissed().subscribe({complete: dismissCompleteSpy});
369+
snackBarRef.onAction().subscribe({complete: actionCompleteSpy});
370370

371371
snackBarRef.dismissWithAction();
372372
viewContainerFixture.detectChanges();
@@ -398,7 +398,7 @@ describe('MatSnackBar', () => {
398398
const snackBarRef = snackBar.open('Some content');
399399
viewContainerFixture.detectChanges();
400400

401-
snackBarRef.onAction().subscribe(undefined, undefined, actionCompleteSpy);
401+
snackBarRef.onAction().subscribe({complete: actionCompleteSpy});
402402
snackBarRef.dismiss();
403403
viewContainerFixture.detectChanges();
404404
tick();
@@ -531,8 +531,8 @@ describe('MatSnackBar', () => {
531531
const snackBarRef = snackBar.openFromComponent(BurritosNotification);
532532
viewContainerFixture.detectChanges();
533533

534-
snackBarRef.afterDismissed().subscribe(undefined, undefined, dismissCompleteSpy);
535-
snackBarRef.onAction().subscribe(undefined, undefined, actionCompleteSpy);
534+
snackBarRef.afterDismissed().subscribe({complete: dismissCompleteSpy});
535+
snackBarRef.onAction().subscribe({complete: actionCompleteSpy});
536536

537537
snackBarRef.dismissWithAction();
538538
viewContainerFixture.detectChanges();

src/material/tooltip/tooltip.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ describe('MatTooltip', () => {
487487

488488
const spy = jasmine.createSpy('complete spy');
489489
const subscription = tooltipDirective._tooltipInstance!.afterHidden()
490-
.subscribe(undefined, undefined, spy);
490+
.subscribe({complete: spy});
491491

492492
tooltipDirective.hide(0);
493493
tick(0);

0 commit comments

Comments
 (0)