From 43c4462349596e0ce1d2675f3dea71cc3ce0482c Mon Sep 17 00:00:00 2001
From: Narong <narong@flowaccount.com>
Date: Sat, 12 Oct 2024 15:03:41 +0700
Subject: [PATCH] fix(nx-serverless): update e2e test

---
 apps/nx-serverless-e2e/jest.config.js         | 11 ++++++---
 .../tests/nx-serverless.test.ts               | 23 ++++++++-----------
 apps/nx-serverless-e2e/tsconfig.json          |  3 ++-
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/apps/nx-serverless-e2e/jest.config.js b/apps/nx-serverless-e2e/jest.config.js
index 744f4f3d..680a67f2 100644
--- a/apps/nx-serverless-e2e/jest.config.js
+++ b/apps/nx-serverless-e2e/jest.config.js
@@ -1,5 +1,10 @@
 module.exports = {
-  name: 'nx-serverless-e2e',
-  preset: '../../jest.config.js',
-  coverageDirectory: '../../coverage/apps\nx-serverless-e2e'
+  preset: '../../jest.preset.js',
+  transform: {
+    '^.+\\.[tj]sx?$': 'ts-jest',
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
+  coverageDirectory: '../../coverage/apps\nx-serverless-e2e',
+  displayName: 'nx-serverless-e2e',
+  testEnvironment: 'node',
 };
diff --git a/apps/nx-serverless-e2e/tests/nx-serverless.test.ts b/apps/nx-serverless-e2e/tests/nx-serverless.test.ts
index d164a39a..9b338d97 100644
--- a/apps/nx-serverless-e2e/tests/nx-serverless.test.ts
+++ b/apps/nx-serverless-e2e/tests/nx-serverless.test.ts
@@ -5,22 +5,23 @@ import {
   runNxCommandAsync,
   uniq,
 } from '@nx/plugin/testing';
+
 describe('nx-serverless e2e', () => {
   beforeAll(() => {
     ensureNxProject('@flowaccount/nx-serverless', 'dist/libs/nx-serverless');
   });
   describe('nx-serverless:api-serverless e2e', () => {
-    it('should create nx-serverless:api-serverless', async (done) => {
+    it('should create nx-serverless:api-serverless', async () => {
       const plugin = uniq('nx-serverless');
       await runNxCommandAsync(
         `generate @flowaccount/nx-serverless:api-serverless ${plugin}`
       );
       const result = await runNxCommandAsync(`build ${plugin}`);
       expect(result.stdout).toContain(`[./apps/${plugin}/src/handler.ts]`);
-      done();
     }, 90000);
+
     describe('--directory', () => {
-      it('should create src in the specified directory', async (done) => {
+      it('should create src in the specified directory', async () => {
         const plugin = uniq('nx-serverless');
         await runNxCommandAsync(
           `generate @flowaccount/nx-serverless:api-serverless ${plugin} --directory subdir`
@@ -39,43 +40,39 @@ describe('nx-serverless e2e', () => {
             `apps/subdir/${plugin}/tslint.json`
           )
         ).not.toThrow();
-        done();
       }, 10000);
     });
 
     describe('--tags', () => {
-      it('should add tags to nx.json', async (done) => {
+      it('should add tags to nx.json', async () => {
         const plugin = uniq('nx-serverless');
         await runNxCommandAsync(
           `generate @flowaccount/nx-serverless:api-serverless ${plugin} --tags e2etag,e2ePackage`
         );
         const nxJson = readJson('nx.json');
         expect(nxJson.projects[plugin].tags).toEqual(['e2etag', 'e2ePackage']);
-        done();
       }, 10000);
     });
   }),
     describe('nx-serverless:express e2e test', () => {
-      it('should create nx-serverless:express', async (done) => {
+      it('should create nx-serverless:express', async () => {
         const plugin = uniq('nx-serverless-express');
         await runNxCommandAsync(
           `generate @flowaccount/nx-serverless:express ${plugin} --initExpress true`
         );
         const result = await runNxCommandAsync(`build ${plugin}`);
         expect(result.stdout).toContain('Built at:');
-        done();
       }, 90000);
-      it('should compile nx-serverless:express', async (done) => {
+      it('should compile nx-serverless:express', async () => {
         const plugin = uniq('nx-serverless-express');
         await runNxCommandAsync(
           `generate @flowaccount/nx-serverless:express ${plugin} --initExpress true`
         );
         const result = await runNxCommandAsync(`run ${plugin}:compile`);
         expect(result.stdout).toContain(`Done compiling TypeScript files`);
-        done();
       }, 90000);
       describe('--directory', () => {
-        it('should create src in the specified directory', async (done) => {
+        it('should create src in the specified directory', async () => {
           const plugin = uniq('nx-serverless-express');
           await runNxCommandAsync(
             `generate @flowaccount/nx-serverless:express ${plugin} --directory subdir --initExpress true`
@@ -96,12 +93,11 @@ describe('nx-serverless e2e', () => {
               `apps/subdir/${plugin}/tslint.json`
             )
           ).not.toThrow();
-          done();
         }, 10000);
       });
 
       describe('--tags', () => {
-        it('should add tags to nx.json', async (done) => {
+        it('should add tags to nx.json', async () => {
           const plugin = uniq('nx-serverless-express');
           await runNxCommandAsync(
             `generate @flowaccount/nx-serverless:express ${plugin} --tags e2etag,e2ePackage --initExpress=true`
@@ -111,7 +107,6 @@ describe('nx-serverless e2e', () => {
             'e2etag',
             'e2ePackage',
           ]);
-          done();
         }, 10000);
       });
     });
diff --git a/apps/nx-serverless-e2e/tsconfig.json b/apps/nx-serverless-e2e/tsconfig.json
index 6d5abf84..ed314469 100644
--- a/apps/nx-serverless-e2e/tsconfig.json
+++ b/apps/nx-serverless-e2e/tsconfig.json
@@ -1,7 +1,8 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "types": ["node", "jest"]
+    "types": ["node", "jest"],
+    "esModuleInterop": true
   },
   "include": [],
   "files": [],