generator-jhipster 7.2.0 → 7.4.1

package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs

@@ -36,88 +36,86 @@ import { LoginService } from 'app/login/login.service';
 
 import { NavbarComponent } from './navbar.component';
 
-describe('Component Tests', () => {
-  describe('Navbar Component', () => {
-    let comp: NavbarComponent;
-    let fixture: ComponentFixture<NavbarComponent>;
-    let accountService: AccountService;
-    let profileService: ProfileService;
-    const account: Account = {
-      activated: true,
-      authorities: [],
-      email: '',
-      firstName: 'John',
-      langKey: '',
-      lastName: 'Doe',
-      login: 'john.doe',
-      imageUrl: '',
-    };
-
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          imports: [HttpClientTestingModule, NgxWebstorageModule.forRoot()<% if (enableTranslation) { %>, TranslateModule.forRoot()<% } %>],
-          declarations: [NavbarComponent],
-          providers: [Router, LoginService],
-        })
-          .overrideTemplate(NavbarComponent, '')
-          .compileComponents();
+describe('Navbar Component', () => {
+  let comp: NavbarComponent;
+  let fixture: ComponentFixture<NavbarComponent>;
+  let accountService: AccountService;
+  let profileService: ProfileService;
+  const account: Account = {
+    activated: true,
+    authorities: [],
+    email: '',
+    firstName: 'John',
+    langKey: '',
+    lastName: 'Doe',
+    login: 'john.doe',
+    imageUrl: '',
+  };
+
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [HttpClientTestingModule, NgxWebstorageModule.forRoot()<% if (enableTranslation) { %>, TranslateModule.forRoot()<% } %>],
+        declarations: [NavbarComponent],
+        providers: [Router, LoginService],
       })
-    );
-
-    beforeEach(() => {
-      fixture = TestBed.createComponent(NavbarComponent);
-      comp = fixture.componentInstance;
-      accountService = TestBed.inject(AccountService);
-      profileService = TestBed.inject(ProfileService);
-    });
+        .overrideTemplate(NavbarComponent, '')
+        .compileComponents();
+    })
+  );
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NavbarComponent);
+    comp = fixture.componentInstance;
+    accountService = TestBed.inject(AccountService);
+    profileService = TestBed.inject(ProfileService);
+  });
 
-    it('Should call profileService.getProfileInfo on init', () => {
-      // GIVEN
-      jest.spyOn(profileService, 'getProfileInfo').mockReturnValue(of(new ProfileInfo()));
+  it('Should call profileService.getProfileInfo on init', () => {
+    // GIVEN
+    jest.spyOn(profileService, 'getProfileInfo').mockReturnValue(of(new ProfileInfo()));
 
-      // WHEN
-      comp.ngOnInit();
+    // WHEN
+    comp.ngOnInit();
 
-      // THEN
-      expect(profileService.getProfileInfo).toHaveBeenCalled();
-    });
+    // THEN
+    expect(profileService.getProfileInfo).toHaveBeenCalled();
+  });
 
-    it('Should hold current authenticated user in variable account', () => {
-      // WHEN
-      comp.ngOnInit();
+  it('Should hold current authenticated user in variable account', () => {
+    // WHEN
+    comp.ngOnInit();
 
-      // THEN
-      expect(comp.account).toBeNull();
+    // THEN
+    expect(comp.account).toBeNull();
 
-      // WHEN
-      accountService.authenticate(account);
+    // WHEN
+    accountService.authenticate(account);
 
-      // THEN
-      expect(comp.account).toEqual(account);
+    // THEN
+    expect(comp.account).toEqual(account);
 
-      // WHEN
-      accountService.authenticate(null);
+    // WHEN
+    accountService.authenticate(null);
 
-      // THEN
-      expect(comp.account).toBeNull();
-    });
+    // THEN
+    expect(comp.account).toBeNull();
+  });
 
-    it('Should hold current authenticated user in variable account if user is authenticated before page load', () => {
-      // GIVEN
-      accountService.authenticate(account);
+  it('Should hold current authenticated user in variable account if user is authenticated before page load', () => {
+    // GIVEN
+    accountService.authenticate(account);
 
-      // WHEN
-      comp.ngOnInit();
+    // WHEN
+    comp.ngOnInit();
 
-      // THEN
-      expect(comp.account).toEqual(account);
+    // THEN
+    expect(comp.account).toEqual(account);
 
-      // WHEN
-      accountService.authenticate(null);
+    // WHEN
+    accountService.authenticate(null);
 
-      // THEN
-      expect(comp.account).toBeNull();
-    });
+    // THEN
+    expect(comp.account).toBeNull();
   });
 });

package/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts.ejs

@@ -7,38 +7,36 @@ import { ProfileService } from 'app/layouts/profiles/profile.service';
 
 import { PageRibbonComponent } from './page-ribbon.component';
 
