Skip to content

Commit 9a50949

Browse files
fabioformosafabioformosa
committed
fixed tests and github actions
1 parent 699e661 commit 9a50949

7 files changed

Lines changed: 28 additions & 18 deletions

File tree

‎.github/workflows/maven-release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v4
1616

17-
- name: Set up Java 17 for publishing to Maven Central Repository
17+
- name: Set up Java 21 for publishing to Maven Central Repository
1818
uses: actions/setup-java@v4
1919
with:
20-
java-version: '17'
20+
java-version: '21'
2121
distribution: 'temurin'
2222
server-id: maven-central-release
2323
server-username: MAVEN_USERNAME
@@ -35,10 +35,10 @@ jobs:
3535
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_TOKEN_PASSWORD }}
3636
MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
3737

38-
- name: Set up Java 17 for publishing to GitHub Packages
38+
- name: Set up Java 21 for publishing to GitHub Packages
3939
uses: actions/setup-java@v4
4040
with:
41-
java-version: '17'
41+
java-version: '21'
4242
distribution: 'temurin'
4343
- name: Publish to GitHub Packages Apache Maven
4444
run: mvn deploy --file quartz-manager-parent/pom.xml -P "deploy-github,build-webjar"

‎.github/workflows/maven.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626

2727
steps:
2828
- uses: actions/checkout@v4
29-
- name: Set up JDK 17
29+
- name: Set up JDK 21
3030
uses: actions/setup-java@v4
3131
with:
32-
java-version: '17'
32+
java-version: '21'
3333
distribution: 'temurin'
3434
cache: maven
3535
- name: Build and test with Maven

‎quartz-manager-frontend/jest.config.js‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,16 @@ module.exports = {
55
tsconfig: '<rootDir>/tsconfig.spec.json',
66
stringifyContentPathRegex: '\\.(html|svg)$'
77
}),
8+
moduleNameMapper: {
9+
'^tslib$': '<rootDir>/node_modules/tslib/tslib.es6.mjs',
10+
'^rxjs$': '<rootDir>/node_modules/rxjs/dist/cjs/index.js',
11+
'^rxjs/operators$': '<rootDir>/node_modules/rxjs/dist/cjs/operators/index.js',
12+
'^rxjs/(.*)$': '<rootDir>/node_modules/rxjs/dist/cjs/$1',
13+
'^@fortawesome/fontawesome$': '<rootDir>/node_modules/@fortawesome/fontawesome/index.js',
14+
'^@fortawesome/fontawesome-free-solid$': '<rootDir>/node_modules/@fortawesome/fontawesome-free-solid/index.js'
15+
},
816
setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
917
transformIgnorePatterns: [
10-
'node_modules/(?!(@angular|@stomp/rx-stomp|@stomp/stompjs|.*\\.mjs$)/)'
18+
'node_modules/(?!(@angular|@fortawesome|@stomp/rx-stomp|@stomp/stompjs|.*\\.mjs$)/)'
1119
]
1220
};

