Merge branch 'minor' into custom-field-struct

vendure-ecommerce · Nov 15, 2024 · 7ee2e29 · 7ee2e29
2 parents a623b4d + b4a773f
commit 7ee2e29
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/packages/core/e2e/default-search-plugin-uuids.e2e-spec.ts b/packages/core/e2e/default-search-plugin-uuids.e2e-spec.ts
@@ -50,6 +50,10 @@ describe('Default search plugin with UUIDs', () => {
         // rebuild is not completed in time for the first test.
         await new Promise(resolve => setTimeout(resolve, 5000));
 
+        // We have extra time here because a lot of jobs are
+        // triggered from all the product updates
+        await awaitRunningJobs(adminClient, 10_000, 1000);
+
         const { facets } = await adminClient.query<GetFacetListQuery, GetFacetListQueryVariables>(
             GET_FACET_LIST,
             {

diff --git a/packages/core/e2e/default-search-plugin.e2e-spec.ts b/packages/core/e2e/default-search-plugin.e2e-spec.ts
@@ -129,7 +129,9 @@ describe('Default search plugin', () => {
             customerCount: 1,
         });
         await adminClient.asSuperAdmin();
-        await awaitRunningJobs(adminClient);
+        // We have extra time here because a lot of jobs are
+        // triggered from all the product updates
+        await awaitRunningJobs(adminClient, 10_000, 1000);
     }, TEST_SETUP_TIMEOUT_MS);
 
     afterAll(async () => {

diff --git a/packages/elasticsearch-plugin/e2e/elasticsearch-plugin-uuid.e2e-spec.ts b/packages/elasticsearch-plugin/e2e/elasticsearch-plugin-uuid.e2e-spec.ts
@@ -43,6 +43,9 @@ describe('Elasticsearch plugin with UuidIdStrategy', () => {
             customerCount: 1,
         });
         await adminClient.asSuperAdmin();
+        // We have extra time here because a lot of jobs are
+        // triggered from all the product updates
+        await awaitRunningJobs(adminClient, 10_000, 1000);
         await adminClient.query(REINDEX);
         await awaitRunningJobs(adminClient);
     }, TEST_SETUP_TIMEOUT_MS);

diff --git a/packages/elasticsearch-plugin/e2e/elasticsearch-plugin.e2e-spec.ts b/packages/elasticsearch-plugin/e2e/elasticsearch-plugin.e2e-spec.ts
@@ -188,7 +188,9 @@ describe('Elasticsearch plugin', () => {
             customerCount: 1,
         });
         await adminClient.asSuperAdmin();
-        await awaitRunningJobs(adminClient);
+        // We have extra time here because a lot of jobs are
+        // triggered from all the product updates
+        await awaitRunningJobs(adminClient, 10_000, 1000);
         await adminClient.query(REINDEX);
         await awaitRunningJobs(adminClient);
     }, TEST_SETUP_TIMEOUT_MS);