-describe('Component Tests', () => {
-  describe('Page Ribbon Component', () => {
-    let comp: PageRibbonComponent;
-    let fixture: ComponentFixture<PageRibbonComponent>;
-    let profileService: ProfileService;
-
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          imports: [HttpClientTestingModule],
-          declarations: [PageRibbonComponent],
-        })
-          .overrideTemplate(PageRibbonComponent, '')
-          .compileComponents();
+describe('Page Ribbon Component', () => {
+  let comp: PageRibbonComponent;
+  let fixture: ComponentFixture<PageRibbonComponent>;
+  let profileService: ProfileService;
+
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [HttpClientTestingModule],
+        declarations: [PageRibbonComponent],
       })
-    );
-
-    beforeEach(() => {
-      fixture = TestBed.createComponent(PageRibbonComponent);
-      comp = fixture.componentInstance;
-      profileService = TestBed.inject(ProfileService);
-    });
+        .overrideTemplate(PageRibbonComponent, '')
+        .compileComponents();
+    })
+  );
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PageRibbonComponent);
+    comp = fixture.componentInstance;
+    profileService = TestBed.inject(ProfileService);
+  });
 
-    it('Should call profileService.getProfileInfo on init', () => {
-      // GIVEN
-      jest.spyOn(profileService, 'getProfileInfo').mockReturnValue(of(new ProfileInfo()));
+  it('Should call profileService.getProfileInfo on init', () => {
+    // GIVEN
+    jest.spyOn(profileService, 'getProfileInfo').mockReturnValue(of(new ProfileInfo()));
 
-      // WHEN
-      comp.ngOnInit();
+    // WHEN
+    comp.ngOnInit();
 
-      // THEN
-      expect(profileService.getProfileInfo).toHaveBeenCalled();
-    });
+    // THEN
+    expect(profileService.getProfileInfo).toHaveBeenCalled();
   });
 });

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

@@ -31,144 +31,142 @@ import { AccountService } from 'app/core/auth/account.service';
 import { LoginService } from './login.service';
 import { LoginComponent } from './login.component';
 
-describe('Component Tests', () => {
-  describe('LoginComponent', () => {
-    let comp: LoginComponent;
-    let fixture: ComponentFixture<LoginComponent>;
-    let mockRouter: Router;
-    let mockAccountService: AccountService;
-    let mockLoginService: LoginService;
-
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          declarations: [LoginComponent],
-          providers: [
-            FormBuilder,
-            AccountService,
-            Router,
-            {
-              provide: LoginService,
-              useValue: {
-                login: jest.fn(() => of({})),
-              },
+describe('LoginComponent', () => {
+  let comp: LoginComponent;
+  let fixture: ComponentFixture<LoginComponent>;
+  let mockRouter: Router;
+  let mockAccountService: AccountService;
+  let mockLoginService: LoginService;
+
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [LoginComponent],
+        providers: [
+          FormBuilder,
+          AccountService,
+          Router,
+          {
+            provide: LoginService,
+            useValue: {
+              login: jest.fn(() => of({})),
             },
-          ],
-        })
-          .overrideTemplate(LoginComponent, '')
-          .compileComponents();
+          },
+        ],
       })
-    );
-
-    beforeEach(() => {
-      fixture = TestBed.createComponent(LoginComponent);
-      comp = fixture.componentInstance;
-      mockRouter = TestBed.inject(Router);
-      mockLoginService = TestBed.inject(LoginService);
-      mockAccountService = TestBed.inject(AccountService);
-    });
+        .overrideTemplate(LoginComponent, '')
+        .compileComponents();
+    })
+  );
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LoginComponent);
+    comp = fixture.componentInstance;
+    mockRouter = TestBed.inject(Router);
+    mockLoginService = TestBed.inject(LoginService);
+    mockAccountService = TestBed.inject(AccountService);
+  });
 
