generator-jhipster 7.3.0 → 7.5.0

package/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs

@@ -16,9 +16,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (enableTranslation) { _%>
-jest.mock('@ngx-translate/core');
-<%_ } _%>
 jest.mock('app/core/auth/account.service');
 
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
@@ -26,7 +23,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { FormBuilder } from '@angular/forms';
 import { throwError, of } from 'rxjs';
 <%_ if (enableTranslation) { _%>
-import { TranslateService } from '@ngx-translate/core';
+import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 
 import { AccountService } from 'app/core/auth/account.service';
@@ -34,87 +31,90 @@ import { Account } from 'app/core/auth/account.model';
 
 import { SettingsComponent } from './settings.component';
 
-describe('Component Tests', () => {
-  describe('SettingsComponent', () => {
-    let comp: SettingsComponent;
-    let fixture: ComponentFixture<SettingsComponent>;
-    let mockAccountService: AccountService;
-    const account: Account = {
+describe('SettingsComponent', () => {
+  let comp: SettingsComponent;
+  let fixture: ComponentFixture<SettingsComponent>;
+  let mockAccountService: AccountService;
+  const account: Account = {
+    firstName: 'John',
+    lastName: 'Doe',
+    activated: true,
+    email: 'john.doe@mail.com',
+    langKey: '<%= nativeLanguage %>',
+    login: 'john',
+    authorities: [],
+    imageUrl: '',
+  };
+
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [
+<%_ if (enableTranslation) { _%>
+          TranslateModule.forRoot(),
+<%_ } _%>
+          HttpClientTestingModule
+        ],
+        declarations: [SettingsComponent],
+        providers: [FormBuilder, AccountService],
+      })
+        .overrideTemplate(SettingsComponent, '')
+        .compileComponents();
+    })
+  );
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SettingsComponent);
+    comp = fixture.componentInstance;
+    mockAccountService = TestBed.inject(AccountService);
+    mockAccountService.identity = jest.fn(() => of(account));
+    mockAccountService.getAuthenticationState = jest.fn(() => of(account));
+  });
+
+  it('should send the current identity upon save', () => {
+    // GIVEN
+    mockAccountService.save = jest.fn(() => of({}));
+    const settingsFormValues = {
       firstName: 'John',
       lastName: 'Doe',
-      activated: true,
       email: 'john.doe@mail.com',
+<%_ if (enableTranslation) { _%>
       langKey: '<%= nativeLanguage %>',
-      login: 'john',
-      authorities: [],
-      imageUrl: '',
+<%_ } _%>
     };
 
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          imports: [HttpClientTestingModule],
-          declarations: [SettingsComponent],
-          providers: [FormBuilder<% if (enableTranslation) { %>, TranslateService<% } %>, AccountService],
-        })
-          .overrideTemplate(SettingsComponent, '')
-          .compileComponents();
-      })
-    );
-
-    beforeEach(() => {
-      fixture = TestBed.createComponent(SettingsComponent);
-      comp = fixture.componentInstance;
-      mockAccountService = TestBed.inject(AccountService);
-      mockAccountService.identity = jest.fn(() => of(account));
-      mockAccountService.getAuthenticationState = jest.fn(() => of(account));
-    });
-
-    it('should send the current identity upon save', () => {
-      // GIVEN
-      mockAccountService.save = jest.fn(() => of({}));
-      const settingsFormValues = {
-        firstName: 'John',
-        lastName: 'Doe',
-        email: 'john.doe@mail.com',
-        <%_ if (enableTranslation) { _%>
-        langKey: '<%= nativeLanguage %>',
-        <%_ } _%>
-      };
-
-      // WHEN
-      comp.ngOnInit();
-      comp.save();
-
-      // THEN
-      expect(mockAccountService.identity).toHaveBeenCalled();
-      expect(mockAccountService.save).toHaveBeenCalledWith(account);
-      expect(mockAccountService.authenticate).toHaveBeenCalledWith(account);
-      expect(comp.settingsForm.value).toEqual(settingsFormValues);
-    });
-
-    it('should notify of success upon successful save', () => {
-      // GIVEN
-      mockAccountService.save = jest.fn(() => of({}));
-
-      // WHEN
-      comp.ngOnInit();
-      comp.save();
-
-      // THEN
-      expect(comp.success).toBe(true);
-    });
-
-    it('should notify of error upon failed save', () => {
-      // GIVEN
-      mockAccountService.save = jest.fn(() => throwError('ERROR'));
-
-      // WHEN
-      comp.ngOnInit();
-      comp.save();
-
-      // THEN
-      expect(comp.success).toBe(false);
-    });
+    // WHEN
+    comp.ngOnInit();
+    comp.save();
+
+    // THEN
+    expect(mockAccountService.identity).toHaveBeenCalled();
+    expect(mockAccountService.save).toHaveBeenCalledWith(account);
+    expect(mockAccountService.authenticate).toHaveBeenCalledWith(account);
+    expect(comp.settingsForm.value).toEqual(settingsFormValues);
+  });
+
+  it('should notify of success upon successful save', () => {
+    // GIVEN
+    mockAccountService.save = jest.fn(() => of({}));
+
+    // WHEN
+    comp.ngOnInit();
+    comp.save();
+
+    // THEN
+    expect(comp.success).toBe(true);
+  });
+
+  it('should notify of error upon failed save', () => {
+    // GIVEN
+    mockAccountService.save = jest.fn(() => throwError('ERROR'));
+
+    // WHEN
+    comp.ngOnInit();
+    comp.save();
+
+    // THEN
+    expect(comp.success).toBe(false);
   });
 });

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

