Explorar o código

test(core): Improve reliability of scheduler e2e tests

Michael Bromley hai 7 meses
pai
achega
a1aa582f6d

+ 1 - 1
.github/workflows/build_and_test_branches.yml

@@ -63,7 +63,7 @@ jobs:
         runs-on: ubuntu-latest
         services:
             mariadb:
-                image: bitnami/mariadb:10.3
+                image: bitnami/mariadb:11.7
                 env:
                     MARIADB_ROOT_USER: vendure
                     MARIADB_ROOT_PASSWORD: password

+ 2 - 2
.github/workflows/build_and_test_master.yml

@@ -7,7 +7,7 @@ on:
             - 'packages/**'
             - 'package.json'
             - 'package-lock.json'
-            
+
 env:
     CI: true
 
@@ -61,7 +61,7 @@ jobs:
         runs-on: ubuntu-latest
         services:
             mariadb:
-                image: bitnami/mariadb:10.3
+                image: bitnami/mariadb:11.7
                 env:
                     MARIADB_ROOT_USER: vendure
                     MARIADB_ROOT_PASSWORD: password

+ 2 - 2
.github/workflows/build_and_test_pr.yml

@@ -9,7 +9,7 @@ on:
             - 'packages/**'
             - 'package.json'
             - 'package-lock.json'
-            
+
 env:
     CI: true
 
@@ -63,7 +63,7 @@ jobs:
         runs-on: ubuntu-latest
         services:
             mariadb:
-                image: bitnami/mariadb:10.3
+                image: bitnami/mariadb:11.7
                 env:
                     MARIADB_ROOT_USER: vendure
                     MARIADB_ROOT_PASSWORD: password

+ 4 - 3
packages/core/e2e/default-scheduler-plugin.e2e-spec.ts

@@ -26,7 +26,7 @@ describe('Default scheduler plugin', () => {
                     new ScheduledTask({
                         id: 'test-job',
                         description: "A test job that doesn't do anything",
-                        schedule: cron => cron.every(5).minutes(),
+                        schedule: cron => cron.everySaturdayAt(0, 0),
                         async execute(injector) {
                             taskSpy();
                             return { success: true };
@@ -61,8 +61,8 @@ describe('Default scheduler plugin', () => {
         expect(scheduledTasks.length).toBe(1);
         expect(scheduledTasks[0].id).toBe('test-job');
         expect(scheduledTasks[0].description).toBe("A test job that doesn't do anything");
-        expect(scheduledTasks[0].schedule).toBe('*/5 * * * *');
-        expect(scheduledTasks[0].scheduleDescription).toBe('Every 5 minutes');
+        expect(scheduledTasks[0].schedule).toBe('0 0 * * 6');
+        expect(scheduledTasks[0].scheduleDescription).toBe('At 12:00 AM, only on Saturday');
         expect(scheduledTasks[0].enabled).toBe(true);
     });
 
@@ -93,6 +93,7 @@ describe('Default scheduler plugin', () => {
     });
 
     it('run task', async () => {
+        taskSpy.mockClear();
         expect(taskSpy).toHaveBeenCalledTimes(0);
 
         const { runScheduledTask } = await adminClient.query<RunTaskMutation, RunTaskMutationVariables>(