generator-jhipster 7.3.0 → 7.5.0

package/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.spec.ts.ejs

@@ -4,113 +4,111 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 
 import { HealthModalComponent } from './health-modal.component';
 
-describe('Component Tests', () => {
-  describe('HealthModalComponent', () => {
-    let comp: HealthModalComponent;
-    let fixture: ComponentFixture<HealthModalComponent>;
-    let mockActiveModal: NgbActiveModal;
-
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          imports: [HttpClientTestingModule],
-          declarations: [HealthModalComponent],
-          providers: [NgbActiveModal],
-        })
-          .overrideTemplate(HealthModalComponent, '')
-          .compileComponents();
+describe('HealthModalComponent', () => {
+  let comp: HealthModalComponent;
+  let fixture: ComponentFixture<HealthModalComponent>;
+  let mockActiveModal: NgbActiveModal;
+
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [HttpClientTestingModule],
+        declarations: [HealthModalComponent],
+        providers: [NgbActiveModal],
       })
-    );
+        .overrideTemplate(HealthModalComponent, '')
+        .compileComponents();
+    })
+  );
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HealthModalComponent);
+    comp = fixture.componentInstance;
+    mockActiveModal = TestBed.inject(NgbActiveModal);
+  });
+
+  describe('readableValue', () => {
+    it('should return stringify value', () => {
+      // GIVEN
+      comp.health = undefined;
+
+      // WHEN
+      const result = comp.readableValue({ 'name': 'jhipster' });
+
+      // THEN
+      expect(result).toEqual('{"name":"jhipster"}');
+    });
+
+    it('should return string value', () => {
+      // GIVEN
+      comp.health = undefined;
+
+      // WHEN
+      const result = comp.readableValue('jhipster');
+
+      // THEN
+      expect(result).toEqual('jhipster');
+    });
+
+    it('should return storage space in an human readable unit (GB)', () => {
+      // GIVEN
+      comp.health = {
+        key: 'diskSpace',
+        value: {
+          status: 'UP'
+        }
+      };
 
-    beforeEach(() => {
-      fixture = TestBed.createComponent(HealthModalComponent);
-      comp = fixture.componentInstance;
-      mockActiveModal = TestBed.inject(NgbActiveModal);
+      // WHEN
+      const result = comp.readableValue(1073741825);
+
+      // THEN
+      expect(result).toEqual('1.00 GB');
+    });
+
+    it('should return storage space in an human readable unit (MB)', () => {
+      // GIVEN
+      comp.health = {
+        key: 'diskSpace',
+        value: {
+          status: 'UP'
+        }
+      };
+
+      // WHEN
+      const result = comp.readableValue(1073741824);
+
+      // THEN
+      expect(result).toEqual('1024.00 MB');
     });
 
-    describe('readableValue', () => {
-      it('should return stringify value', () => {
-        // GIVEN
-        comp.health = undefined;
-
-        // WHEN
-        const result = comp.readableValue({ 'name': 'jhipster' });
-
-        // THEN
-        expect(result).toEqual('{"name":"jhipster"}');
-      });
-
-      it('should return string value', () => {
-        // GIVEN
-        comp.health = undefined;
-
-        // WHEN
-        const result = comp.readableValue('jhipster');
-
-        // THEN
-        expect(result).toEqual('jhipster');
-      });
-
-      it('should return storage space in an human readable unit (GB)', () => {
-        // GIVEN
-        comp.health = {
-          key: 'diskSpace',
-          value: {
-            status: 'UP'
-          }
-        };
-
-        // WHEN
-        const result = comp.readableValue(1073741825);
-
-        // THEN
-        expect(result).toEqual('1.00 GB');
-      });
-
-      it('should return storage space in an human readable unit (MB)', () => {
-        // GIVEN
-        comp.health = {
-          key: 'diskSpace',
-          value: {
-            status: 'UP'
-          }
-        };
-
-        // WHEN
-        const result = comp.readableValue(1073741824);
-
-        // THEN
-        expect(result).toEqual('1024.00 MB');
-      });
-
-      it('should return string value', () => {
-        // GIVEN
-        comp.health = {
-          key: 'mail',
-          value: {
-            status: 'UP'
-          }
-        };
-
-        // WHEN
-        const result = comp.readableValue(1234);
-
-        // THEN
-        expect(result).toEqual('1234');
-      });
+    it('should return string value', () => {
+      // GIVEN
+      comp.health = {
+        key: 'mail',
+        value: {
+          status: 'UP'
+        }
+      };
+
+      // WHEN
+      const result = comp.readableValue(1234);
+
+      // THEN
+      expect(result).toEqual('1234');
     });
+  });
+
+  describe('dismiss', () => {
+    it('should call dismiss when dismiss modal is called', () => {
+      // GIVEN
+      const spy = jest.spyOn(mockActiveModal, 'dismiss');
+
+      // WHEN
+      comp.dismiss();
 
-    describe('dismiss', () => {
-      it('should call dismiss when dismiss modal is called', () => {
-        // GIVEN
-        const spy = jest.spyOn(mockActiveModal, 'dismiss');
-
-        // WHEN
-        comp.dismiss();
-  
-        // THEN
-        expect(spy).toHaveBeenCalled();
-      });
+      // THEN
+      expect(spy).toHaveBeenCalled();
     });
   });
 });

package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs

@@ -24,82 +24,80 @@ import { LogsComponent } from './logs.component';
 import { LogsService } from './logs.service';
 import { Log, LoggersResponse } from './log.model';
 
-describe('Component Tests', () => {
-  describe('LogsComponent', () => {
-    let comp: LogsComponent;
-    let fixture: ComponentFixture<LogsComponent>;
-    let service: LogsService;
+describe('LogsComponent', () => {
+  let comp: LogsComponent;
+  let fixture: ComponentFixture<LogsComponent>;
+  let service: LogsService;
 
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          imports: [HttpClientTestingModule],
-          declarations: [LogsComponent],
-          providers: [LogsService],
-        })
-          .overrideTemplate(LogsComponent, '')
-          .compileComponents();
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [HttpClientTestingModule],
+        declarations: [LogsComponent],
+        providers: [LogsService],
       })
-    );
+        .overrideTemplate(LogsComponent, '')
+        .compileComponents();
+    })
+  );
 
-    beforeEach(() => {
-      fixture = TestBed.createComponent(LogsComponent);
-      comp = fixture.componentInstance;
-      service = TestBed.inject(LogsService);
-    });
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LogsComponent);
+    comp = fixture.componentInstance;
+    service = TestBed.inject(LogsService);
+  });
 
