[Angular] Upgrade RxJs 7.5.1 (#16887)

Co-authored-by: Marcelo Shima <marceloshima@gmail.com>
jhipster · Dec 30, 2021 · 011bf9d · 011bf9d
1 parent 042dd3d
commit 011bf9d
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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/...templates/angular/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts.ejs b/...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,15 +133,15 @@ describe('HasAnyAuthorityDirective tests', () => {
 
       // WHEN
       jest.clearAllMocks();
-      authenticationState.next();
+      authenticationState.next(null);
 
       // THEN
       expect(mockAccountService.hasAnyAuthority).toHaveBeenCalled();
 
       // WHEN
       jest.clearAllMocks();
       hasAnyAuthorityDirective.ngOnDestroy();
-      authenticationState.next();
+      authenticationState.next(null);
 
       // THEN
       expect(mockAccountService.hasAnyAuthority).not.toHaveBeenCalled();

diff --git a/...s/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.ts.ejs b/...s/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<never>();
+  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/...src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs b/...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/.../src/main/webapp/app/entities/route/entity-management-routing-resolve.service.spec.ts.ejs b/.../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);