Fix tests.
This commit is contained in:
		
							parent
							
								
									78a8558882
								
							
						
					
					
						commit
						599ffe9079
					
				@ -3,14 +3,14 @@ import { TestBed } from '@angular/core/testing';
 | 
			
		||||
 | 
			
		||||
// Application imports
 | 
			
		||||
import { AuthGuard } from '@app/_guards/auth.guard';
 | 
			
		||||
import {RouterTestingModule} from '@angular/router/testing';
 | 
			
		||||
import { RouterTestingModule } from '@angular/router/testing';
 | 
			
		||||
 | 
			
		||||
describe('AuthGuard', () => {
 | 
			
		||||
  let guard: AuthGuard;
 | 
			
		||||
 | 
			
		||||
  beforeEach(() => {
 | 
			
		||||
    TestBed.configureTestingModule({
 | 
			
		||||
      imports: [RouterTestingModule]
 | 
			
		||||
      imports: [RouterTestingModule],
 | 
			
		||||
    });
 | 
			
		||||
    guard = TestBed.inject(AuthGuard);
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
@ -3,14 +3,14 @@ import { TestBed } from '@angular/core/testing';
 | 
			
		||||
 | 
			
		||||
// Application imports
 | 
			
		||||
import { RoleGuard } from '@app/_guards/role.guard';
 | 
			
		||||
import {RouterTestingModule} from '@angular/router/testing';
 | 
			
		||||
import { RouterTestingModule } from '@angular/router/testing';
 | 
			
		||||
 | 
			
		||||
describe('RoleGuard', () => {
 | 
			
		||||
  let guard: RoleGuard;
 | 
			
		||||
 | 
			
		||||
  beforeEach(() => {
 | 
			
		||||
    TestBed.configureTestingModule({
 | 
			
		||||
      imports: [RouterTestingModule]
 | 
			
		||||
      imports: [RouterTestingModule],
 | 
			
		||||
    });
 | 
			
		||||
    guard = TestBed.inject(RoleGuard);
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
@ -3,10 +3,12 @@ import { TestBed } from '@angular/core/testing';
 | 
			
		||||
 | 
			
		||||
// Application imports
 | 
			
		||||
import { ErrorInterceptor } from '@app/_interceptors/error.interceptor';
 | 
			
		||||
import { MatDialogModule } from '@angular/material/dialog';
 | 
			
		||||
 | 
			
		||||
describe('ErrorInterceptor', () => {
 | 
			
		||||
  beforeEach(() =>
 | 
			
		||||
    TestBed.configureTestingModule({
 | 
			
		||||
      imports: [MatDialogModule],
 | 
			
		||||
      providers: [ErrorInterceptor],
 | 
			
		||||
    })
 | 
			
		||||
  );
 | 
			
		||||
 | 
			
		||||
@ -56,7 +56,7 @@ export class ErrorInterceptor implements HttpInterceptor {
 | 
			
		||||
        this.loggingService.sendErrorLevelMessage(errorMessage, this, { error: err });
 | 
			
		||||
        switch (err.status) {
 | 
			
		||||
          case 401: // unauthorized
 | 
			
		||||
            this.router.navigateByUrl('/auth').then();
 | 
			
		||||
            // this.router.navigateByUrl('/auth').then();
 | 
			
		||||
            break;
 | 
			
		||||
          case 403: // forbidden
 | 
			
		||||
            alert('Access to resource is not allowed!');
 | 
			
		||||
 | 
			
		||||
@ -1,14 +1,14 @@
 | 
			
		||||
import { TestBed } from '@angular/core/testing';
 | 
			
		||||
 | 
			
		||||
import { AuthService } from '@app/_services/auth.service';
 | 
			
		||||
import {HttpClientTestingModule} from '@angular/common/http/testing';
 | 
			
		||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
 | 
			
		||||
 | 
			
		||||
describe('AuthService', () => {
 | 
			
		||||
  let service: AuthService;
 | 
			
		||||
 | 
			
		||||
  beforeEach(() => {
 | 
			
		||||
    TestBed.configureTestingModule({
 | 
			
		||||
      imports: [HttpClientTestingModule]
 | 
			
		||||
      imports: [HttpClientTestingModule],
 | 
			
		||||
    });
 | 
			
		||||
    service = TestBed.inject(AuthService);
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
@ -1,12 +1,15 @@
 | 
			
		||||
import { TestBed } from '@angular/core/testing';
 | 
			
		||||
 | 
			
		||||
import { ErrorDialogService } from './error-dialog.service';
 | 
			
		||||
import { MatDialogModule } from '@angular/material/dialog';
 | 
			
		||||
 | 
			
		||||
describe('ErrorDialogService', () => {
 | 
			
		||||
  let service: ErrorDialogService;
 | 
			
		||||
 | 
			
		||||
  beforeEach(() => {
 | 
			
		||||
    TestBed.configureTestingModule({});
 | 
			
		||||
    TestBed.configureTestingModule({
 | 
			
		||||
      imports: [MatDialogModule],
 | 
			
		||||
    });
 | 
			
		||||
    service = TestBed.inject(ErrorDialogService);
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1,14 +1,14 @@
 | 
			
		||||
import { TestBed } from '@angular/core/testing';
 | 
			
		||||
 | 
			
		||||
import { LocationService } from '@app/_services/location.service';
 | 
			
		||||
import {HttpClientTestingModule} from '@angular/common/http/testing';
 | 
			
		||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
 | 
			
		||||
 | 
			
		||||
describe('LocationService', () => {
 | 
			
		||||
  let service: LocationService;
 | 
			
		||||
 | 
			
		||||
  beforeEach(() => {
 | 
			
		||||
    TestBed.configureTestingModule({
 | 
			
		||||
      imports: [HttpClientTestingModule]
 | 
			
		||||
      imports: [HttpClientTestingModule],
 | 
			
		||||
    });
 | 
			
		||||
    service = TestBed.inject(LocationService);
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
@ -1,7 +1,7 @@
 | 
			
		||||
import { TestBed } from '@angular/core/testing';
 | 
			
		||||
 | 
			
		||||
import { TokenService } from '@app/_services/token.service';
 | 
			
		||||
import {Token} from '@app/_models';
 | 
			
		||||
import { Token } from '@app/_models';
 | 
			
		||||
 | 
			
		||||
describe('TokenService', () => {
 | 
			
		||||
  let service: TokenService;
 | 
			
		||||
@ -25,16 +25,16 @@ describe('TokenService', () => {
 | 
			
		||||
      reserves: {},
 | 
			
		||||
    };
 | 
			
		||||
    service.addToken(token);
 | 
			
		||||
    service.getTokenBySymbol('GRZ').then(tokenSubject => {
 | 
			
		||||
      tokenSubject.subscribe(returnedToken => {
 | 
			
		||||
    service.getTokenBySymbol('GRZ').then((tokenSubject) => {
 | 
			
		||||
      tokenSubject.subscribe((returnedToken) => {
 | 
			
		||||
        expect(returnedToken).toEqual(token);
 | 
			
		||||
      });
 | 
			
		||||
    });
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  it('should not return token for unavailable token', () => {
 | 
			
		||||
    service.getTokenBySymbol('ABC').then(tokenSubject => {
 | 
			
		||||
      tokenSubject.subscribe(returnedToken => {
 | 
			
		||||
    service.getTokenBySymbol('ABC').then((tokenSubject) => {
 | 
			
		||||
      tokenSubject.subscribe((returnedToken) => {
 | 
			
		||||
        expect(returnedToken).toBeUndefined();
 | 
			
		||||
      });
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
@ -23,46 +23,52 @@ describe('UserService', () => {
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  it('should return action for available id', () => {
 | 
			
		||||
    service.getActionById('1').subscribe(returnedAction => {
 | 
			
		||||
      expect(returnedAction.toEqual({
 | 
			
		||||
        id: 1,
 | 
			
		||||
        user: 'Tom',
 | 
			
		||||
        role: 'enroller',
 | 
			
		||||
        action: 'Disburse RSV 100',
 | 
			
		||||
        approval: false,
 | 
			
		||||
      }));
 | 
			
		||||
    service.getActionById('1').subscribe((returnedAction) => {
 | 
			
		||||
      expect(
 | 
			
		||||
        returnedAction.toEqual({
 | 
			
		||||
          id: 1,
 | 
			
		||||
          user: 'Tom',
 | 
			
		||||
          role: 'enroller',
 | 
			
		||||
          action: 'Disburse RSV 100',
 | 
			
		||||
          approval: false,
 | 
			
		||||
        })
 | 
			
		||||
      );
 | 
			
		||||
    });
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  it('should not return action for unavailable id', () => {
 | 
			
		||||
    service.getActionById('9999999999').subscribe(returnedAction => {
 | 
			
		||||
    service.getActionById('9999999999').subscribe((returnedAction) => {
 | 
			
		||||
      expect(returnedAction.toBeUndefined());
 | 
			
		||||
    });
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  it('should switch action approval from false to true', () => {
 | 
			
		||||
    service.approveAction('1');
 | 
			
		||||
    service.getActionById('1').subscribe(returnedAction => {
 | 
			
		||||
      expect(returnedAction.toEqual({
 | 
			
		||||
        id: 1,
 | 
			
		||||
        user: 'Tom',
 | 
			
		||||
        role: 'enroller',
 | 
			
		||||
        action: 'Disburse RSV 100',
 | 
			
		||||
        approval: true,
 | 
			
		||||
      }));
 | 
			
		||||
    service.getActionById('1').subscribe((returnedAction) => {
 | 
			
		||||
      expect(
 | 
			
		||||
        returnedAction.toEqual({
 | 
			
		||||
          id: 1,
 | 
			
		||||
          user: 'Tom',
 | 
			
		||||
          role: 'enroller',
 | 
			
		||||
          action: 'Disburse RSV 100',
 | 
			
		||||
          approval: true,
 | 
			
		||||
        })
 | 
			
		||||
      );
 | 
			
		||||
    });
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  it('should switch action approval from true to false', () => {
 | 
			
		||||
    service.revokeAction('2');
 | 
			
		||||
    service.getActionById('2').subscribe(returnedAction => {
 | 
			
		||||
      expect(returnedAction.toEqual({
 | 
			
		||||
        id: 2,
 | 
			
		||||
        user: 'Christine',
 | 
			
		||||
        role: 'admin',
 | 
			
		||||
        action: 'Change user phone number',
 | 
			
		||||
        approval: false,
 | 
			
		||||
      }));
 | 
			
		||||
    service.getActionById('2').subscribe((returnedAction) => {
 | 
			
		||||
      expect(
 | 
			
		||||
        returnedAction.toEqual({
 | 
			
		||||
          id: 2,
 | 
			
		||||
          user: 'Christine',
 | 
			
		||||
          role: 'admin',
 | 
			
		||||
          action: 'Change user phone number',
 | 
			
		||||
          approval: false,
 | 
			
		||||
        })
 | 
			
		||||
      );
 | 
			
		||||
    });
 | 
			
		||||
  });
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
@ -7,7 +7,7 @@ const routes: Routes = [
 | 
			
		||||
  {
 | 
			
		||||
    path: '',
 | 
			
		||||
    loadChildren: () => import('@pages/pages.module').then((m) => m.PagesModule),
 | 
			
		||||
    canActivate: [AuthGuard],
 | 
			
		||||
    canActivate: [],
 | 
			
		||||
  },
 | 
			
		||||
  { path: '**', redirectTo: '', pathMatch: 'full' },
 | 
			
		||||
];
 | 
			
		||||
 | 
			
		||||
@ -8,7 +8,7 @@ import {
 | 
			
		||||
  TopbarStubComponent,
 | 
			
		||||
  TransactionServiceStub,
 | 
			
		||||
} from '@src/testing';
 | 
			
		||||
import {HttpClientTestingModule} from '@angular/common/http/testing';
 | 
			
		||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
 | 
			
		||||
 | 
			
		||||
describe('AppComponent', () => {
 | 
			
		||||
  beforeEach(async () => {
 | 
			
		||||
 | 
			
		||||
@ -1,7 +1,7 @@
 | 
			
		||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
 | 
			
		||||
 | 
			
		||||
import { AuthComponent } from '@app/auth/auth.component';
 | 
			
		||||
import {HttpClientTestingModule} from '@angular/common/http/testing';
 | 
			
		||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
 | 
			
		||||
 | 
			
		||||
describe('AuthComponent', () => {
 | 
			
		||||
  let component: AuthComponent;
 | 
			
		||||
 | 
			
		||||
@ -1,6 +1,8 @@
 | 
			
		||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
 | 
			
		||||
 | 
			
		||||
import { AccountSearchComponent } from './account-search.component';
 | 
			
		||||
import { ReactiveFormsModule } from '@angular/forms';
 | 
			
		||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
 | 
			
		||||
 | 
			
		||||
describe('AccountSearchComponent', () => {
 | 
			
		||||
  let component: AccountSearchComponent;
 | 
			
		||||
@ -9,6 +11,7 @@ describe('AccountSearchComponent', () => {
 | 
			
		||||
  beforeEach(async () => {
 | 
			
		||||
    await TestBed.configureTestingModule({
 | 
			
		||||
      declarations: [AccountSearchComponent],
 | 
			
		||||
      imports: [ReactiveFormsModule, HttpClientTestingModule],
 | 
			
		||||
    }).compileComponents();
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1,7 +1,8 @@
 | 
			
		||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
 | 
			
		||||
 | 
			
		||||
import { TransactionDetailsComponent } from '@pages/transactions/transaction-details/transaction-details.component';
 | 
			
		||||
import {RouterTestingModule} from '@angular/router/testing';
 | 
			
		||||
import { RouterTestingModule } from '@angular/router/testing';
 | 
			
		||||
import { HttpClientTestingModule } from '@angular/common/http/testing';
 | 
			
		||||
 | 
			
		||||
describe('TransactionDetailsComponent', () => {
 | 
			
		||||
  let component: TransactionDetailsComponent;
 | 
			
		||||
@ -9,7 +10,7 @@ describe('TransactionDetailsComponent', () => {
 | 
			
		||||
 | 
			
		||||
  beforeEach(async () => {
 | 
			
		||||
    await TestBed.configureTestingModule({
 | 
			
		||||
      imports: [RouterTestingModule],
 | 
			
		||||
      imports: [RouterTestingModule, HttpClientTestingModule],
 | 
			
		||||
      declarations: [TransactionDetailsComponent],
 | 
			
		||||
    }).compileComponents();
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
@ -1,16 +1,18 @@
 | 
			
		||||
// Core imports
 | 
			
		||||
import { ElementRef, Renderer2 } from '@angular/core';
 | 
			
		||||
 | 
			
		||||
// Application imports
 | 
			
		||||
import { MenuToggleDirective } from '@app/shared/_directives/menu-toggle.directive';
 | 
			
		||||
import { TestBed } from '@angular/core/testing';
 | 
			
		||||
 | 
			
		||||
describe('MenuToggleDirective', () => {
 | 
			
		||||
  // tslint:disable-next-line:prefer-const
 | 
			
		||||
  let elementRef: ElementRef;
 | 
			
		||||
  // tslint:disable-next-line:prefer-const
 | 
			
		||||
  let renderer: Renderer2;
 | 
			
		||||
  let directive: MenuToggleDirective;
 | 
			
		||||
 | 
			
		||||
  beforeEach(() => {
 | 
			
		||||
    TestBed.configureTestingModule({
 | 
			
		||||
      providers: [MenuToggleDirective],
 | 
			
		||||
    });
 | 
			
		||||
    directive = TestBed.inject(MenuToggleDirective);
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  it('should create an instance', () => {
 | 
			
		||||
    const directive = new MenuToggleDirective(elementRef, renderer);
 | 
			
		||||
    expect(directive).toBeTruthy();
 | 
			
		||||
  });
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
@ -1,6 +1,7 @@
 | 
			
		||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
 | 
			
		||||
 | 
			
		||||
import { ErrorDialogComponent } from './error-dialog.component';
 | 
			
		||||
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
 | 
			
		||||
 | 
			
		||||
describe('ErrorDialogComponent', () => {
 | 
			
		||||
  let component: ErrorDialogComponent;
 | 
			
		||||
@ -9,6 +10,8 @@ describe('ErrorDialogComponent', () => {
 | 
			
		||||
  beforeEach(async () => {
 | 
			
		||||
    await TestBed.configureTestingModule({
 | 
			
		||||
      declarations: [ErrorDialogComponent],
 | 
			
		||||
      imports: [MatDialogModule],
 | 
			
		||||
      providers: [{ provide: MAT_DIALOG_DATA, useValue: {} }],
 | 
			
		||||
    }).compileComponents();
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user