#18 fix unit-tests and typos

Author: enriquezrene

README.md

@@ -26,7 +26,7 @@ The app will automatically reload if you change anything in the source files.
 ## Prepare your environment 
 
 ### Set environment variables
-Create file .keys.json from keys.example.ts into environments folder
+Create file .keys.json from keys.example.ts into environments folder with the content pinned in our slack channel
 
 ### Prepare your environment for vscode
 Install the following extensions:

src/app/app-routing.module.ts

@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
-import { AzureGuardService } from './guards/azure-guard.service'
+import { AzureGuardService } from './guards/azure-guard.service';
 import { ReportsComponent } from './modules/reports/pages/reports.component';
 import { TimeClockComponent } from './modules/time-clock/pages/time-clock.component';
 import { TimeEntriesComponent } from './modules/time-entries/pages/time-entries.component';
@@ -12,7 +12,7 @@ import { LoginComponent } from './modules/login/login.component';
 
 const routes: Routes = [
 
-  { path: '', component: HomeComponent, canActivate:[AzureGuardService],
+  { path: '', component: HomeComponent, canActivate: [AzureGuardService],
     children: [
       { path: 'reports', component: ReportsComponent },
       { path: 'time-clock', component: TimeClockComponent },

src/app/guards/azure-guard.service.spec.ts

@@ -1,6 +1,6 @@
 import { TestBed, inject } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { Router } from '@angular/router'
+import { Router } from '@angular/router';
 
 import { AzureAdB2CService } from '../modules/login/services/azure.ad.b2c.service';
 import { AzureGuardService } from './azure-guard.service';
@@ -29,19 +29,19 @@ describe('AzureGuardService', () => {
     expect(service).toBeTruthy();
   });
 
-  it('should check if is login', () => {
-    spyOn(azureAdB2CService, 'isLogin').and.returnValue(true)
-    const isAcitve = service.canActivate();
-    expect(azureAdB2CService.isLogin).toHaveBeenCalled;
-    expect(isAcitve).toEqual(true);
+  it('can activate the route when user is logged-in', () => {
+    spyOn(azureAdB2CService, 'isLogin').and.returnValue(true);
+    const canActivate = service.canActivate();
+    expect(azureAdB2CService.isLogin).toHaveBeenCalled();
+    expect(canActivate).toEqual(true);
   });
 
-  it('should check if not is login', inject([Router],  (router: Router) => {
-    spyOn(azureAdB2CService, 'isLogin').and.returnValue(false)
+  it('can not active the route and is redirected to login if user is not logged-in', inject([Router],  (router: Router) => {
+    spyOn(azureAdB2CService, 'isLogin').and.returnValue(false);
     spyOn(router, 'navigate').and.stub();
-    const isAcitve = service.canActivate();
-    expect(azureAdB2CService.isLogin).toHaveBeenCalled;
-    expect(isAcitve).toEqual(false);
+    const canActivate = service.canActivate();
+    expect(azureAdB2CService.isLogin).toHaveBeenCalled();
+    expect(canActivate).toEqual(false);
     expect(router.navigate).toHaveBeenCalledWith(['login']);
   }));
 

src/app/guards/azure-guard.service.ts

@@ -8,8 +8,9 @@ import { AzureAdB2CService } from '../modules/login/services/azure.ad.b2c.servic
 export class AzureGuardService implements CanActivate {
 
   constructor(private azureAdB2CService: AzureAdB2CService, private router: Router) { }
+
   canActivate() {
-    if(this.azureAdB2CService.isLogin()) {
+    if (this.azureAdB2CService.isLogin()) {
         return true;
     } else {
         this.router.navigate(['login']);

src/app/modules/activities-management/components/create-activity/create-activity.component.spec.ts

@@ -1,4 +1,4 @@
-import { FormBuilder } from '@angular/forms';
+import { FormBuilder, AbstractControl } from '@angular/forms';
 import { async, TestBed } from '@angular/core/testing';
 
 import { CreateActivityComponent } from './create-activity.component';
@@ -10,7 +10,7 @@ describe('CreateActivityComponent', () => {
   const data = {
     name: '',
     description: ''
-  }
+  };
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -24,19 +24,28 @@ describe('CreateActivityComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  it('should reset form', () => {
-    component.onSubmit(data)
-    expect(component.activityForm.reset()).toHaveBeenCalled
+  it('should reset form onSubmit', () => {
+    spyOn(component.activityForm, 'reset');
+
+    component.onSubmit(data);
+
+    expect(component.activityForm.reset).toHaveBeenCalled();
   });
 
-  it('should get name', () => {
-    component.name
-    expect(component.activityForm.get('name')).toHaveBeenCalled
+  it('should get name using activityForm', () => {
+    spyOn(component.activityForm, 'get');
+    // tslint:disable-next-line:no-unused-expression
+    component.name;
+    expect(component.activityForm.get).toHaveBeenCalledWith('name');
   });
 
-  it('should get description', () => {
-    component.description
-    expect(component.activityForm.get('description')).toHaveBeenCalled
+  it('should get description using activityForm', () => {
+    spyOn(component.activityForm, 'get');
+
+    // tslint:disable-next-line:no-unused-expression
+    component.description;
+
+    expect(component.activityForm.get).toHaveBeenCalledWith('description');
   });
 
 });

src/app/modules/activities-management/pages/activities-management.component.spec.ts

@@ -16,7 +16,7 @@ describe('ActivitiesManagementComponent', () => {
       providers: [ ActivityService, HttpClient, HttpHandler ]
     });
     component = TestBed.createComponent(ActivitiesManagementComponent).componentInstance;
-    activityService = TestBed.get(ActivityService);
+    activityService = TestBed.inject(ActivityService);
     spyOn(activityService, 'getActivities').and.returnValue(of(activitiesFromApi));
   }));
 

src/app/modules/home/home.component.spec.ts

@@ -19,7 +19,7 @@ describe('HomeComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should create', () => {
+  it('should be created', () => {
     expect(component).toBeTruthy();
   });
 });

src/app/modules/login/login.component.spec.ts

@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed, inject } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { AzureAdB2CService } from '../../modules/login/services/azure.ad.b2c.service';
-import { of } from 'rxjs'
+import { of } from 'rxjs';
 
 import { LoginComponent } from './login.component';
 import { Router } from '@angular/router';
@@ -49,18 +49,18 @@ describe('LoginComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  it('should sign up or login with google', inject([Router],  (router: Router) => {
+  it('should sign up or login with google if is not logged-in into the app', inject([Router],  (router: Router) => {
     spyOn(azureAdB2CService, 'isLogin').and.returnValue(false);
-    spyOn(azureAdB2CService, 'signIn').and.returnValue(of())
+    spyOn(azureAdB2CService, 'signIn').and.returnValue(of());
     component.login();
-    expect(azureAdB2CService.signIn).toHaveBeenCalled;
+    expect(azureAdB2CService.signIn).toHaveBeenCalled();
   }));
 
-  it('should not sign up or login with google', inject([Router],  (router: Router) => {
-    spyOn(azureAdB2CService, 'isLogin').and.returnValue(true)
+  it('should not sign-up or login with google if is already logged-in into the app', inject([Router],  (router: Router) => {
+    spyOn(azureAdB2CService, 'isLogin').and.returnValue(true);
     spyOn(router, 'navigate').and.stub();
     component.login();
-    expect(azureAdB2CService.isLogin).toHaveBeenCalled;
+    expect(azureAdB2CService.isLogin).toHaveBeenCalled();
     expect(router.navigate).toHaveBeenCalledWith(['']);
   }));
 });

src/app/modules/login/login.component.ts

@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { AzureAdB2CService } from './services/azure.ad.b2c.service'
+import { AzureAdB2CService } from './services/azure.ad.b2c.service';
 import { Router } from '@angular/router';
 
 @Component({
@@ -10,10 +10,10 @@ import { Router } from '@angular/router';
 
 export class LoginComponent {
 
-  constructor(private azureAdB2CService: AzureAdB2CService, private router:Router) {}
+  constructor(private azureAdB2CService: AzureAdB2CService, private router: Router) {}
 
   login(): void {
-    if(this.azureAdB2CService.isLogin()) {
+    if (this.azureAdB2CService.isLogin()) {
       this.router.navigate(['']);
     } else {
       this.azureAdB2CService.signIn().subscribe(() => {

src/app/modules/login/services/azure.ad.b2c.service.spec.ts

@@ -6,9 +6,9 @@ describe('AzureAdB2CService', () => {
   let service: AzureAdB2CService;
   const msalStub = {
     loginPopup() {
-      return {}
+      return {};
     }
-  }
+  };
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -17,28 +17,28 @@ describe('AzureAdB2CService', () => {
     service = TestBed.inject(AzureAdB2CService);
   });
 
-  it('should create', inject([AzureAdB2CService],
+  it('should be created', inject([AzureAdB2CService],
     ( apiService: AzureAdB2CService) => {
       expect(apiService).toBeTruthy();
   }));
 
-  it('should call msal loginPopup', () => {
+  it('on signIn should call msal loginPopup', () => {
     spyOn(UserAgentApplication.prototype, 'loginPopup').and.returnValue((
       new Promise((resolve) => {
           resolve();
       })
-    ))
-    service.signIn()
-    expect(UserAgentApplication.prototype.loginPopup).toHaveBeenCalled;
+    ));
+    service.signIn();
+    expect(UserAgentApplication.prototype.loginPopup).toHaveBeenCalled();
   });
 
-  it('should call msal logout', () => {
-    spyOn(UserAgentApplication.prototype, 'logout').and.returnValue()
-    service.logout()
-    expect(UserAgentApplication.prototype.logout).toHaveBeenCalled;
+  it('on logout should call msal logout', () => {
+    spyOn(UserAgentApplication.prototype, 'logout').and.returnValue();
+    service.logout();
+    expect(UserAgentApplication.prototype.logout).toHaveBeenCalled();
   });
 
-  it('should get name Account', () => {
+  it('should get Account name from UserAgentApplication', () => {
     const account: Account = {
       accountIdentifier: 'abc',
       homeAccountIdentifier: 'abc',
@@ -47,15 +47,17 @@ describe('AzureAdB2CService', () => {
       idToken: {},
       idTokenClaims: {},
       sid: 'abc',
-      environment: "abc"
-    }
-    spyOn(UserAgentApplication.prototype, 'getAccount').and.returnValues(account)
-    const name = service.getName()
-    expect(UserAgentApplication.prototype.getAccount).toHaveBeenCalled;
-    expect(name).toEqual(account.name)
+      environment: 'abc'
+    };
+    spyOn(UserAgentApplication.prototype, 'getAccount').and.returnValues(account);
+
+    const name = service.getName();
+
+    expect(UserAgentApplication.prototype.getAccount).toHaveBeenCalled();
+    expect(name).toEqual(account.name);
   });
 
-  it('should return true when user is login', () => {
+  it('isLogin returns true if UserAgentApplication has a defined Account', () => {
     const account: Account = {
       accountIdentifier: 'abc',
       homeAccountIdentifier: 'abc',
@@ -64,19 +66,21 @@ describe('AzureAdB2CService', () => {
       idToken: {},
       idTokenClaims: {},
       sid: 'abc',
-      environment: "abc"
-    }
-    spyOn(UserAgentApplication.prototype, 'getAccount').and.returnValue(account)
-    const isLogin = service.isLogin()
-    expect(UserAgentApplication.prototype.getAccount).toHaveBeenCalled;
-    expect(isLogin).toEqual(true)
+      environment: 'abc'
+    };
+    spyOn(UserAgentApplication.prototype, 'getAccount').and.returnValue(account);
+
+    const isLogin = service.isLogin();
+
+    expect(UserAgentApplication.prototype.getAccount).toHaveBeenCalled();
+    expect(isLogin).toEqual(true);
   });
 
-  it('should return false when user is not login', () => {
-    spyOn(UserAgentApplication.prototype, 'getAccount').and.returnValue(null)
-    const isLogin = service.isLogin()
-    expect(UserAgentApplication.prototype.getAccount).toHaveBeenCalled;
-    expect(isLogin).toEqual(false)
+  it('isLogin returns false if UserAgentApplication has a null value for Account', () => {
+    spyOn(UserAgentApplication.prototype, 'getAccount').and.returnValue(null);
+    const isLogin = service.isLogin();
+    expect(UserAgentApplication.prototype.getAccount).toHaveBeenCalled();
+    expect(isLogin).toEqual(false);
   });
 
 });