generator-jhipster 7.1.0 → 7.4.0

package/generators/client/templates/angular/src/main/webapp/app/entities/user/user.service.spec.ts.ejs

@@ -29,105 +29,103 @@ import { User, IUser } from './user.model';
 
 import { UserService } from './user.service';
 
-describe('Service Tests', () => {
-  describe('User Service', () => {
-    let service: UserService;
-    let httpMock: HttpTestingController;
-    let expectedResult: IUser | IUser[] | boolean | number | null;
-
-    beforeEach(() => {
-      TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule],
+describe('User Service', () => {
+  let service: UserService;
+  let httpMock: HttpTestingController;
+  let expectedResult: IUser | IUser[] | boolean | number | null;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+    });
+    expectedResult = null;
+    service = TestBed.inject(UserService);
+    httpMock = TestBed.inject(HttpTestingController);
+  });
+
+  afterEach(() => {
+    httpMock.verify();
+  });
+
+  describe('Service methods', () => {
+    it('should return Users', () => {
+      service.query().subscribe(received => {
+        expectedResult = received.body;
       });
-      expectedResult = null;
-      service = TestBed.inject(UserService);
-      httpMock = TestBed.inject(HttpTestingController);
+
+      const req = httpMock.expectOne({ method: 'GET' });
+      req.flush([new User(<%- tsKeyId %>, 'user')]);
+      expect(expectedResult).toEqual([{ id: <%- tsKeyId %>, login: 'user' }]);
     });
 
-    afterEach(() => {
-      httpMock.verify();
+    it('should propagate not found response', () => {
+      service.query().subscribe({
+        error: (error: HttpErrorResponse) => expectedResult = error.status
+      });
+
+      const req = httpMock.expectOne({ method: 'GET' });
+      req.flush('Internal Server Error', {
+        status: 500,
+        statusText: 'Inernal Server Error',
+      });
+      expect(expectedResult).toEqual(500);
     });
 
-    describe('Service methods', () => {
-      it('should return Users', () => {
-        service.query().subscribe(received => {
-          expectedResult = received.body;
-        });
+    describe('addUserToCollectionIfMissing', () => {
+      it('should add a User to an empty array', () => {
+        const user: IUser = <%- testEntityPrimaryKey0 %>;
+        expectedResult = service.addUserToCollectionIfMissing([], user);
+        expect(expectedResult).toHaveLength(1);
+        expect(expectedResult).toContain(user);
+      });
+
+      it('should not add a User to an array that contains it', () => {
+        const user: IUser = <%- testEntityPrimaryKey0 %>;
+        const userCollection: IUser[] = [
+          {
+            ...user,
+          },
+          <%- testEntityPrimaryKey1 %>,
+        ];
+        expectedResult = service.addUserToCollectionIfMissing(userCollection, user);
+        expect(expectedResult).toHaveLength(2);
+      });
+
+      it("should add a User to an array that doesn't contain it", () => {
+        const user: IUser = <%- testEntityPrimaryKey0 %>;
+        const userCollection: IUser[] = [<%- testEntityPrimaryKey1 %>];
+        expectedResult = service.addUserToCollectionIfMissing(userCollection, user);
+        expect(expectedResult).toHaveLength(2);
+        expect(expectedResult).toContain(user);
+      });
+
+      it('should add only unique User to an array', () => {
+        const userArray: IUser[] = [<%- testEntityPrimaryKey0 %>, <%- testEntityPrimaryKey1 %>, <%- generateTestEntityPrimaryKey(user.primaryKey) %>];
+        const userCollection: IUser[] = [<%- testEntityPrimaryKey1 %>];
+        expectedResult = service.addUserToCollectionIfMissing(userCollection, ...userArray);
+        expect(expectedResult).toHaveLength(3);
+      });
 
-        const req = httpMock.expectOne({ method: 'GET' });
-        req.flush([new User(<%- tsKeyId %>, 'user')]);
-        expect(expectedResult).toEqual([{ id: <%- tsKeyId %>, login: 'user' }]);
+      it("should accept varargs", () => {
+        const user: IUser = <%- testEntityPrimaryKey0 %>;
+        const user2: IUser = <%- testEntityPrimaryKey1 %>;
+        expectedResult = service.addUserToCollectionIfMissing([], user, user2);
+        expect(expectedResult).toHaveLength(2);
+        expect(expectedResult).toContain(user);
+        expect(expectedResult).toContain(user2);
       });
 
-      it('should propagate not found response', () => {
-        service.query().subscribe({
-          error: (error: HttpErrorResponse) => expectedResult = error.status
-        });
-
-        const req = httpMock.expectOne({ method: 'GET' });
-        req.flush('Internal Server Error', {
-          status: 500,
-          statusText: 'Inernal Server Error',
-        });
-        expect(expectedResult).toEqual(500);
+      it("should accept null and undefined values", () => {
+        const user: IUser = <%- testEntityPrimaryKey0 %>;
+        expectedResult = service.addUserToCollectionIfMissing([], null, user, undefined);
+        expect(expectedResult).toHaveLength(1);
+        expect(expectedResult).toContain(user);
       });
 
-      describe('addUserToCollectionIfMissing', () => {
-        it('should add a User to an empty array', () => {
-          const user: IUser = <%- testEntityPrimaryKey0 %>;
-          expectedResult = service.addUserToCollectionIfMissing([], user);
-          expect(expectedResult).toHaveLength(1);
-          expect(expectedResult).toContain(user);
-        });
-
-        it('should not add a User to an array that contains it', () => {
-          const user: IUser = <%- testEntityPrimaryKey0 %>;
-          const userCollection: IUser[] = [
-            {
-              ...user,
-            },
-            <%- testEntityPrimaryKey1 %>,
-          ];
-          expectedResult = service.addUserToCollectionIfMissing(userCollection, user);
-          expect(expectedResult).toHaveLength(2);
-        });
-
-        it("should add a User to an array that doesn't contain it", () => {
-          const user: IUser = <%- testEntityPrimaryKey0 %>;
-          const userCollection: IUser[] = [<%- testEntityPrimaryKey1 %>];
-          expectedResult = service.addUserToCollectionIfMissing(userCollection, user);
-          expect(expectedResult).toHaveLength(2);
-          expect(expectedResult).toContain(user);
-        });
-
-        it('should add only unique User to an array', () => {
-          const userArray: IUser[] = [<%- testEntityPrimaryKey0 %>, <%- testEntityPrimaryKey1 %>, <%- generateTestEntityPrimaryKey(user.primaryKey) %>];
-          const userCollection: IUser[] = [<%- testEntityPrimaryKey1 %>];
-          expectedResult = service.addUserToCollectionIfMissing(userCollection, ...userArray);
-          expect(expectedResult).toHaveLength(3);
-        });
-
-        it("should accept varargs", () => {
-          const user: IUser = <%- testEntityPrimaryKey0 %>;
-          const user2: IUser = <%- testEntityPrimaryKey1 %>;
-          expectedResult = service.addUserToCollectionIfMissing([], user, user2);
-          expect(expectedResult).toHaveLength(2);
-          expect(expectedResult).toContain(user);
-          expect(expectedResult).toContain(user2);
-        });
-
-        it("should accept null and undefined values", () => {
-          const user: IUser = <%- testEntityPrimaryKey0 %>;
-          expectedResult = service.addUserToCollectionIfMissing([], null, user, undefined);
-          expect(expectedResult).toHaveLength(1);
-          expect(expectedResult).toContain(user);
-        });
-
-        it('should return initial array if no users is added', () => {
-          const userCollection: IUser[] = [<%- testEntityPrimaryKey1 %>];
-          expectedResult = service.addUserToCollectionIfMissing(userCollection, null, undefined);
-          expect(expectedResult).toEqual(userCollection);
-        });
+      it('should return initial array if no users is added', () => {
+        const userCollection: IUser[] = [<%- testEntityPrimaryKey1 %>];
+        expectedResult = service.addUserToCollectionIfMissing(userCollection, null, undefined);
+        expect(expectedResult).toEqual(userCollection);
       });
     });
   });

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

@@ -37,135 +37,133 @@ import { LoginService } from 'app/login/login.service';
 
 import { HomeComponent } from './home.component';
 
-describe('Component Tests', () => {
-  describe('Home Component', () => {
-    let comp: HomeComponent;
-    let fixture: ComponentFixture<HomeComponent>;
-    let mockAccountService: AccountService;
+describe('Home Component', () => {
+  let comp: HomeComponent;
+  let fixture: ComponentFixture<HomeComponent>;
+  let mockAccountService: AccountService;
 <%_ if (!authenticationTypeOauth2) { _%>
-    let mockRouter: Router;
+  let mockRouter: Router;
 <%_ } else { _%>
-    let mockLoginService: LoginService;
+  let mockLoginService: LoginService;
 <%_ } _%>
-    const account: Account = {
-      activated: true,
-      authorities: [],
-      email: '',
-      firstName: null,
-      langKey: '',
-      lastName: null,
-      login: 'login',
-      imageUrl: null,
-    };
-
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          declarations: [HomeComponent],
-          providers: [AccountService, <% if (!authenticationTypeOauth2) { %>Router<% } else { %>LoginService<% } %>],
-        })
-          .overrideTemplate(HomeComponent, '')
-          .compileComponents();
+  const account: Account = {
+    activated: true,
+    authorities: [],
+    email: '',
+    firstName: null,
+    langKey: '',
+    lastName: null,
+    login: 'login',
+    imageUrl: null,
+  };
+
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [HomeComponent],
+        providers: [AccountService, <% if (!authenticationTypeOauth2) { %>Router<% } else { %>LoginService<% } %>],
       })
-    );
-
-    beforeEach(() => {
-      fixture = TestBed.createComponent(HomeComponent);
-      comp = fixture.componentInstance;
-      mockAccountService = TestBed.inject(AccountService);
-      mockAccountService.identity = jest.fn(() => of(null));
-      mockAccountService.getAuthenticationState = jest.fn(() => of(null));
+        .overrideTemplate(HomeComponent, '')
+        .compileComponents();
+    })
+  );
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HomeComponent);
+    comp = fixture.componentInstance;
+    mockAccountService = TestBed.inject(AccountService);
+    mockAccountService.identity = jest.fn(() => of(null));
+    mockAccountService.getAuthenticationState = jest.fn(() => of(null));
 <%_ if (!authenticationTypeOauth2) { _%>
-      mockRouter = TestBed.inject(Router);
+    mockRouter = TestBed.inject(Router);
 <%_ } else { _%>
-      mockLoginService = TestBed.inject(LoginService);
+    mockLoginService = TestBed.inject(LoginService);
 <%_ } _%>
-    });
+  });
 
-    describe('ngOnInit', () => {
-      it('Should synchronize account variable with current account', () => {
+  describe('ngOnInit', () => {
+    it('Should synchronize account variable with current account', () => {
 <%_ if (!authenticationTypeOauth2) { _%>
-        // GIVEN
-        const authenticationState = new Subject<Account | null>();
-        mockAccountService.getAuthenticationState = jest.fn(() => authenticationState.asObservable());
+      // GIVEN
+      const authenticationState = new Subject<Account | null>();
+      mockAccountService.getAuthenticationState = jest.fn(() => authenticationState.asObservable());
 
-        // WHEN
-        comp.ngOnInit();
+      // WHEN
+      comp.ngOnInit();
 
-        // THEN
-        expect(comp.account).toBeNull();
+      // THEN
+      expect(comp.account).toBeNull();
 
-        // WHEN
-        authenticationState.next(account);
+      // WHEN
+      authenticationState.next(account);
 
-        // THEN
-        expect(comp.account).toEqual(account);
+      // THEN
+      expect(comp.account).toEqual(account);
 
-        // WHEN
-        authenticationState.next(null);
+      // WHEN
+      authenticationState.next(null);
 
-        // THEN
-        expect(comp.account).toBeNull();
+      // THEN
+      expect(comp.account).toBeNull();
 <%_ } else { _%>
-        // GIVEN
-        mockAccountService.identity = jest.fn(() => of(account));
+      // GIVEN
+      mockAccountService.identity = jest.fn(() => of(account));
 
-        // WHEN
-        comp.ngOnInit();
+      // WHEN
+      comp.ngOnInit();
 
-        // THEN
-        expect(comp.account).toEqual(account);
+      // THEN
+      expect(comp.account).toEqual(account);
 <%_ } _%>
-      });
     });
+  });
 
-    describe('login', () => {
+  describe('login', () => {
 <%_ if (!authenticationTypeOauth2) { _%>
-      it('Should navigate to /login on login', () => {
-        // WHEN
-        comp.login();
+    it('Should navigate to /login on login', () => {
+      // WHEN
+      comp.login();
 
-        // THEN
-        expect(mockRouter.navigate).toHaveBeenCalledWith(['/login']);
-      });
+      // THEN
+      expect(mockRouter.navigate).toHaveBeenCalledWith(['/login']);
+    });
 <%_ } else { _%>
-      it('Should call loginService.login on login', () => {
-        // WHEN
-        comp.login();
+    it('Should call loginService.login on login', () => {
+      // WHEN
+      comp.login();
 
-        // THEN
-        expect(mockLoginService.login).toHaveBeenCalled();
-      });
-<%_ } _%>
+      // THEN
+      expect(mockLoginService.login).toHaveBeenCalled();
     });
+<%_ } _%>
+  });
 
 <%_ if (!authenticationTypeOauth2) { _%>
-    describe('ngOnDestroy', () => {
-      it('Should destroy authentication state subscription on component destroy', () => {
-        // GIVEN
-        const authenticationState = new Subject<Account | null>();
-        mockAccountService.getAuthenticationState = jest.fn(() => authenticationState.asObservable());
+  describe('ngOnDestroy', () => {
+    it('Should destroy authentication state subscription on component destroy', () => {
+      // GIVEN
+      const authenticationState = new Subject<Account | null>();
+      mockAccountService.getAuthenticationState = jest.fn(() => authenticationState.asObservable());
 
-        // WHEN
-        comp.ngOnInit();
+      // WHEN
+      comp.ngOnInit();
 
-        // THEN
-        expect(comp.account).toBeNull();
+      // THEN
+      expect(comp.account).toBeNull();
 
-        // WHEN
-        authenticationState.next(account);
+      // WHEN
+      authenticationState.next(account);
 
-        // THEN
-        expect(comp.account).toEqual(account);
+      // THEN
+      expect(comp.account).toEqual(account);
 
-        // WHEN
-        comp.ngOnDestroy();
-        authenticationState.next(null);
+      // WHEN
+      comp.ngOnDestroy();
+      authenticationState.next(null);
 
-        // THEN
-        expect(comp.account).toEqual(account);
-      });
+      // THEN
+      expect(comp.account).toEqual(account);
     });
-<%_ } _%>
   });
+<%_ } _%>
 });