-    describe('OnInit', () => {
-      it('should set all default values correctly', () => {
-        expect(comp.filter).toBe('');
-        expect(comp.orderProp).toBe('name');
-        expect(comp.ascending).toBe(true);
-      });
+  describe('OnInit', () => {
+    it('should set all default values correctly', () => {
+      expect(comp.filter).toBe('');
+      expect(comp.orderProp).toBe('name');
+      expect(comp.ascending).toBe(true);
+    });
 
-      it('Should call load all on init', () => {
-        // GIVEN
-        const log = new Log('main', 'WARN');
-        jest.spyOn(service, 'findAll').mockReturnValue(
-          of({
-            loggers: {
-              main: {
-                effectiveLevel: 'WARN',
-              },
+    it('Should call load all on init', () => {
+      // GIVEN
+      const log = new Log('main', 'WARN');
+      jest.spyOn(service, 'findAll').mockReturnValue(
+        of({
+          loggers: {
+            main: {
+              effectiveLevel: 'WARN',
             },
-          } as unknown as LoggersResponse)
-        );
+          },
+        } as unknown as LoggersResponse)
+      );
 
-        // WHEN
-        comp.ngOnInit();
+      // WHEN
+      comp.ngOnInit();
 
-        // THEN
-        expect(service.findAll).toHaveBeenCalled();
-        expect(comp.loggers?.[0]).toEqual(expect.objectContaining(log));
-      });
+      // THEN
+      expect(service.findAll).toHaveBeenCalled();
+      expect(comp.loggers?.[0]).toEqual(expect.objectContaining(log));
     });
+  });
 
-    describe('change log level', () => {
-      it('should change log level correctly', () => {
-        // GIVEN
-        const log = new Log('main', 'ERROR');
-        jest.spyOn(service, 'changeLevel').mockReturnValue(of({}));
-        jest.spyOn(service, 'findAll').mockReturnValue(
-          of({
-            loggers: {
-              main: {
-                effectiveLevel: 'ERROR',
-              },
+  describe('change log level', () => {
+    it('should change log level correctly', () => {
+      // GIVEN
+      const log = new Log('main', 'ERROR');
+      jest.spyOn(service, 'changeLevel').mockReturnValue(of({}));
+      jest.spyOn(service, 'findAll').mockReturnValue(
+        of({
+          loggers: {
+            main: {
+              effectiveLevel: 'ERROR',
             },
-          } as unknown as LoggersResponse)
-        );
+          },
+        } as unknown as LoggersResponse)
+      );
 
-        // WHEN
-        comp.changeLevel('main', 'ERROR');
+      // WHEN
+      comp.changeLevel('main', 'ERROR');
 
-        // THEN
-        expect(service.changeLevel).toHaveBeenCalled();
-        expect(service.findAll).toHaveBeenCalled();
-        expect(comp.loggers?.[0]).toEqual(expect.objectContaining(log));
-      });
+      // THEN
+      expect(service.changeLevel).toHaveBeenCalled();
+      expect(service.findAll).toHaveBeenCalled();
+      expect(comp.loggers?.[0]).toEqual(expect.objectContaining(log));
     });
   });
 });

package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs

@@ -20,7 +20,7 @@
 
 <div *ngIf="!updating && jvmMemoryMetrics">
   <div *ngFor="let entry of jvmMemoryMetrics | keyvalue">
-    <span *ngIf="entry.value.max != -1; else other">
+    <span *ngIf="entry.value.max !== -1; else other">
       <span>{{ entry.key }}</span>
       ({{ entry.value.used / 1048576 | number: '1.0-0' }}M / {{ entry.value.max / 1048576 | number: '1.0-0' }}M)
     </span>
@@ -30,7 +30,7 @@
     <ng-template #other><span><span>{{ entry.key }}</span> {{ entry.value.used / 1048576 | number: '1.0-0' }}M</span></ng-template>
 
     <ngb-progressbar
-      *ngIf="entry.value.max != -1"
+      *ngIf="entry.value.max !== -1"
       type="success"
       [value]="(100 * entry.value.used) / entry.value.max"
       [striped]="true"

package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs

@@ -24,40 +24,38 @@ import { MetricsComponent } from './metrics.component';
 import { MetricsService } from './metrics.service';
 import { Metrics } from './metrics.model';
 
-describe('Component Tests', () => {
-  describe('MetricsComponent', () => {
-    let comp: MetricsComponent;
-    let fixture: ComponentFixture<MetricsComponent>;
-    let service: MetricsService;
-
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          imports: [HttpClientTestingModule],
-          declarations: [MetricsComponent],
-        })
-          .overrideTemplate(MetricsComponent, '')
-          .compileComponents();
+describe('MetricsComponent', () => {
+  let comp: MetricsComponent;
+  let fixture: ComponentFixture<MetricsComponent>;
+  let service: MetricsService;
+
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [HttpClientTestingModule],
+        declarations: [MetricsComponent],
       })
-    );
-
-    beforeEach(() => {
-      fixture = TestBed.createComponent(MetricsComponent);
-      comp = fixture.componentInstance;
-      service = TestBed.inject(MetricsService);
-    });
+        .overrideTemplate(MetricsComponent, '')
+        .compileComponents();
+    })
+  );
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MetricsComponent);
+    comp = fixture.componentInstance;
+    service = TestBed.inject(MetricsService);
+  });
 