@@ -24,66 +24,64 @@ import { ConfigurationComponent } from './configuration.component';
 import { ConfigurationService } from './configuration.service';
 import { Bean, PropertySource } from './configuration.model';
 
-describe('Component Tests', () => {
-  describe('ConfigurationComponent', () => {
-    let comp: ConfigurationComponent;
-    let fixture: ComponentFixture<ConfigurationComponent>;
-    let service: ConfigurationService;
+describe('ConfigurationComponent', () => {
+  let comp: ConfigurationComponent;
+  let fixture: ComponentFixture<ConfigurationComponent>;
+  let service: ConfigurationService;
 
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          imports: [HttpClientTestingModule],
-          declarations: [ConfigurationComponent],
-          providers: [ConfigurationService],
-        })
-          .overrideTemplate(ConfigurationComponent, '')
-          .compileComponents();
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [HttpClientTestingModule],
+        declarations: [ConfigurationComponent],
+        providers: [ConfigurationService],
       })
-    );
+        .overrideTemplate(ConfigurationComponent, '')
+        .compileComponents();
+    })
+  );
 
-    beforeEach(() => {
-      fixture = TestBed.createComponent(ConfigurationComponent);
-      comp = fixture.componentInstance;
-      service = TestBed.inject(ConfigurationService);
-    });
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ConfigurationComponent);
+    comp = fixture.componentInstance;
+    service = TestBed.inject(ConfigurationService);
+  });
 
-    describe('OnInit', () => {
-      it('Should call load all on init', () => {
-        // GIVEN
-        const beans: Bean[] = [
-          {
-            prefix: 'jhipster',
-            properties: {
-              clientApp: {
-                name: 'jhipsterApp',
-              },
+  describe('OnInit', () => {
+    it('Should call load all on init', () => {
+      // GIVEN
+      const beans: Bean[] = [
+        {
+          prefix: 'jhipster',
+          properties: {
+            clientApp: {
+              name: 'jhipsterApp',
             },
           },
-        ];
-        const propertySources: PropertySource[] = [
-          {
-            name: 'server.ports',
-            properties: {
-              'local.server.port': {
-                value: '8080',
-              },
+        },
+      ];
+      const propertySources: PropertySource[] = [
+        {
+          name: 'server.ports',
+          properties: {
+            'local.server.port': {
+              value: '8080',
             },
           },
-        ];
-        jest.spyOn(service, 'getBeans').mockReturnValue(of(beans));
-        jest.spyOn(service, 'getPropertySources').mockReturnValue(of(propertySources));
+        },
+      ];
+      jest.spyOn(service, 'getBeans').mockReturnValue(of(beans));
+      jest.spyOn(service, 'getPropertySources').mockReturnValue(of(propertySources));
 
-        // WHEN
-        comp.ngOnInit();
+      // WHEN
+      comp.ngOnInit();
 
-        // THEN
-        expect(service.getBeans).toHaveBeenCalled();
-        expect(service.getPropertySources).toHaveBeenCalled();
-        expect(comp.allBeans).toEqual(beans);
-        expect(comp.beans).toEqual(beans);
-        expect(comp.propertySources).toEqual(propertySources);
-      });
+      // THEN
+      expect(service.getBeans).toHaveBeenCalled();
+      expect(service.getPropertySources).toHaveBeenCalled();
+      expect(comp.allBeans).toEqual(beans);
+      expect(comp.beans).toEqual(beans);
+      expect(comp.propertySources).toEqual(propertySources);
     });
   });
 });

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

@@ -25,64 +25,62 @@ import { HealthComponent } from './health.component';
 import { HealthService } from './health.service';
 import { Health } from './health.model';
 
-describe('Component Tests', () => {
-  describe('HealthComponent', () => {
-    let comp: HealthComponent;
-    let fixture: ComponentFixture<HealthComponent>;
-    let service: HealthService;
+describe('HealthComponent', () => {
+  let comp: HealthComponent;
+  let fixture: ComponentFixture<HealthComponent>;
+  let service: HealthService;
 
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          imports: [HttpClientTestingModule],
-          declarations: [HealthComponent],
-        })
-          .overrideTemplate(HealthComponent, '')
-          .compileComponents();
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [HttpClientTestingModule],
+        declarations: [HealthComponent],
       })
-    );
+        .overrideTemplate(HealthComponent, '')
+        .compileComponents();
+    })
+  );
 
-    beforeEach(() => {
-      fixture = TestBed.createComponent(HealthComponent);
-      comp = fixture.componentInstance;
-      service = TestBed.inject(HealthService);
-    });
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HealthComponent);
+    comp = fixture.componentInstance;
+    service = TestBed.inject(HealthService);
+  });
 