‎quartz-manager-frontend/src/app/components/scheduler-control/scheduler-control.component.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ describe('SchedulerControlComponent', () => {
7474
expect(playIconDe).toBeTruthy();
7575

7676
schedulerBtnDe.nativeElement.click();
77-
const startSchedulerReq = httpTestingController.expectOne('/quartz-manager/scheduler/run');
77+
const startSchedulerReq = httpTestingController.expectOne('/quartz-manager/scheduler/start');
7878
startSchedulerReq.flush(null);
7979
fixture.detectChanges();
8080

@@ -98,7 +98,7 @@ describe('SchedulerControlComponent', () => {
9898
expect(pauseIconDe).toBeTruthy();
9999

100100
schedulerBtnDe.nativeElement.click();
101-
const startSchedulerReq = httpTestingController.expectOne('/quartz-manager/scheduler/pause');
101+
const startSchedulerReq = httpTestingController.expectOne('/quartz-manager/scheduler/standby');
102102
startSchedulerReq.flush(null);
103103
fixture.detectChanges();
104104

‎quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.spec.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ describe('SimpleTriggerConfig', () => {
5656

5757
it('should fetch no triggers at the init', () => {
5858
expect(component).toBeTruthy();
59-
httpTestingController.expectNone(`${CONTEXT_PATH}/simple-triggers/my-simple-trigger`);
59+
httpTestingController.expectNone(`${CONTEXT_PATH}/simple-triggers/DEFAULT/my-simple-trigger`);
6060
});
6161

6262
function setInputValue(componentDe: DebugElement, inputSelector: string, value: string) {
@@ -95,7 +95,7 @@ describe('SimpleTriggerConfig', () => {
9595
component.openTriggerForm();
9696
fixture.detectChanges();
9797

98-
const getJobsReq = httpTestingController.expectOne(`${CONTEXT_PATH}/jobs`);
98+
const getJobsReq = httpTestingController.expectOne(`${CONTEXT_PATH}/job-classes`);
9999
getJobsReq.flush([testJobName]);
100100

101101
const componentDe: DebugElement = fixture.debugElement;
@@ -150,7 +150,7 @@ describe('SimpleTriggerConfig', () => {
150150
expect(submittedTriggerKey).toEqual(new TriggerKey(testTriggerName, null));
151151
flush();
152152

153-
const postSimpleTriggerReq = httpTestingController.expectOne(`${CONTEXT_PATH}/simple-triggers/${testTriggerName}`);
153+
const postSimpleTriggerReq = httpTestingController.expectOne(`${CONTEXT_PATH}/simple-triggers/DEFAULT/${testTriggerName}`);
154154
postSimpleTriggerReq.flush(mockTrigger);
155155

156156
expect(actualNewTrigger).toEqual(mockTrigger);
@@ -166,7 +166,7 @@ describe('SimpleTriggerConfig', () => {
166166
mockTrigger.jobDetailDTO = <JobDetail>{jobClassName: testJobName, description: null};
167167
mockTrigger.mayFireAgain = true;
168168
mockTrigger.misfireInstruction = MisfireInstruction.MISFIRE_INSTRUCTION_FIRE_NOW;
169-
const getSimpleTriggerReq = httpTestingController.expectOne(`${CONTEXT_PATH}/simple-triggers/${testTriggerName}`);
169+
const getSimpleTriggerReq = httpTestingController.expectOne(`${CONTEXT_PATH}/simple-triggers/DEFAULT/${testTriggerName}`);
170170
getSimpleTriggerReq.flush(mockTrigger);
171171

172172
component.simpleTriggerReactiveForm.setValue({
@@ -198,7 +198,7 @@ describe('SimpleTriggerConfig', () => {
198198

199199
submitButton.nativeElement.click();
200200

201-
const putSimpleTriggerReq = httpTestingController.expectOne(`${CONTEXT_PATH}/simple-triggers/${testTriggerName}`);
201+
const putSimpleTriggerReq = httpTestingController.expectOne(`${CONTEXT_PATH}/simple-triggers/DEFAULT/${testTriggerName}`);
202202
putSimpleTriggerReq.flush(mockTrigger);
203203

204204
expect(actualNewTrigger).toBeUndefined();
@@ -214,7 +214,7 @@ describe('SimpleTriggerConfig', () => {
214214
const mockTrigger = new Trigger();
215215
mockTrigger.triggerKeyDTO = mockTriggerKey;
216216
mockTrigger.jobDetailDTO = <JobDetail>{jobClassName: 'TestJob', description: null};
217-
const getSimpleTriggerReq = httpTestingController.expectOne(`${CONTEXT_PATH}/simple-triggers/my-simple-trigger`);
217+
const getSimpleTriggerReq = httpTestingController.expectOne(`${CONTEXT_PATH}/simple-triggers/DEFAULT/my-simple-trigger`);
218218
getSimpleTriggerReq.flush(mockTrigger);
219219

220220
fixture.detectChanges();
@@ -246,7 +246,7 @@ describe('SimpleTriggerConfig', () => {
246246
mockTrigger.mayFireAgain = true;
247247
mockTrigger.misfireInstruction = MisfireInstruction.MISFIRE_INSTRUCTION_FIRE_NOW;
248248

249-
const getSimpleTriggerReq = httpTestingController.expectOne(`${CONTEXT_PATH}/simple-triggers/${testTriggerName}`);
249+
const getSimpleTriggerReq = httpTestingController.expectOne(`${CONTEXT_PATH}/simple-triggers/DEFAULT/${testTriggerName}`);
250250
getSimpleTriggerReq.flush(mockTrigger);
251251

252252
expect(component.simpleTriggerReactiveForm.value.triggerName).toEqual(testTriggerName);
@@ -271,7 +271,7 @@ describe('SimpleTriggerConfig', () => {
271271

272272
it('should display the warning if there are no eligible jobs', () => {
273273
fixture.detectChanges();
274-
const getJobsReq = httpTestingController.expectOne(`${CONTEXT_PATH}/jobs`);
274+
const getJobsReq = httpTestingController.expectOne(`${CONTEXT_PATH}/job-classes`);
275275
getJobsReq.flush([]);
276276
fixture.detectChanges();
277277

@@ -285,7 +285,7 @@ describe('SimpleTriggerConfig', () => {
285285

286286
it('should not display the warning if there are eligible jobs', () => {
287287
fixture.detectChanges();
288-
const getJobsReq = httpTestingController.expectOne(`${CONTEXT_PATH}/jobs`);
288+
const getJobsReq = httpTestingController.expectOne(`${CONTEXT_PATH}/job-classes`);
289289
getJobsReq.flush(['sampleJob']);
290290
fixture.detectChanges();
291291

‎quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ export class SimpleTriggerConfigComponent implements OnInit {
207207
const reactiveFormValue = this.simpleTriggerReactiveForm.getRawValue();
208208
const simpleTriggerCommand = new SimpleTriggerCommand();
209209
simpleTriggerCommand.triggerName = reactiveFormValue.triggerName;
210+
simpleTriggerCommand.triggerGroup = this.selectedTriggerKey?.group || 'DEFAULT';
210211
simpleTriggerCommand.jobClass = reactiveFormValue.jobClass;
211212
simpleTriggerCommand.repeatCount = reactiveFormValue.triggerRecurrence.repeatCount;
212213
simpleTriggerCommand.repeatInterval = reactiveFormValue.triggerRecurrence.repeatInterval;

‎quartz-manager-frontend/tsconfig.spec.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"compilerOptions": {
44
"outDir": "../out-tsc/spec",
55
"baseUrl": "",
6+
"importHelpers": false,
67
"types": [
78
"jasmine",
89
"node"

0 commit comments

Comments
 (0)