Browse Source

test: Fix failing tests

Michael Bromley 5 years ago
parent
commit
1915538691

+ 9 - 2
packages/core/e2e/collection.e2e-spec.ts

@@ -1,6 +1,10 @@
 /* tslint:disable:no-non-null-assertion */
 import { ROOT_COLLECTION_NAME } from '@vendure/common/lib/shared-constants';
-import { facetValueCollectionFilter, variantNameCollectionFilter } from '@vendure/core';
+import {
+    DefaultJobQueuePlugin,
+    facetValueCollectionFilter,
+    variantNameCollectionFilter,
+} from '@vendure/core';
 import { createTestEnvironment } from '@vendure/testing';
 import gql from 'graphql-tag';
 import path from 'path';
@@ -48,7 +52,10 @@ import { assertThrowsWithMessage } from './utils/assert-throws-with-message';
 import { awaitRunningJobs } from './utils/await-running-jobs';
 
 describe('Collection resolver', () => {
-    const { server, adminClient } = createTestEnvironment(testConfig);
+    const { server, adminClient } = createTestEnvironment({
+        ...testConfig,
+        plugins: [DefaultJobQueuePlugin],
+    });
 
     let assets: GetAssetList.Items[];
     let facetValues: FacetValueFragment[];

+ 7 - 2
packages/core/e2e/default-search-plugin.e2e-spec.ts

@@ -1,6 +1,11 @@
 /* tslint:disable:no-non-null-assertion */
 import { pick } from '@vendure/common/lib/pick';
-import { DefaultSearchPlugin, facetValueCollectionFilter, mergeConfig } from '@vendure/core';
+import {
+    DefaultJobQueuePlugin,
+    DefaultSearchPlugin,
+    facetValueCollectionFilter,
+    mergeConfig,
+} from '@vendure/core';
 import { createTestEnvironment, E2E_DEFAULT_CHANNEL_TOKEN, SimpleGraphQLClient } from '@vendure/testing';
 import gql from 'graphql-tag';
 import path from 'path';
@@ -49,7 +54,7 @@ import { awaitRunningJobs } from './utils/await-running-jobs';
 
 describe('Default search plugin', () => {
     const { server, adminClient, shopClient } = createTestEnvironment(
-        mergeConfig(testConfig, { plugins: [DefaultSearchPlugin] }),
+        mergeConfig(testConfig, { plugins: [DefaultSearchPlugin, DefaultJobQueuePlugin] }),
     );
 
     beforeAll(async () => {

+ 3 - 1
packages/core/src/job-queue/in-memory-job-queue-strategy.ts

@@ -41,7 +41,9 @@ export class InMemoryJobQueueStrategy implements JobQueueStrategy {
 
     async add(job: Job): Promise<Job> {
         if (!job.id) {
-            (job as any).id = generatePublicId();
+            (job as any).id = Math.floor(Math.random() * 1000000000)
+                .toString()
+                .padEnd(10, '0');
         }
         // tslint:disable-next-line:no-non-null-assertion
         this.jobs.set(job.id!, job);

+ 8 - 1
packages/elasticsearch-plugin/e2e/elasticsearch-plugin.e2e-spec.ts

@@ -1,7 +1,13 @@
 /* tslint:disable:no-non-null-assertion */
 import { SortOrder } from '@vendure/common/lib/generated-types';
 import { pick } from '@vendure/common/lib/pick';
-import { DefaultLogger, facetValueCollectionFilter, LogLevel, mergeConfig } from '@vendure/core';
+import {
+    DefaultJobQueuePlugin,
+    DefaultLogger,
+    facetValueCollectionFilter,
+    LogLevel,
+    mergeConfig,
+} from '@vendure/core';
 import { createTestEnvironment, E2E_DEFAULT_CHANNEL_TOKEN, SimpleGraphQLClient } from '@vendure/testing';
 import gql from 'graphql-tag';
 import path from 'path';
@@ -69,6 +75,7 @@ describe('Elasticsearch plugin', () => {
                     port: process.env.CI ? +(process.env.E2E_ELASTIC_PORT || 9200) : 9200,
                     host: process.env.CI ? 'http://127.0.0.1' : 'http://192.168.99.100',
                 }),
+                DefaultJobQueuePlugin,
             ],
         }),
     );