From 0adb8bf94b27ec9237c3244b6d157fb22e7c2bba Mon Sep 17 00:00:00 2001 From: Fabio Formosa Date: Thu, 29 Sep 2022 00:33:52 +0200 Subject: [PATCH] #59 fixed tests --- .../simple-trigger-config.component.html | 2 +- .../simple-trigger-config.component.spec.ts | 3 ++- .../simple-trigger-config.component.ts | 3 ++- .../trigger-list.component.spec.ts | 3 ++- .../src/app/services/auth.service.ts | 15 --------------- .../src/app/services/job.service.ts | 2 +- quartz-manager-parent/pom.xml | 18 +++++++++--------- 7 files changed, 17 insertions(+), 29 deletions(-) diff --git a/quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.html b/quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.html index b29c701..3be161b 100644 --- a/quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.html +++ b/quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.html @@ -25,7 +25,7 @@ class="full-size-input" > Job Class - + {{job}} 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 cce311a..809d258 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 @@ -19,6 +19,7 @@ import {JobDetail} from '../../model/jobDetail.model'; import {SimpleTriggerForm} from '../../model/simple-trigger.form'; import {SimpleTrigger} from '../../model/simple-trigger.model'; import JobService from '../../services/job.service'; +import {MatSelectModule} from '@angular/material/select'; describe('SimpleTriggerConfig', () => { @@ -30,7 +31,7 @@ describe('SimpleTriggerConfig', () => { beforeEach(async( () => { TestBed.configureTestingModule({ - imports: [FormsModule, MatFormFieldModule, MatFormFieldModule, MatInputModule, BrowserAnimationsModule, + imports: [FormsModule, MatFormFieldModule, MatFormFieldModule, MatSelectModule, MatInputModule, BrowserAnimationsModule, MatNativeDateModule, MatCardModule, MatIconModule, HttpClientTestingModule, RouterTestingModule], declarations: [SimpleTriggerConfigComponent], diff --git a/quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.ts b/quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.ts index b304226..4c45124 100644 --- a/quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.ts +++ b/quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.ts @@ -1,11 +1,12 @@ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; -import {JobService, SchedulerService} from '../../services'; +import {SchedulerService} from '../../services'; import {Scheduler} from '../../model/scheduler.model'; import {SimpleTriggerCommand} from '../../model/simple-trigger.command'; import {SimpleTrigger} from '../../model/simple-trigger.model'; import {SimpleTriggerForm} from '../../model/simple-trigger.form'; import * as moment from 'moment'; import {TriggerKey} from '../../model/triggerKey.model'; +import JobService from '../../services/job.service'; @Component({ selector: 'qrzmng-simple-trigger-config', 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 2f61fd0..dddeab5 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 @@ -11,6 +11,7 @@ import {MatDividerModule} from '@angular/material/divider'; import {TriggerListComponent} from './trigger-list.component'; import {MatListModule} from '@angular/material/list'; import {TriggerKey} from '../../model/triggerKey.model'; +import {MatDialogModule} from '@angular/material/dialog'; describe('TriggerListComponent', () => { @@ -22,7 +23,7 @@ describe('TriggerListComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [MatCardModule, MatDividerModule, MatIconModule, MatListModule, HttpClientTestingModule, RouterTestingModule], + imports: [MatCardModule, MatDialogModule, MatDividerModule, MatIconModule, MatListModule, HttpClientTestingModule, RouterTestingModule], declarations: [TriggerListComponent], providers: [TriggerService, ApiService, ConfigService] }).compileComponents(); diff --git a/quartz-manager-frontend/src/app/services/auth.service.ts b/quartz-manager-frontend/src/app/services/auth.service.ts index 5520d6d..0fd771d 100644 --- a/quartz-manager-frontend/src/app/services/auth.service.ts +++ b/quartz-manager-frontend/src/app/services/auth.service.ts @@ -30,16 +30,6 @@ export class AuthService { ); } - signup(user) { - const signupHeaders = new HttpHeaders({ - 'Accept': 'application/json', - 'Content-Type': 'application/json' - }); - return this.apiService.post(this.config.signup_url, JSON.stringify(user), signupHeaders).pipe(map(() => { - console.log('Sign up success'); - })); - } - logout() { return this.apiService.post(this.config.logout_url, {}) .pipe(map(() => { @@ -48,9 +38,4 @@ export class AuthService { })); } - changePassword(passwordChanger) { - return this.apiService.post(this.config.change_password_url, passwordChanger); - } - - } diff --git a/quartz-manager-frontend/src/app/services/job.service.ts b/quartz-manager-frontend/src/app/services/job.service.ts index c5cbccc..037ed9a 100644 --- a/quartz-manager-frontend/src/app/services/job.service.ts +++ b/quartz-manager-frontend/src/app/services/job.service.ts @@ -4,7 +4,7 @@ import {CONTEXT_PATH, getBaseUrl} from './config.service'; import {Observable} from 'rxjs'; @Injectable() -export class JobService { +export default class JobService { constructor( private apiService: ApiService diff --git a/quartz-manager-parent/pom.xml b/quartz-manager-parent/pom.xml index 01b22d5..cb3da24 100644 --- a/quartz-manager-parent/pom.xml +++ b/quartz-manager-parent/pom.xml @@ -12,33 +12,33 @@ 3.1.1-SNAPSHOT pom - + Quartz Manager API and UI Manager for Quartz Scheduler - + https://github.com/fabioformosa/quartz-manager - + Apache License 2.0 https://github.com/fabioformosa/quartz-manager/blob/master/LICENSE - + scm:git:git://github.com/fabioformosa/quartz-manager.git scm:git:git@github.com:fabioformosa/quartz-manager.git https://github.com/fabioformosa/quartz-manager HEAD - + Fabio Formosa https://github.com/fabioformosa - + quartz-manager-starter-api quartz-manager-starter-ui @@ -77,7 +77,7 @@ - + ossrh @@ -89,7 +89,7 @@ - + @@ -160,7 +160,7 @@ - +