-    describe('refresh', () => {
-      it('should call refresh on init', () => {
-        // GIVEN
-        jest.spyOn(service, 'getMetrics').mockReturnValue(of({} as Metrics));
+  describe('refresh', () => {
+    it('should call refresh on init', () => {
+      // GIVEN
+      jest.spyOn(service, 'getMetrics').mockReturnValue(of({} as Metrics));
 
-        // WHEN
-        comp.ngOnInit();
+      // WHEN
+      comp.ngOnInit();
 
-        // THEN
-        expect(service.getMetrics).toHaveBeenCalled();
-      });
+      // THEN
+      expect(service.getMetrics).toHaveBeenCalled();
     });
   });
 });

package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs

@@ -27,48 +27,46 @@ import { UserManagementService } from '../service/user-management.service';
 
 import { UserManagementDeleteDialogComponent } from './user-management-delete-dialog.component';
 
-describe('Component Tests', () => {
-  describe('User Management Delete Component', () => {
-    let comp: UserManagementDeleteDialogComponent;
-    let fixture: ComponentFixture<UserManagementDeleteDialogComponent>;
-    let service: UserManagementService;
-    let mockActiveModal: NgbActiveModal;
+describe('User Management Delete Component', () => {
+  let comp: UserManagementDeleteDialogComponent;
+  let fixture: ComponentFixture<UserManagementDeleteDialogComponent>;
+  let service: UserManagementService;
+  let mockActiveModal: NgbActiveModal;
 
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          imports: [HttpClientTestingModule],
-          declarations: [UserManagementDeleteDialogComponent],
-          providers: [NgbActiveModal],
-        })
-          .overrideTemplate(UserManagementDeleteDialogComponent, '')
-          .compileComponents();
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [HttpClientTestingModule],
+        declarations: [UserManagementDeleteDialogComponent],
+        providers: [NgbActiveModal],
       })
-    );
+        .overrideTemplate(UserManagementDeleteDialogComponent, '')
+        .compileComponents();
+    })
+  );
 
