From 011bf9d7135d4beb2db09ab28f67b8b4255e8be3 Mon Sep 17 00:00:00 2001 From: Quentin Date: Thu, 30 Dec 2021 17:59:04 +0100 Subject: [PATCH] [Angular] Upgrade RxJs 7.5.1 (#16887) Co-authored-by: Marcelo Shima --- generators/client/templates/angular/package.json | 2 +- .../src/main/webapp/app/home/home.component.spec.ts.ejs | 2 +- .../src/main/webapp/app/login/login.component.spec.ts.ejs | 2 +- .../shared/auth/has-any-authority.directive.spec.ts.ejs | 8 ++++---- .../webapp/app/shared/language/translate.directive.ts.ejs | 4 ++-- .../entity-management-delete-dialog.component.spec.ts.ejs | 2 +- .../entity-management-routing-resolve.service.spec.ts.ejs | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/generators/client/templates/angular/package.json b/generators/client/templates/angular/package.json index 0ce54b19dce..f50d0941290 100644 --- a/generators/client/templates/angular/package.json +++ b/generators/client/templates/angular/package.json @@ -11,7 +11,7 @@ "ngx-cookie-service": "13.1.2", "ngx-infinite-scroll": "10.0.1", "ngx-webstorage": "9.0.0", - "rxjs": "6.6.7", + "rxjs": "7.5.1", "swagger-ui-dist": "4.1.3", "tslib": "2.3.1", "zone.js": "0.11.4" diff --git a/generators/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.ejs index f48f8d8ed6e..e27b8331c03 100644 --- a/generators/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.ejs @@ -84,7 +84,7 @@ describe('Home Component', () => { <%_ if (!authenticationTypeOauth2) { _%> mockRouter = TestBed.inject(Router); - jest.spyOn(mockRouter, 'navigate').mockImplementation(() => of(true).toPromise()); + jest.spyOn(mockRouter, 'navigate').mockImplementation(() => Promise.resolve(true)); <%_ } else { _%> mockLoginService = TestBed.inject(LoginService); diff --git a/generators/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.ejs index a2ba2a849c8..47724d5e148 100644 --- a/generators/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.ejs @@ -63,7 +63,7 @@ describe('LoginComponent', () => { fixture = TestBed.createComponent(LoginComponent); comp = fixture.componentInstance; mockRouter = TestBed.inject(Router); - jest.spyOn(mockRouter, 'navigate').mockImplementation(() => of(true).toPromise()); + jest.spyOn(mockRouter, 'navigate').mockImplementation(() => Promise.resolve(true)); mockLoginService = TestBed.inject(LoginService); mockAccountService = TestBed.inject(AccountService); }); diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts.ejs index ea72d03a58a..33a02c5b6c7 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts.ejs @@ -99,7 +99,7 @@ describe('HasAnyAuthorityDirective tests', () => { mockAccountService.hasAnyAuthority = jest.fn(() => false); // WHEN - authenticationState.next(); + authenticationState.next(null); fixture.detectChanges(); // THEN @@ -109,7 +109,7 @@ describe('HasAnyAuthorityDirective tests', () => { mockAccountService.hasAnyAuthority = jest.fn(() => true); // WHEN - authenticationState.next(); + authenticationState.next(null); fixture.detectChanges(); // THEN @@ -133,7 +133,7 @@ describe('HasAnyAuthorityDirective tests', () => { // WHEN jest.clearAllMocks(); - authenticationState.next(); + authenticationState.next(null); // THEN expect(mockAccountService.hasAnyAuthority).toHaveBeenCalled(); @@ -141,7 +141,7 @@ describe('HasAnyAuthorityDirective tests', () => { // WHEN jest.clearAllMocks(); hasAnyAuthorityDirective.ngOnDestroy(); - authenticationState.next(); + authenticationState.next(null); // THEN expect(mockAccountService.hasAnyAuthority).not.toHaveBeenCalled(); diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.ts.ejs index 36a4e042c9e..5fdf60a5e76 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.ts.ejs @@ -33,7 +33,7 @@ export class TranslateDirective implements OnChanges, OnInit, OnDestroy { @Input() <%= jhiPrefix %>Translate!: string; @Input() translateValues?: { [key: string]: unknown }; - private readonly directiveDestroyed = new Subject(); + private readonly directiveDestroyed = new Subject(); constructor(private el: ElementRef, private translateService: TranslateService) {} @@ -51,7 +51,7 @@ export class TranslateDirective implements OnChanges, OnInit, OnDestroy { } ngOnDestroy(): void { - this.directiveDestroyed.next(); + this.directiveDestroyed.next(null); this.directiveDestroyed.complete(); } diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs index f67ed53abc8..9f0899d6ad9 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs @@ -56,7 +56,7 @@ describe('<%= entityAngularName %> Management Delete Component', () => { inject([], fakeAsync(() => { // GIVEN - jest.spyOn(service, 'delete').mockReturnValue(of(new HttpResponse({}))); + jest.spyOn(service, 'delete').mockReturnValue(of(new HttpResponse({ body: {} }))); // WHEN comp.confirmDelete(<%- tsKeyId %>); diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing-resolve.service.spec.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing-resolve.service.spec.ts.ejs index b5db147c091..2586ff5697d 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing-resolve.service.spec.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing-resolve.service.spec.ts.ejs @@ -53,7 +53,7 @@ describe('<%= entityAngularName %> routing resolve service', () => { ], }); mockRouter = TestBed.inject(Router); - jest.spyOn(mockRouter, 'navigate').mockImplementation(() => of(true).toPromise()); + jest.spyOn(mockRouter, 'navigate').mockImplementation(() => Promise.resolve(true)); mockActivatedRouteSnapshot = TestBed.inject(ActivatedRoute).snapshot; routingResolveService = TestBed.inject(<%= entityAngularName %>RoutingResolveService); service = TestBed.inject(<%= entityAngularName %>Service);