generator-jhipster 7.3.0 → 7.5.0

package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.spec.ts.ejs

@@ -25,14 +25,13 @@ const allRelationshipsByEntityNeedingOptions = Object
 const testEntityPrimaryKey0 = generateTestEntityPrimaryKey(primaryKey, 0);
 const testEntityPrimaryKey1 = generateTestEntityPrimaryKey(primaryKey, 1);
 _%>
-jest.mock('@angular/router');
-
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { HttpResponse } from '@angular/common/http';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { FormBuilder } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
-import { of, Subject } from 'rxjs';
+import { RouterTestingModule } from '@angular/router/testing';
+import { of, Subject, from } from 'rxjs';
 
 import { <%= entityAngularName %>Service } from '../service/<%= entityFileName %>.service';
 import { I<%= entityAngularName %>, <%= entityAngularName %> } from '../<%= entityFileName %>.model';
@@ -50,240 +49,246 @@ import { <%= otherEntity.entityAngularName %>Service } from 'app/entities/<%= ot
 
 import { <%= entityAngularName %>UpdateComponent } from './<%= entityFileName %>-update.component';
 
-describe('Component Tests', () => {
-    describe('<%= entityAngularName %> Management Update Component', () => {
-        let comp: <%= entityAngularName %>UpdateComponent;
-        let fixture: ComponentFixture<<%= entityAngularName %>UpdateComponent>;
-        let activatedRoute: ActivatedRoute;
-        let <%= entityInstance %>Service: <%= entityAngularName %>Service;
+describe('<%= entityAngularName %> Management Update Component', () => {
+    let comp: <%= entityAngularName %>UpdateComponent;
+    let fixture: ComponentFixture<<%= entityAngularName %>UpdateComponent>;
+    let activatedRoute: ActivatedRoute;
+    let <%= entityInstance %>Service: <%= entityAngularName %>Service;
 <%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions.filter(relationships => relationships[0].otherEntity.entityAngularName !== entityAngularName)) { _%>
-    <%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity; _%>
-        let <%= otherEntity.entityInstance %>Service: <%= otherEntity.entityAngularName %>Service;
+  <%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity; _%>
+    let <%= otherEntity.entityInstance %>Service: <%= otherEntity.entityAngularName %>Service;
 <%_ } _%>
 
-        beforeEach(() => {
-            TestBed.configureTestingModule({
-                imports: [HttpClientTestingModule],
-                declarations: [<%= entityAngularName %>UpdateComponent],
-                providers: [FormBuilder, ActivatedRoute],
-            })
-            .overrideTemplate(<%= entityAngularName %>UpdateComponent, '')
-            .compileComponents();
-
-            fixture = TestBed.createComponent(<%= entityAngularName %>UpdateComponent);
-            activatedRoute = TestBed.inject(ActivatedRoute);
-            <%= entityInstance %>Service = TestBed.inject(<%= entityAngularName %>Service);
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [HttpClientTestingModule, RouterTestingModule.withRoutes([])],
+            declarations: [<%= entityAngularName %>UpdateComponent],
+            providers: [
+              FormBuilder,
+              {
+                provide: ActivatedRoute,
+                useValue: {
+                  params: from([{}]),
+                },
+              },
+            ]
+        })
+        .overrideTemplate(<%= entityAngularName %>UpdateComponent, '')
+        .compileComponents();
+
+        fixture = TestBed.createComponent(<%= entityAngularName %>UpdateComponent);
+        activatedRoute = TestBed.inject(ActivatedRoute);
+        <%= entityInstance %>Service = TestBed.inject(<%= entityAngularName %>Service);
 <%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions.filter(relationships => relationships[0].otherEntity.entityAngularName !== entityAngularName)) { _%>
-    <%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity; _%>
-            <%= otherEntity.entityInstance %>Service = TestBed.inject(<%= otherEntity.entityAngularName %>Service);
+  <%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity; _%>
+        <%= otherEntity.entityInstance %>Service = TestBed.inject(<%= otherEntity.entityAngularName %>Service);
 <%_ } _%>
 
-            comp = fixture.componentInstance;
-        });
+        comp = fixture.componentInstance;
+    });
 
