From 59816c9693a5e78709331ef26ac1c20d3927e649 Mon Sep 17 00:00:00 2001 From: Fabio Formosa Date: Wed, 26 Oct 2022 22:02:11 +0200 Subject: [PATCH] #48 fixed some tests --- .../simple-trigger-config.component.spec.ts | 12 ++++++------ .../trigger-list/trigger-list.component.spec.ts | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.spec.ts b/quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.spec.ts index 809d258..5ad2cbe 100644 --- a/quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.spec.ts +++ b/quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.spec.ts @@ -1,7 +1,7 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing'; import {MatCardModule} from '@angular/material/card'; import {SimpleTriggerConfigComponent} from './simple-trigger-config.component'; -import {ApiService, ConfigService, SchedulerService} from '../../services'; +import {ApiService, ConfigService, CONTEXT_PATH, SchedulerService} from '../../services'; import {HttpClient} from '@angular/common/http'; import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing'; import {DebugElement, NO_ERRORS_SCHEMA} from '@angular/core'; @@ -51,7 +51,7 @@ describe('SimpleTriggerConfig', () => { it('should fetch no triggers at the init', () => { expect(component).toBeTruthy(); - httpTestingController.expectNone('/quartz-manager/simple-triggers/my-simple-trigger'); + httpTestingController.expectNone(`${CONTEXT_PATH}/simple-triggers/my-simple-trigger`); }); function setInputValue(componentDe: DebugElement, inputSelector: string, value: string) { @@ -89,7 +89,7 @@ describe('SimpleTriggerConfig', () => { submitButton.nativeElement.click(); - const postSimpleTriggerReq = httpTestingController.expectOne('/quartz-manager/simple-triggers/test-trigger'); + const postSimpleTriggerReq = httpTestingController.expectOne(`${CONTEXT_PATH}/simple-triggers/test-trigger`); postSimpleTriggerReq.flush(mockTrigger); expect(actualNewTrigger).toEqual(mockTrigger); @@ -104,7 +104,7 @@ describe('SimpleTriggerConfig', () => { mockTrigger.triggerKeyDTO = new TriggerKey('test-trigger', null); mockTrigger.jobDetailDTO = {jobClassName: 'TestJob', description: null}; mockTrigger.mayFireAgain = true; - const getSimpleTriggerReq = httpTestingController.expectOne('/quartz-manager/simple-triggers/test-trigger'); + const getSimpleTriggerReq = httpTestingController.expectOne(`${CONTEXT_PATH}/simple-triggers/test-trigger`); getSimpleTriggerReq.flush(mockTrigger); component.simpleTriggerForm = { @@ -129,7 +129,7 @@ describe('SimpleTriggerConfig', () => { submitButton.nativeElement.click(); - const putSimpleTriggerReq = httpTestingController.expectOne('/quartz-manager/simple-triggers/test-trigger'); + const putSimpleTriggerReq = httpTestingController.expectOne(`${CONTEXT_PATH}/simple-triggers/test-trigger`); putSimpleTriggerReq.flush(mockTrigger); expect(actualNewTrigger).toBeUndefined(); @@ -143,7 +143,7 @@ describe('SimpleTriggerConfig', () => { const mockTrigger = new Trigger(); mockTrigger.triggerKeyDTO = mockTriggerKey; mockTrigger.jobDetailDTO = {jobClassName: 'TestJob', description: null}; - const getSimpleTriggerReq = httpTestingController.expectOne('/quartz-manager/simple-triggers/my-simple-trigger'); + const getSimpleTriggerReq = httpTestingController.expectOne(`${CONTEXT_PATH}/simple-triggers/my-simple-trigger`); getSimpleTriggerReq.flush(mockTrigger); const componentDe: DebugElement = fixture.debugElement; diff --git a/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.spec.ts b/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.spec.ts index 10df4b2..92e61bd 100644 --- a/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.spec.ts +++ b/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.spec.ts @@ -1,5 +1,5 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import {ApiService, ConfigService, TriggerService} from '../../services'; +import {ApiService, ConfigService, CONTEXT_PATH, TriggerService} from '../../services'; import {HttpClient} from '@angular/common/http'; import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing'; import {RouterTestingModule} from '@angular/router/testing'; @@ -45,7 +45,7 @@ describe('TriggerListComponent', () => { let actualSelectedTrigger: TriggerKey; component.onSelectedTrigger.subscribe(selectedTrigger => actualSelectedTrigger = selectedTrigger); - const getTriggerListReq = httpTestingController.expectOne('quartz-manager/triggers'); + const getTriggerListReq = httpTestingController.expectOne(`${CONTEXT_PATH}/triggers`); const mockExistingTriggers = new Array(); const firstTriggerKey = new TriggerKey('trigger1', 'group1'); mockExistingTriggers.push(firstTriggerKey); @@ -71,7 +71,7 @@ describe('TriggerListComponent', () => { let expectedOpenedNewTriggerFormEvent: boolean; component.onNewTriggerClicked.subscribe(() => expectedOpenedNewTriggerFormEvent = true); - const getTriggerListReq = httpTestingController.expectOne('quartz-manager/triggers'); + const getTriggerListReq = httpTestingController.expectOne(`${CONTEXT_PATH}/triggers`); getTriggerListReq.flush(new Array()); fixture.detectChanges();