-    beforeEach(() => {
-      fixture = TestBed.createComponent(UserManagementDeleteDialogComponent);
-      comp = fixture.componentInstance;
-      service = TestBed.inject(UserManagementService);
-      mockActiveModal = TestBed.inject(NgbActiveModal);
-    });
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UserManagementDeleteDialogComponent);
+    comp = fixture.componentInstance;
+    service = TestBed.inject(UserManagementService);
+    mockActiveModal = TestBed.inject(NgbActiveModal);
+  });
 
-    describe('confirmDelete', () => {
-      it('Should call delete service on confirmDelete', inject(
-        [],
-        fakeAsync(() => {
-          // GIVEN
-          jest.spyOn(service, 'delete').mockReturnValue(of({}));
+  describe('confirmDelete', () => {
+    it('Should call delete service on confirmDelete', inject(
+      [],
+      fakeAsync(() => {
+        // GIVEN
+        jest.spyOn(service, 'delete').mockReturnValue(of({}));
 
-          // WHEN
-          comp.confirmDelete('user');
-          tick();
+        // WHEN
+        comp.confirmDelete('user');
+        tick();
 
-          // THEN
-          expect(service.delete).toHaveBeenCalledWith('user');
-          expect(mockActiveModal.close).toHaveBeenCalledWith('deleted');
-        })
-      ));
-    });
+        // THEN
+        expect(service.delete).toHaveBeenCalledWith('user');
+        expect(mockActiveModal.close).toHaveBeenCalledWith('deleted');
+      })
+    ));
   });
 });

package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs

@@ -28,54 +28,52 @@ import { User } from '../user-management.model';
 
 import { UserManagementDetailComponent } from './user-management-detail.component';
 
-describe('Component Tests', () => {
-  describe('User Management Detail Component', () => {
-    let comp: UserManagementDetailComponent;
-    let fixture: ComponentFixture<UserManagementDetailComponent>;
+describe('User Management Detail Component', () => {
+  let comp: UserManagementDetailComponent;
+  let fixture: ComponentFixture<UserManagementDetailComponent>;
 
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          declarations: [UserManagementDetailComponent],
-          providers: [
-            {
-              provide: ActivatedRoute,
-              useValue: {
-                data: of({ user: new User(<%- tsKeyId %>, 'user', 'first', 'last', 'first@last.com', true, 'en', [Authority.USER], 'admin') }),
-              },
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [UserManagementDetailComponent],
+        providers: [
+          {
+            provide: ActivatedRoute,
+            useValue: {
+              data: of({ user: new User(<%- tsKeyId %>, 'user', 'first', 'last', 'first@last.com', true, 'en', [Authority.USER], 'admin') }),
             },
-          ],
-        })
-          .overrideTemplate(UserManagementDetailComponent, '')
-          .compileComponents();
+          },
+        ],
       })
-    );
+        .overrideTemplate(UserManagementDetailComponent, '')
+        .compileComponents();
+    })
+  );
 
-    beforeEach(() => {
-      fixture = TestBed.createComponent(UserManagementDetailComponent);
-      comp = fixture.componentInstance;
-    });
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UserManagementDetailComponent);
+    comp = fixture.componentInstance;
+  });
 
-    describe('OnInit', () => {
-      it('Should call load all on init', () => {
-        // WHEN
-        comp.ngOnInit();
+  describe('OnInit', () => {
+    it('Should call load all on init', () => {
+      // WHEN
+      comp.ngOnInit();
 
-        // THEN
-        expect(comp.user).toEqual(
-          expect.objectContaining({
-            id: <%- tsKeyId %>,
-            login: 'user',
-            firstName: 'first',
-            lastName: 'last',
-            email: 'first@last.com',
-            activated: true,
-            langKey: 'en',
-            authorities: [Authority.USER],
-            createdBy: 'admin',
-          })
-        );
-      });
+      // THEN
+      expect(comp.user).toEqual(
+        expect.objectContaining({
+          id: <%- tsKeyId %>,
+          login: 'user',
+          firstName: 'first',
+          lastName: 'last',
+          email: 'first@last.com',
+          activated: true,
+          langKey: 'en',
+          authorities: [Authority.USER],
+          createdBy: 'admin',
+        })
+      );
     });
   });
 });