-        describe('ngOnInit', () => {
+    describe('ngOnInit', () => {
 <%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
-    <%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && !rel.otherEntityUser); _%>
-    <%_ const relationshipsWithCustomSharedOptions = relationshipsByEntityNeedingOptions.filter(rel => !relationshipsWithCustomUniqueOptions.includes(rel)); _%>
-    <%_ if (relationshipsWithCustomSharedOptions.length > 0) { _%>
-        <%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity; _%>
-            it('Should call <%= otherEntity.entityAngularName %> query and add missing value', () => {
-                    const <%= entityInstance %> : I<%= entityAngularName %> = <%- testEntityPrimaryKey1 %>;
-        <%_ for (const relationship of relationshipsWithCustomSharedOptions) { _%>
-            <%_ const reference = relationship.reference _%>
-            <%_ if (relationship.collection) { _%>
-                    const <%= reference.name %> : I<%= otherEntity.entityAngularName %>[] = [<%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>];
-            <%_ } else { _%>
-                    const <%= reference.name %> : I<%= otherEntity.entityAngularName %> = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>;
-            <%_ } _%>
-                    <%= entityInstance %>.<%= reference.name %> = <%= reference.name %>;
-        <%_ } _%>
-
-                    const <%= otherEntity.entityInstance %>Collection: I<%= otherEntity.entityAngularName %>[] = [<%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>];
-                    jest.spyOn(<%= otherEntity.entityInstance %>Service, 'query').mockReturnValue(of(new HttpResponse({ body: <%= otherEntity.entityInstance %>Collection })));
-                    const additional<%= otherEntity.entityAngularNamePlural %> = [
-        <%_ for (const relationship of relationshipsWithCustomSharedOptions) { _%>
-            <%_ const reference = relationship.reference _%>
-                        <% if (relationship.collection) { %>...<% } %><%= reference.name %>,
-        <%_ } _%>
-                    ];
-                    const expectedCollection: I<%= otherEntity.entityAngularName %>[] = [...additional<%= otherEntity.entityAngularNamePlural %>, ...<%= otherEntity.entityInstance %>Collection];
-                    jest.spyOn(<%= otherEntity.entityInstance %>Service, 'add<%= otherEntity.entityAngularName %>ToCollectionIfMissing').mockReturnValue(expectedCollection);
-
-                    activatedRoute.data = of({ <%= entityInstance %> });
-                    comp.ngOnInit();
-
-                    expect(<%= otherEntity.entityInstance %>Service.query).toHaveBeenCalled();
-                    expect(<%= otherEntity.entityInstance %>Service.add<%= otherEntity.entityAngularName %>ToCollectionIfMissing).toHaveBeenCalledWith(<%= otherEntity.entityInstance %>Collection, ...additional<%= otherEntity.entityAngularNamePlural %>);
-                    expect(comp.<%= otherEntity.entityInstancePlural %>SharedCollection).toEqual(expectedCollection);
-            });
-
+  <%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && !rel.otherEntityUser); _%>
+  <%_ const relationshipsWithCustomSharedOptions = relationshipsByEntityNeedingOptions.filter(rel => !relationshipsWithCustomUniqueOptions.includes(rel)); _%>
+  <%_ if (relationshipsWithCustomSharedOptions.length > 0) { _%>
+    <%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity; _%>
+        it('Should call <%= otherEntity.entityAngularName %> query and add missing value', () => {
+                const <%= entityInstance %> : I<%= entityAngularName %> = <%- testEntityPrimaryKey1 %>;
+    <%_ for (const relationship of relationshipsWithCustomSharedOptions) { _%>
+      <%_ const reference = relationship.reference _%>
+       <%_ if (relationship.collection) { _%>
+                const <%= reference.name %> : I<%= otherEntity.entityAngularName %>[] = [<%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>];
+      <%_ } else { _%>
+                const <%= reference.name %> : I<%= otherEntity.entityAngularName %> = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>;
+      <%_ } _%>
+                <%= entityInstance %>.<%= reference.name %> = <%= reference.name %>;
     <%_ } _%>
-    <%_ for (const relationship of relationshipsWithCustomUniqueOptions) { %>
-        <%_ const otherEntity = relationship.otherEntity _%>
-        <%_ const reference = relationship.reference _%>
-            it('Should call <%= reference.name %> query and add missing value', () => {
-                    const <%= entityInstance %> : I<%= entityAngularName %> = <%- testEntityPrimaryKey1 %>;
-                    const <%= reference.name %> : I<%= otherEntity.entityAngularName %> = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>;
-                    <%= entityInstance %>.<%= reference.name %> = <%= reference.name %>;
-
-                    const <%= reference.name %>Collection: I<%= otherEntity.entityAngularName %>[] = [<%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>];
-                    jest.spyOn(<%= otherEntity.entityInstance %>Service, 'query').mockReturnValue(of(new HttpResponse({ body: <%= reference.name %>Collection })));
-                    const expectedCollection: I<%= otherEntity.entityAngularName %>[] = [<%= reference.name %>, ...<%= reference.name %>Collection];
-                    jest.spyOn(<%= otherEntity.entityInstance %>Service, 'add<%= otherEntity.entityAngularName %>ToCollectionIfMissing').mockReturnValue(expectedCollection);
-
-                    activatedRoute.data = of({ <%= entityInstance %> });
-                    comp.ngOnInit();
-
-                    expect(<%= otherEntity.entityInstance %>Service.query).toHaveBeenCalled();
-                    expect(<%= otherEntity.entityInstance %>Service.add<%= otherEntity.entityAngularName %>ToCollectionIfMissing).toHaveBeenCalledWith(<%= reference.name %>Collection, <%= reference.name %>);
-                    expect(comp.<%= relationship.relationshipFieldNamePlural %>Collection).toEqual(expectedCollection);
-            });
 
+                const <%= otherEntity.entityInstance %>Collection: I<%= otherEntity.entityAngularName %>[] = [<%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>];
+                jest.spyOn(<%= otherEntity.entityInstance %>Service, 'query').mockReturnValue(of(new HttpResponse({ body: <%= otherEntity.entityInstance %>Collection })));
+                const additional<%= otherEntity.entityAngularNamePlural %> = [
+    <%_ for (const relationship of relationshipsWithCustomSharedOptions) { _%>
+        <%_ const reference = relationship.reference _%>
+                    <% if (relationship.collection) { %>...<% } %><%= reference.name %>,
     <%_ } _%>
-<%_ } _%>
-            it('Should update editForm', () => {
-                const <%= entityInstance %>: I<%= entityAngularName %> = <%- testEntityPrimaryKey1 %>;
-<%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
-    <%_ for (const relationship of relationshipsByEntityNeedingOptions) { _%>
-        <%_ const otherEntity = relationship.otherEntity _%>
-                const <%= relationship.reference.name %>: I<%= otherEntity.entityAngularName %> = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>;
-                <%= entityInstance %>.<%= relationship.reference.name %> = <%= relationship.collection ? `[${relationship.reference.name}]` : relationship.reference.name %>;
-    <%_ } _%>
-<%_ } _%>
+                ];
+                const expectedCollection: I<%= otherEntity.entityAngularName %>[] = [...additional<%= otherEntity.entityAngularNamePlural %>, ...<%= otherEntity.entityInstance %>Collection];
+                jest.spyOn(<%= otherEntity.entityInstance %>Service, 'add<%= otherEntity.entityAngularName %>ToCollectionIfMissing').mockReturnValue(expectedCollection);
 
                 activatedRoute.data = of({ <%= entityInstance %> });
                 comp.ngOnInit();
 
-                expect(comp.editForm.value).toEqual(expect.objectContaining(<%= entityInstance %>));
-<%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
-    <%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && !rel.otherEntityUser); _%>
-    <%_ for (const relationship of relationshipsByEntityNeedingOptions) { _%>
-        <%_ const otherEntity = relationship.otherEntity _%>
-                expect(comp.<% if (!relationshipsWithCustomUniqueOptions.includes(relationship)) { %><%= otherEntity.entityInstancePlural %>Shared<% } else { %><%= relationship.relationshipFieldNamePlural %><% } %>Collection).toContain(<%= relationship.reference.name %>);
-    <%_ } _%>
-<%_ } _%>
-            });
+                expect(<%= otherEntity.entityInstance %>Service.query).toHaveBeenCalled();
+                expect(<%= otherEntity.entityInstance %>Service.add<%= otherEntity.entityAngularName %>ToCollectionIfMissing).toHaveBeenCalledWith(<%= otherEntity.entityInstance %>Collection, ...additional<%= otherEntity.entityAngularNamePlural %>);
+                expect(comp.<%= otherEntity.entityInstancePlural %>SharedCollection).toEqual(expectedCollection);
         });
 
-        describe('save', () => {
-            it('Should call update service on save for existing entity', () => {
-                // GIVEN
-                const saveSubject = new Subject<HttpResponse<<%= entityAngularName %>>>();
-                const <%= entityInstance %> = <%- testEntityPrimaryKey0 %>;
-                jest.spyOn(<%= entityInstance %>Service, 'update').mockReturnValue(saveSubject);
-                jest.spyOn(comp, 'previousState');
-                activatedRoute.data = of({ <%= entityInstance %> });
-                comp.ngOnInit();
-
-                // WHEN
-                comp.save();
-                expect(comp.isSaving).toEqual(true);
-                saveSubject.next(new HttpResponse({ body: <%= entityInstance %> }));
-                saveSubject.complete();
+  <%_ } _%>
+  <%_ for (const relationship of relationshipsWithCustomUniqueOptions) { %>
+    <%_ const otherEntity = relationship.otherEntity _%>
+    <%_ const reference = relationship.reference _%>
+        it('Should call <%= reference.name %> query and add missing value', () => {
+                const <%= entityInstance %> : I<%= entityAngularName %> = <%- testEntityPrimaryKey1 %>;
+                const <%= reference.name %> : I<%= otherEntity.entityAngularName %> = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>;
+                <%= entityInstance %>.<%= reference.name %> = <%= reference.name %>;
 
-                // THEN
-                expect(comp.previousState).toHaveBeenCalled();
-                expect(<%= entityInstance %>Service.update).toHaveBeenCalledWith(<%= entityInstance %>);
-                expect(comp.isSaving).toEqual(false);
-            });
+                const <%= reference.name %>Collection: I<%= otherEntity.entityAngularName %>[] = [<%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>];
+                jest.spyOn(<%= otherEntity.entityInstance %>Service, 'query').mockReturnValue(of(new HttpResponse({ body: <%= reference.name %>Collection })));
+                const expectedCollection: I<%= otherEntity.entityAngularName %>[] = [<%= reference.name %>, ...<%= reference.name %>Collection];
+                jest.spyOn(<%= otherEntity.entityInstance %>Service, 'add<%= otherEntity.entityAngularName %>ToCollectionIfMissing').mockReturnValue(expectedCollection);
 
-            it('Should call create service on save for new entity', () => {
-                // GIVEN
-                const saveSubject = new Subject<HttpResponse<<%= entityAngularName %>>>();
-                const <%= entityInstance %> = new <%= entityAngularName %>();
-                jest.spyOn(<%= entityInstance %>Service, 'create').mockReturnValue(saveSubject);
-                jest.spyOn(comp, 'previousState');
                 activatedRoute.data = of({ <%= entityInstance %> });
                 comp.ngOnInit();
 
-                // WHEN
-                comp.save();
-                expect(comp.isSaving).toEqual(true);
-                saveSubject.next(new HttpResponse({ body: <%= entityInstance %> }));
-                saveSubject.complete();
+                expect(<%= otherEntity.entityInstance %>Service.query).toHaveBeenCalled();
+                expect(<%= otherEntity.entityInstance %>Service.add<%= otherEntity.entityAngularName %>ToCollectionIfMissing).toHaveBeenCalledWith(<%= reference.name %>Collection, <%= reference.name %>);
+                expect(comp.<%= relationship.relationshipFieldNamePlural %>Collection).toEqual(expectedCollection);
+        });
 
-                // THEN
-                expect(<%= entityInstance %>Service.create).toHaveBeenCalledWith(<%= entityInstance %>);
-                expect(comp.isSaving).toEqual(false);
-                expect(comp.previousState).toHaveBeenCalled();
-            });
+  <%_ } _%>
+<%_ } _%>
+        it('Should update editForm', () => {
+            const <%= entityInstance %>: I<%= entityAngularName %> = <%- testEntityPrimaryKey1 %>;
+<%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
+  <%_ for (const relationship of relationshipsByEntityNeedingOptions) { _%>
+    <%_ const otherEntity = relationship.otherEntity _%>
+            const <%= relationship.reference.name %>: I<%= otherEntity.entityAngularName %> = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>;
+            <%= entityInstance %>.<%= relationship.reference.name %> = <%= relationship.collection ? `[${relationship.reference.name}]` : relationship.reference.name %>;
+  <%_ } _%>
+<%_ } _%>
 
-            it('Should set isSaving to false on error', () => {
-                // GIVEN
-                const saveSubject = new Subject<HttpResponse<<%= entityAngularName %>>>();
-                const <%= entityInstance %> = <%- testEntityPrimaryKey0 %>;
-                jest.spyOn(<%= entityInstance %>Service, 'update').mockReturnValue(saveSubject);
-                jest.spyOn(comp, 'previousState');
-                activatedRoute.data = of({ <%= entityInstance %> });
-                comp.ngOnInit();
+            activatedRoute.data = of({ <%= entityInstance %> });
+            comp.ngOnInit();
 
-                // WHEN
-                comp.save();
-                expect(comp.isSaving).toEqual(true);
-                saveSubject.error('This is an error!');
+            expect(comp.editForm.value).toEqual(expect.objectContaining(<%= entityInstance %>));
+<%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
+  <%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && !rel.otherEntityUser); _%>
+  <%_ for (const relationship of relationshipsByEntityNeedingOptions) { _%>
+    <%_ const otherEntity = relationship.otherEntity _%>
+            expect(comp.<% if (!relationshipsWithCustomUniqueOptions.includes(relationship)) { %><%= otherEntity.entityInstancePlural %>Shared<% } else { %><%= relationship.relationshipFieldNamePlural %><% } %>Collection).toContain(<%= relationship.reference.name %>);
+  <%_ } _%>
+<%_ } _%>
+        });
+    });
 