-    describe('getBadgeClass', () => {
-      it('should get badge class', () => {
-        const upBadgeClass = comp.getBadgeClass('UP');
-        const downBadgeClass = comp.getBadgeClass('DOWN');
-        expect(upBadgeClass).toEqual('badge-success');
-        expect(downBadgeClass).toEqual('badge-danger');
-      });
+  describe('getBadgeClass', () => {
+    it('should get badge class', () => {
+      const upBadgeClass = comp.getBadgeClass('UP');
+      const downBadgeClass = comp.getBadgeClass('DOWN');
+      expect(upBadgeClass).toEqual('badge-success');
+      expect(downBadgeClass).toEqual('badge-danger');
     });
+  });
 
-    describe('refresh', () => {
-      it('should call refresh on init', () => {
-        // GIVEN
-        const health: Health = { status: 'UP', components: { mail: { status: 'UP', details: { mailDetail: 'mail' } } } };
-        jest.spyOn(service, 'checkHealth').mockReturnValue(of(health));
+  describe('refresh', () => {
+    it('should call refresh on init', () => {
+      // GIVEN
+      const health: Health = { status: 'UP', components: { mail: { status: 'UP', details: { mailDetail: 'mail' } } } };
+      jest.spyOn(service, 'checkHealth').mockReturnValue(of(health));
 
-        // WHEN
-        comp.ngOnInit();
+      // WHEN
+      comp.ngOnInit();
 
-        // THEN
-        expect(service.checkHealth).toHaveBeenCalled();
-        expect(comp.health).toEqual(health);
-      });
+      // THEN
+      expect(service.checkHealth).toHaveBeenCalled();
+      expect(comp.health).toEqual(health);
+    });
 
-      it('should handle a 503 on refreshing health data', () => {
-        // GIVEN
-        const health: Health = { status: 'DOWN', components: { mail: { status: 'DOWN' } } };
-        jest.spyOn(service, 'checkHealth').mockReturnValue(throwError(new HttpErrorResponse({ status: 503, error: health })));
+    it('should handle a 503 on refreshing health data', () => {
+      // GIVEN
+      const health: Health = { status: 'DOWN', components: { mail: { status: 'DOWN' } } };
+      jest.spyOn(service, 'checkHealth').mockReturnValue(throwError(new HttpErrorResponse({ status: 503, error: health })));
 
-        // WHEN
-        comp.refresh();
+      // WHEN
+      comp.refresh();
 
-        // THEN
-        expect(service.checkHealth).toHaveBeenCalled();
-        expect(comp.health).toEqual(health);
-      });
+      // THEN
+      expect(service.checkHealth).toHaveBeenCalled();
+      expect(comp.health).toEqual(health);
     });
   });
 });

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

@@ -45,14 +45,14 @@ export class HealthComponent implements OnInit {
   }
 
   refresh(): void {
-    this.healthService.checkHealth().subscribe(
-      health => (this.health = health),
-      (error: HttpErrorResponse) => {
+    this.healthService.checkHealth().subscribe({
+      next: health => (this.health = health),
+      error: (error: HttpErrorResponse) => {
         if (error.status === 503) {
           this.health = error.error;
         }
       }
-    );
+    });
   }
 
   showHealth(health: { key: string; value: HealthDetails }): void {

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

@@ -0,0 +1,66 @@
+<%#
+ Copyright 2013-2021 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+import { TestBed } from '@angular/core/testing';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+
+import { HealthService } from './health.service';
+import { ApplicationConfigService } from 'app/core/config/application-config.service';
+
+describe('HealthService Service', () => {
+  let service: HealthService;
+  let httpMock: HttpTestingController;
+  let applicationConfigService: ApplicationConfigService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+    });
+
+    service = TestBed.inject(HealthService);
+    applicationConfigService = TestBed.inject(ApplicationConfigService);
+    httpMock = TestBed.inject(HttpTestingController);
+  });
+
+  afterEach(() => {
+    httpMock.verify();
+  });
+
+  describe('Service methods', () => {
+    it('should call management/health endpoint with correct values', () => {
+      // GIVEN
+      let expectedResult;
+      const checkHealth = {
+        components: []
+      };
+
+      // WHEN
+      service.checkHealth().subscribe(received => {
+        expectedResult = received;
+      });
+      const testRequest = httpMock.expectOne({
+        method: 'GET',
+        url: applicationConfigService.getEndpointFor('management/health'),
+      });
+      testRequest.flush(checkHealth);
+
+      // THEN
+      expect(expectedResult).toEqual(checkHealth);
+    });
+  });
+});