Refactored E2E tests to stabilize them

rob3000 · Feb 14, 2021 · be6958a · be6958a
1 parent ca84566
commit be6958a
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 180 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
 dist/
+.vscode
diff --git a/test/app-async.e2e-spec.ts b/test/app-async.e2e-spec.ts
@@ -3,38 +3,53 @@ import { INestMicroservice } from '@nestjs/common';
 import AppModule from './e2e/app/config.app.async';
 import { TestConsumer } from './e2e/app/test.controller';
 import { messages } from './constants';
+import { Utils } from './utils';
 
 describe('AppModule Async (e2e)', () => {
-  let app: INestMicroservice;
-  let controller: TestConsumer;
-
-  beforeAll(async () => {
-    const moduleFixture: TestingModule = await Test.createTestingModule({
-      imports: [AppModule],
-    }).compile();
-
-    app = moduleFixture.createNestMicroservice({});
-    app.enableShutdownHooks();
-    await app.listenAsync();
-
-    controller = await app.resolve(TestConsumer);
-    controller.messages = [];
-  });
-
-  afterAll(async() => {
-    await app.close();
-  });
-
-  it("should give kafka some time", done => {
-    setTimeout(done, 4000);
-  });
-
-  it('We can SEND and ACCEPT AVRO messages', async () => {
-    return controller.sendMessage({ messages }).then(() => {
-      expect(controller.messages.length).toBe(messages.length);
-
-      expect(controller.messages[0]).toEqual(messages[0].value);
-      expect(controller.messages[1]).toEqual(messages[1].value);
+    let app: INestMicroservice;
+    let controller: TestConsumer;
+
+    beforeAll(async () => {
+        jest.setTimeout(10000);
+
+        await Utils.schemaRegistrySetup();
+
+        const moduleFixture: TestingModule = await Test.createTestingModule({
+            imports: [AppModule]
+        }).compile();
+
+        app = moduleFixture.createNestMicroservice({});
+        app.enableShutdownHooks();
+        await app.listenAsync();
+
+        controller = await app.resolve(TestConsumer);
+        controller.messages = [];
+    });
+
+    afterAll(async () => {
+        await app.close();
+    });
+
+    beforeEach(async () => {
+        await Utils.sleep(2000);
+
+        controller = await app.resolve(TestConsumer);
+        controller.messages = [];
+    });
+
+    it('We can SEND and ACCEPT AVRO messages', async () => {
+        await Utils.sleep(2000);
+
+        await controller.sendMessage({ messages });
+
+        let count = 0;
+        while (controller.messages.length < messages.length && count < 4) {
+            await Utils.sleep(1000);
+            count++;
+        }
+
+        expect(controller.messages.length).toBe(messages.length);
+        expect(controller.messages.find((x) => x.id == messages[0].value.id)).toBeDefined();
+        expect(controller.messages.find((x) => x.id == messages[1].value.id)).toBeDefined();
     });
-  });
 });
diff --git a/test/app-sync.e2e-spec.ts b/test/app-sync.e2e-spec.ts
@@ -3,38 +3,50 @@ import { INestMicroservice } from '@nestjs/common';
 import AppModule from './e2e/app/config.app.sync';
 import { TestConsumer } from './e2e/app/test.controller';
 import { messages } from './constants';
+import { Utils } from './utils';
 
 describe('AppModule Sync (e2e)', () => {
-  let app: INestMicroservice;
-  let controller: TestConsumer;
-
-  beforeAll(async () => {
-    const moduleFixture: TestingModule = await Test.createTestingModule({
-      imports: [AppModule],
-    }).compile();
-
-    app = moduleFixture.createNestMicroservice({});
-    app.enableShutdownHooks();
-    await app.listenAsync();
-
-    controller = await app.resolve(TestConsumer);
-    controller.messages = [];
-  });
-
-  afterAll(async() => {
-    await app.close();
-  });
-
-  it("should give kafka some time", done => {
-    setTimeout(done, 4000);
-  });
-
-  it('We can SEND and ACCEPT AVRO messages', async () => {
-    return controller.sendMessage({ messages }).then(() => {
-      expect(controller.messages.length).toBe(messages.length);
-
-      expect(controller.messages[0]).toEqual(messages[0].value);
-      expect(controller.messages[1]).toEqual(messages[1].value);
+    let app: INestMicroservice;
+    let controller: TestConsumer;
+
+    beforeAll(async () => {
+        jest.setTimeout(10000);
+
+        await Utils.schemaRegistrySetup();
+
+        const moduleFixture: TestingModule = await Test.createTestingModule({
+            imports: [AppModule]
+        }).compile();
+
+        app = moduleFixture.createNestMicroservice({});
+        app.enableShutdownHooks();
+        await app.listenAsync();
+    });
+
+    afterAll(async () => {
+        await app.close();
+    });
+
+    beforeEach(async () => {
+        await Utils.sleep(2000);
+
+        controller = await app.resolve(TestConsumer);
+        controller.messages = [];
+    });
+
+    it('We can SEND and ACCEPT AVRO messages', async () => {
+        await Utils.sleep(2000);
+
+        await controller.sendMessage({ messages });
+
+        let count = 0;
+        while (controller.messages.length < messages.length && count < 4) {
+            await Utils.sleep(1000);
+            count++;
+        }
+
+        expect(controller.messages.length).toBe(messages.length);
+        expect(controller.messages.find((x) => x.id == messages[0].value.id)).toBeDefined();
+        expect(controller.messages.find((x) => x.id == messages[1].value.id)).toBeDefined();
     });
-  });
 });
diff --git a/test/app.e2e-spec.ts b/test/app.e2e-spec.ts
diff --git a/test/e2e-setup.spec.ts b/test/e2e-setup.spec.ts
diff --git a/test/utils.ts b/test/utils.ts
@@ -0,0 +1,27 @@
+import { SchemaRegistry, readAVSC } from '@kafkajs/confluent-schema-registry';
+import { join } from 'path';
+
+export class Utils {
+    public static sleep(ms: number) {
+        return new Promise((resolve) => setTimeout(resolve, ms));
+    }
+
+    public static async schemaRegistrySetup() {
+        const registry = new SchemaRegistry({ host: 'http://localhost:8081/' });
+
+        // For our other tests we require the schema to already exist
+        // in schema registry and dont allow uploaded through the nestJS
+        // application.
+        const valuePath = join(__dirname, 'e2e', 'app', 'value-schema.avsc');
+        const keyPath = join(__dirname, 'e2e', 'app', 'key-schema.avsc');
+        const valueSchema = readAVSC(valuePath);
+        const keySchema = readAVSC(keyPath);
+
+        const valueSchemaResult = await registry.register(valueSchema, {
+            separator: '-'
+        });
+        const keySchemaResult = await registry.register(keySchema, {
+            separator: '-'
+        });
+    }
+}