-                // THEN
-                expect(<%= entityInstance %>Service.update).toHaveBeenCalledWith(<%= entityInstance %>);
-                expect(comp.isSaving).toEqual(false);
-                expect(comp.previousState).not.toHaveBeenCalled();
-            });
+    describe('save', () => {
+        it('Should call update service on save for existing entity', () => {
+            // GIVEN
+            const saveSubject = new Subject<HttpResponse<<%= entityAngularName %>>>();
+            const <%= entityInstance %> = <%- testEntityPrimaryKey0 %>;
+            jest.spyOn(<%= entityInstance %>Service, 'update').mockReturnValue(saveSubject);
+            jest.spyOn(comp, 'previousState');
+            activatedRoute.data = of({ <%= entityInstance %> });
+            comp.ngOnInit();
+
+            // WHEN
+            comp.save();
+            expect(comp.isSaving).toEqual(true);
+            saveSubject.next(new HttpResponse({ body: <%= entityInstance %> }));
+            saveSubject.complete();
+
+            // THEN
+            expect(comp.previousState).toHaveBeenCalled();
+            expect(<%= entityInstance %>Service.update).toHaveBeenCalledWith(<%= entityInstance %>);
+            expect(comp.isSaving).toEqual(false);
+        });
+
+        it('Should call create service on save for new entity', () => {
+            // GIVEN
+            const saveSubject = new Subject<HttpResponse<<%= entityAngularName %>>>();
+            const <%= entityInstance %> = new <%= entityAngularName %>();
+            jest.spyOn(<%= entityInstance %>Service, 'create').mockReturnValue(saveSubject);
+            jest.spyOn(comp, 'previousState');
+            activatedRoute.data = of({ <%= entityInstance %> });
+            comp.ngOnInit();
+
+            // WHEN
+            comp.save();
+            expect(comp.isSaving).toEqual(true);
+            saveSubject.next(new HttpResponse({ body: <%= entityInstance %> }));
+            saveSubject.complete();
+
+            // THEN
+            expect(<%= entityInstance %>Service.create).toHaveBeenCalledWith(<%= entityInstance %>);
+            expect(comp.isSaving).toEqual(false);
+            expect(comp.previousState).toHaveBeenCalled();
+        });
+
+        it('Should set isSaving to false on error', () => {
+            // GIVEN
+            const saveSubject = new Subject<HttpResponse<<%= entityAngularName %>>>();
+            const <%= entityInstance %> = <%- testEntityPrimaryKey0 %>;
+            jest.spyOn(<%= entityInstance %>Service, 'update').mockReturnValue(saveSubject);
+            jest.spyOn(comp, 'previousState');
+            activatedRoute.data = of({ <%= entityInstance %> });
+            comp.ngOnInit();
+
+            // WHEN
+            comp.save();
+            expect(comp.isSaving).toEqual(true);
+            saveSubject.error('This is an error!');
+
+            // THEN
+            expect(<%= entityInstance %>Service.update).toHaveBeenCalledWith(<%= entityInstance %>);
+            expect(comp.isSaving).toEqual(false);
+            expect(comp.previousState).not.toHaveBeenCalled();
         });
+    });
 <%_ const trackedEntities = Object.values(differentRelationships).filter(arr => arr.some(rel => rel.reference.owned && rel.otherEntity.primaryKey)).map(arr => arr[0].reference);
     if (trackedEntities.length > 0) {
 _%>
 
-        describe('Tracking relationships identifiers', () => {
-    <%_ for (reference of trackedEntities) {
-            const otherEntity = reference.relationship.otherEntity;
-    _%>
-            describe('track<%= otherEntity.entityAngularName %>By<%= otherEntity.primaryKey.nameCapitalized %>', () => {
-                it('Should return tracked <%= otherEntity.entityAngularName %> primary key', () => {
-                    const entity = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
-                    const trackResult = comp.track<%= otherEntity.entityAngularName %>By<%= otherEntity.primaryKey.nameCapitalized %>(0, entity);
-                    expect(trackResult).toEqual(entity.<%= otherEntity.primaryKey.name %>);
-                });
+    describe('Tracking relationships identifiers', () => {
+  <%_ for (reference of trackedEntities) {
+        const otherEntity = reference.relationship.otherEntity;
+  _%>
+        describe('track<%= otherEntity.entityAngularName %>By<%= otherEntity.primaryKey.nameCapitalized %>', () => {
+            it('Should return tracked <%= otherEntity.entityAngularName %> primary key', () => {
+                const entity = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
+                const trackResult = comp.track<%= otherEntity.entityAngularName %>By<%= otherEntity.primaryKey.nameCapitalized %>(0, entity);
+                expect(trackResult).toEqual(entity.<%= otherEntity.primaryKey.name %>);
             });
-
-    <%_ } _%>
         });
+
+  <%_ } _%>
+    });
 <%_ } _%>
 <%_ const selectableEntities = Object.values(differentRelationships).filter(arr => arr.some(rel => rel.relationshipManyToMany && rel.reference.owned && rel.otherEntity.primaryKey)).map(arr => arr[0].reference);
-    if (selectableEntities.length > 0) {
+  if (selectableEntities.length > 0) {
 _%>
 
-        describe('Getting selected relationships', () => {
-    <%_ for (reference of selectableEntities) {
-            const otherEntity = reference.relationship.otherEntity;
-    _%>
-            describe('getSelected<%= otherEntity.entityAngularName %>', () => {
-                it('Should return option if no <%= otherEntity.entityAngularName %> is selected', () => {
-                    const option = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
-                    const result = comp.getSelected<%= otherEntity.entityAngularName %>(option);
-                    expect(result === option).toEqual(true);
-                });
-
-                it('Should return selected <%= otherEntity.entityAngularName %> for according option', () => {
-                    const option = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
-                    const selected = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
-                    const selected2 = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 1) %>;
-                    const result = comp.getSelected<%= otherEntity.entityAngularName %>(option, [selected2, selected]);
-                    expect(result === selected).toEqual(true);
-                    expect(result === selected2).toEqual(false);
-                    expect(result === option).toEqual(false);
-                });
-
-                it('Should return option if this <%= otherEntity.entityAngularName %> is not selected', () => {
-                    const option = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
-                    const selected = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 1) %>;
-                    const result = comp.getSelected<%= otherEntity.entityAngularName %>(option, [selected]);
-                    expect(result === option).toEqual(true);
-                    expect(result === selected).toEqual(false);
-                });
+    describe('Getting selected relationships', () => {
+  <%_ for (reference of selectableEntities) {
+        const otherEntity = reference.relationship.otherEntity;
+  _%>
+        describe('getSelected<%= otherEntity.entityAngularName %>', () => {
+            it('Should return option if no <%= otherEntity.entityAngularName %> is selected', () => {
+                const option = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
+                const result = comp.getSelected<%= otherEntity.entityAngularName %>(option);
+                expect(result === option).toEqual(true);
             });
 
-    <%_ } _%>
+            it('Should return selected <%= otherEntity.entityAngularName %> for according option', () => {
+                const option = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
+                const selected = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
+                const selected2 = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 1) %>;
+                const result = comp.getSelected<%= otherEntity.entityAngularName %>(option, [selected2, selected]);
+                expect(result === selected).toEqual(true);
+                expect(result === selected2).toEqual(false);
+                expect(result === option).toEqual(false);
+            });
+
+            it('Should return option if this <%= otherEntity.entityAngularName %> is not selected', () => {
+                const option = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
+                const selected = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 1) %>;
+                const result = comp.getSelected<%= otherEntity.entityAngularName %>(option, [selected]);
+                expect(result === option).toEqual(true);
+                expect(result === selected).toEqual(false);
+            });
         });
-<%_ } _%>
+
+  <%_ } _%>
     });
+<%_ } _%>
 });

package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.ejs

@@ -43,7 +43,7 @@ import { Observable } from 'rxjs';
 import { finalize<% if (relationships.some(rel => rel.ownerSide === true)) { %>, map<% } %> } from 'rxjs/operators';
 
 <%_ if (fieldsContainInstant || fieldsContainZonedDateTime) { _%>
-import * as dayjs from 'dayjs';
+import dayjs from 'dayjs/esm';
 import { DATE_TIME_FORMAT } from 'app/config/input.constants';
 <%_ } _%>
 
@@ -239,10 +239,10 @@ _%>
     <%_ } _%>
 
     protected subscribeToSaveResponse(result: Observable<HttpResponse<I<%= entityAngularName %>>>): void {
-        result.pipe(finalize(() => this.onSaveFinalize())).subscribe(
-            () => this.onSaveSuccess(),
-            () => this.onSaveError()
-        );
+        result.pipe(finalize(() => this.onSaveFinalize())).subscribe({
+            next: () => this.onSaveSuccess(),
+            error: () => this.onSaveError()
+        });
     }
 
     protected onSaveSuccess(): void {

package/generators/entity-client/templates/angular/src/test/javascript/e2e/entities/entity.spec.ts.ejs

@@ -42,7 +42,7 @@ import {
     <%_ } _%>
 } from './<%= entityFileName %>.page-object';
 <%_ if (fieldsContainBlobOrImage) { _%>
-import * as path from 'path';
+import path from 'path';
 <%_ } _%>
 
 const expect = chai.expect;