generator-jhipster 7.2.0 → 7.4.1

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/logs/logs.service.spec.ts.ejs

@@ -21,31 +21,29 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
 
 import { LogsService } from './logs.service';
 
-describe('Service Tests', () => {
-  describe('Logs Service', () => {
-    let service: LogsService;
-    let httpMock: HttpTestingController;
-
-    beforeEach(() => {
-      TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule],
-      });
-
-      service = TestBed.inject(LogsService);
-      httpMock = TestBed.inject(HttpTestingController);
-    });
+describe('Logs Service', () => {
+  let service: LogsService;
+  let httpMock: HttpTestingController;
 
-    afterEach(() => {
-      httpMock.verify();
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
     });
 
-    describe('Service methods', () => {
-      it('should change log level', () => {
-        service.changeLevel('main', 'ERROR').subscribe();
+    service = TestBed.inject(LogsService);
+    httpMock = TestBed.inject(HttpTestingController);
+  });
+
+  afterEach(() => {
+    httpMock.verify();
+  });
+
+  describe('Service methods', () => {
+    it('should change log level', () => {
+      service.changeLevel('main', 'ERROR').subscribe();
 
-        const req = httpMock.expectOne({ method: 'POST' });
-        expect(req.request.body).toEqual({ configuredLevel: 'ERROR' });
-      });
+      const req = httpMock.expectOne({ method: 'POST' });
+      expect(req.request.body).toEqual({ configuredLevel: 'ERROR' });
     });
   });
 });

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/metrics/metrics.service.spec.ts.ejs

@@ -22,80 +22,78 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
 import { MetricsService } from './metrics.service';
 import { ThreadDump, ThreadState } from './metrics.model';
 
-describe('Service Tests', () => {
-  describe('Logs Service', () => {
-    let service: MetricsService;
-    let httpMock: HttpTestingController;
+describe('Logs Service', () => {
+  let service: MetricsService;
+  let httpMock: HttpTestingController;
 
-    beforeEach(() => {
-      TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule],
-      });
-      service = TestBed.inject(MetricsService);
-      httpMock = TestBed.inject(HttpTestingController);
-    });
-
-    afterEach(() => {
-      httpMock.verify();
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
     });
+    service = TestBed.inject(MetricsService);
+    httpMock = TestBed.inject(HttpTestingController);
+  });
 
-    describe('Service methods', () => {
-      it('should return Metrics', () => {
-        let expectedResult;
-        const metrics = {
-          jvm: {},
-          'http.server.requests': {},
-          cache: {},
-          services: {},
-          databases: {},
-          garbageCollector: {},
-          processMetrics: {},
-        };
+  afterEach(() => {
+    httpMock.verify();
+  });
 
-        service.getMetrics().subscribe(received => {
-          expectedResult = received;
-        });
+  describe('Service methods', () => {
+    it('should return Metrics', () => {
+      let expectedResult;
+      const metrics = {
+        jvm: {},
+        'http.server.requests': {},
+        cache: {},
+        services: {},
+        databases: {},
+        garbageCollector: {},
+        processMetrics: {},
+      };
 
-        const req = httpMock.expectOne({ method: 'GET' });
-        req.flush(metrics);
-        expect(expectedResult).toEqual(metrics);
+      service.getMetrics().subscribe(received => {
+        expectedResult = received;
       });
 
-      it('should return Thread Dump', () => {
-        let expectedResult: ThreadDump | null = null;
-        const dump: ThreadDump = {
-          threads: [
-            {
-              threadName: 'Reference Handler',
-              threadId: 2,
-              blockedTime: -1,
-              blockedCount: 7,
-              waitedTime: -1,
-              waitedCount: 0,
-              lockName: null,
-              lockOwnerId: -1,
-              lockOwnerName: null,
-              daemon: true,
-              inNative: false,
-              suspended: false,
-              threadState: ThreadState.Runnable,
-              priority: 10,
-              stackTrace: [],
-              lockedMonitors: [],
-              lockedSynchronizers: [],
-              lockInfo: null,
-            },
-          ],
-        };
+      const req = httpMock.expectOne({ method: 'GET' });
+      req.flush(metrics);
+      expect(expectedResult).toEqual(metrics);
+    });
 
-        service.threadDump().subscribe(received => {
-          expectedResult = received;
-        });
+    it('should return Thread Dump', () => {
+      let expectedResult: ThreadDump | null = null;
+      const dump: ThreadDump = {
+        threads: [
+          {
+            threadName: 'Reference Handler',
+            threadId: 2,
+            blockedTime: -1,
+            blockedCount: 7,
+            waitedTime: -1,
+            waitedCount: 0,
+            lockName: null,
+            lockOwnerId: -1,
+            lockOwnerName: null,
+            daemon: true,
+            inNative: false,
+            suspended: false,
+            threadState: ThreadState.Runnable,
+            priority: 10,
+            stackTrace: [],
+            lockedMonitors: [],
+            lockedSynchronizers: [],
+            lockInfo: null,
+          },
+        ],
+      };
 
-        const req = httpMock.expectOne({ method: 'GET' });
-        req.flush(dump);
-        expect(expectedResult).toEqual(dump);
+      service.threadDump().subscribe(received => {
+        expectedResult = received;
       });
+
+      const req = httpMock.expectOne({ method: 'GET' });
+      req.flush(dump);
+      expect(expectedResult).toEqual(dump);
     });
   });
 });