-    describe('ngOnInit', () => {
-      it('Should call accountService.identity on Init', () => {
-        // GIVEN
-        mockAccountService.identity = jest.fn(() => of(null));
-        mockAccountService.getAuthenticationState = jest.fn(() => of(null));
+  describe('ngOnInit', () => {
+    it('Should call accountService.identity on Init', () => {
+      // GIVEN
+      mockAccountService.identity = jest.fn(() => of(null));
+      mockAccountService.getAuthenticationState = jest.fn(() => of(null));
 
-        // WHEN
-        comp.ngOnInit();
+      // WHEN
+      comp.ngOnInit();
 
-        // THEN
-        expect(mockAccountService.identity).toHaveBeenCalled();
-      });
+      // THEN
+      expect(mockAccountService.identity).toHaveBeenCalled();
+    });
 
-      it('Should call accountService.isAuthenticated on Init', () => {
-        // GIVEN
-        mockAccountService.identity = jest.fn(() => of(null));
+    it('Should call accountService.isAuthenticated on Init', () => {
+      // GIVEN
+      mockAccountService.identity = jest.fn(() => of(null));
 
-        // WHEN
-        comp.ngOnInit();
+      // WHEN
+      comp.ngOnInit();
 
-        // THEN
-        expect(mockAccountService.isAuthenticated).toHaveBeenCalled();
-      });
+      // THEN
+      expect(mockAccountService.isAuthenticated).toHaveBeenCalled();
+    });
 
-      it('should navigate to home page on Init if authenticated=true', () => {
-        // GIVEN
-        mockAccountService.identity = jest.fn(() => of(null));
-        mockAccountService.getAuthenticationState = jest.fn(() => of(null));
-        mockAccountService.isAuthenticated = () => true;
+    it('should navigate to home page on Init if authenticated=true', () => {
+      // GIVEN
+      mockAccountService.identity = jest.fn(() => of(null));
+      mockAccountService.getAuthenticationState = jest.fn(() => of(null));
+      mockAccountService.isAuthenticated = () => true;
 
-        // WHEN
-        comp.ngOnInit();
+      // WHEN
+      comp.ngOnInit();
 
-        // THEN
-        expect(mockRouter.navigate).toHaveBeenCalledWith(['']);
-      });
+      // THEN
+      expect(mockRouter.navigate).toHaveBeenCalledWith(['']);
     });
+  });
 
-    describe('ngAfterViewInit', () => {
-      it('shoult set focus to username input after the view has been initialized', () => {
-        // GIVEN
-        const node = {
-          focus: jest.fn(),
-        };
-        comp.username = new ElementRef(node);
+  describe('ngAfterViewInit', () => {
+    it('shoult set focus to username input after the view has been initialized', () => {
+      // GIVEN
+      const node = {
+        focus: jest.fn(),
+      };
+      comp.username = new ElementRef(node);
 
-        // WHEN
-        comp.ngAfterViewInit();
+      // WHEN
+      comp.ngAfterViewInit();
 
-        // THEN
-        expect(node.focus).toHaveBeenCalled();
-      });
+      // THEN
+      expect(node.focus).toHaveBeenCalled();
     });
+  });
 
-    describe('login', () => {
-      it('should authenticate the user and navigate to home page', () => {
-        // GIVEN
-        const credentials = {
-          username: 'admin',
-          password: 'admin',
-          rememberMe: true,
-        };
-
-        comp.loginForm.patchValue({
-          username: 'admin',
-          password: 'admin',
-          rememberMe: true,
-        });
-
-        // WHEN
-        comp.login();
-
-        // THEN
-        expect(comp.authenticationError).toEqual(false);
-        expect(mockLoginService.login).toHaveBeenCalledWith(credentials);
-        expect(mockRouter.navigate).toHaveBeenCalledWith(['']);
+  describe('login', () => {
+    it('should authenticate the user and navigate to home page', () => {
+      // GIVEN
+      const credentials = {
+        username: 'admin',
+        password: 'admin',
+        rememberMe: true,
+      };
+
+      comp.loginForm.patchValue({
+        username: 'admin',
+        password: 'admin',
+        rememberMe: true,
       });
 
-      it('should authenticate the user but not navigate to home page if authentication process is already routing to cached url from localstorage', () => {
-        // GIVEN
-        jest.spyOn(mockRouter, 'getCurrentNavigation').mockReturnValue({} as Navigation);
+      // WHEN
+      comp.login();
 
-        // WHEN
-        comp.login();
+      // THEN
+      expect(comp.authenticationError).toEqual(false);
+      expect(mockLoginService.login).toHaveBeenCalledWith(credentials);
+      expect(mockRouter.navigate).toHaveBeenCalledWith(['']);
+    });
 
-        // THEN
-        expect(comp.authenticationError).toEqual(false);
-        expect(mockRouter.navigate).not.toHaveBeenCalled();
-      });
+    it('should authenticate the user but not navigate to home page if authentication process is already routing to cached url from localstorage', () => {
+      // GIVEN
+      jest.spyOn(mockRouter, 'getCurrentNavigation').mockReturnValue({} as Navigation);
 
-      it('should stay on login form and show error message on login error', () => {
-        // GIVEN
-        mockLoginService.login = jest.fn(() => throwError({}));
+      // WHEN
+      comp.login();
 
-        // WHEN
-        comp.login();
+      // THEN
+      expect(comp.authenticationError).toEqual(false);
+      expect(mockRouter.navigate).not.toHaveBeenCalled();
+    });
 
-        // THEN
-        expect(comp.authenticationError).toEqual(true);
-        expect(mockRouter.navigate).not.toHaveBeenCalled();
-      });
+    it('should stay on login form and show error message on login error', () => {
+      // GIVEN
+      mockLoginService.login = jest.fn(() => throwError({}));
+
+      // WHEN
+      comp.login();
+
+      // THEN
+      expect(comp.authenticationError).toEqual(true);
+      expect(mockRouter.navigate).not.toHaveBeenCalled();
     });
   });
 });