test: global 환경에서 생성 된 container를 재사용하여 테스트할 수 있도록 설정 #72

boostcampwm-2024 · Nov 12, 2024 · eaee784 · eaee784
1 parent 1bd8457
commit eaee784
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 26 deletions.
diff --git a/backend/test/config/globalSetup.ts b/backend/test/config/globalSetup.ts
@@ -5,9 +5,6 @@ export default async () => {
   const ddlScriptPath = path.resolve(__dirname, '../../resources/sql/DDL.sql');
 
   global.reusedContainer = await new MySqlContainer()
-    .withUsername('testUser')
-    .withUserPassword('testPassword')
-    .withDatabase('testDB')
     .withReuse()
     .withBindMounts([
       { source: ddlScriptPath, target: '/docker-entrypoint-initdb.d/DDL.sql' },

diff --git a/backend/test/place/place.repository.test.ts b/backend/test/place/place.repository.test.ts
@@ -1,37 +1,22 @@
-import { MySqlContainer, StartedMySqlContainer } from '@testcontainers/mysql';
-import { DataSource } from 'typeorm';
 import { PlaceRepository } from '../../src/place/place.repository';
-import { createTestDataSource } from '../datasource.config';
-import { PlaceFixture } from './place.fixture';
+import { initDataSource } from '../config/datasource.config';
+import { PlaceFixture } from './fixture/place.fixture';
+import { MySqlContainer, StartedMySqlContainer } from '@testcontainers/mysql';
 
 describe('PlaceRepository', () => {
-  let placeRepository: PlaceRepository;
-  let testDataSource: DataSource;
   let container: StartedMySqlContainer;
+  let placeRepository: PlaceRepository;
 
   beforeAll(async () => {
-    container = await new MySqlContainer()
-      .withUsername('testUser')
-      .withUserPassword('testPassword')
-      .withDatabase('testDB')
-      .start();
-
-    testDataSource = await createTestDataSource(container);
-    await testDataSource.initialize();
-    placeRepository = new PlaceRepository(testDataSource);
-  });
-
-  afterAll(async () => {
-    await testDataSource.destroy();
-    await container.stop();
+    container = await new MySqlContainer().withReuse().start();
+    placeRepository = new PlaceRepository(await initDataSource(container));
   });
 
   beforeEach(async () => {
     await placeRepository.delete({});
   });
 
   it('장소 이름이나 주소에 포함된 키워드를 찾아 해당하는 장소를 반환한다.', async () => {
-    // given
     const placesWithParkName = [
       {
         googlePlaceId: 'googlePlaceId_1',
@@ -68,7 +53,6 @@ describe('PlaceRepository', () => {
     );
     await placeRepository.save(places);
 
-    // when
     const page = 1;
     const pageSize = 10;
     const query = 'park';
@@ -78,7 +62,6 @@ describe('PlaceRepository', () => {
       pageSize,
     );
 
-    // then
     expect(results.length).toBe(3);
 
     expect(results).toEqual(