add e2e

test/global-setup.ts

@@ -17,10 +17,10 @@ export default async () => {
 
   // Run migrations
   await new Promise<void>((resolve, reject) => {
-    console.info("running migration")
+    console.info('running migration');
     exec(
       'env && npm run migration:run',
-      { env: { ...process.env, ...readEnvFile() } },
+      { env: { ...process.env, DATA_SOURCE_ENV: '.env.e2e' } },
       (err, stdout, stderr) => {
         if (err) {
           console.error(stderr);
@@ -31,11 +31,13 @@ export default async () => {
       },
     );
   });
+
+  // await new Promise(resolve => {setTimeout(resolve, 60000)})
 };
 
-function readEnvFile() {
-  const fs = require('fs');
-  const dotenv = require('dotenv');
-  const envConfig = dotenv.parse(fs.readFileSync('.env.e2e'));
-  return envConfig;
-}
+// function readEnvFile() {
+//   const fs = require('fs');
+//   const dotenv = require('dotenv');
+//   const envConfig = dotenv.parse(fs.readFileSync('.env.e2e'));
+//   return envConfig;
+// }

test/user.e2e-spec.ts

@@ -7,11 +7,9 @@ import { Role } from '../src/auth/role.enum';
 import { UserService } from '../src/user/user.service';
 import { User } from '../src/entity/user';
 import { UpdateUserDto } from '../src/user/dto/update-user.dto';
-import * as dotenv from 'dotenv';
-
-dotenv.config({ path: '.env.e2e' });
 
 describe('UserController (e2e)', () => {
+  process.env.DATA_SOURCE_ENV = '.env.e2e';
   let app: INestApplication;
   let jwtToken: string;
   let adminUserId: number;
@@ -21,6 +19,7 @@ describe('UserController (e2e)', () => {
       imports: [AppModule],
     }).compile();
 
+    // process.env.DATA_SOURCE_ENV=".env.e2e";
     app = moduleFixture.createNestApplication();
     app.useGlobalPipes(new ValidationPipe());
     await app.init();
@@ -29,13 +28,14 @@ describe('UserController (e2e)', () => {
     const adminUser = await userService.create({
       username: 'e2e_admin',
       password: 'password',
+      email: "admin@dvbooking.hu",
       roles: [Role.Admin],
     });
     adminUserId = adminUser.id;
 
     const response = await request(app.getHttpServer())
       .post('/auth/login')
-      .send({ username: 'e2e_admin', password: 'password' });
+      .send({ username: 'admin', password: '123456' });
 
     jwtToken = response.body.access_token;
   });