From aef2c0eea24899233aaea31f531a03b3f748f24a Mon Sep 17 00:00:00 2001
From: Harry Chen <czy88840616@gmail.com>
Date: Sun, 15 Dec 2024 21:57:03 +0800
Subject: [PATCH] fix: rebase error

---
 packages/leoric/test/fixtures/multi/src/configuration.ts | 3 +--
 packages/leoric/test/multi.test.ts                       | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/leoric/test/fixtures/multi/src/configuration.ts b/packages/leoric/test/fixtures/multi/src/configuration.ts
index c14b76be317..4aef5cc88cc 100644
--- a/packages/leoric/test/fixtures/multi/src/configuration.ts
+++ b/packages/leoric/test/fixtures/multi/src/configuration.ts
@@ -7,7 +7,6 @@ const { InjectDataSource } = leoric;
 
 @Configuration({
   imports: [koa, leoric],
-  conflictCheck: true,
   importConfigs: [path.join(__dirname, 'config')],
 })
 export class ContainerLifeCycle {
@@ -24,6 +23,6 @@ export class ContainerLifeCycle {
     expect(this.defaultDataSource).toBeDefined();
     expect(this.defaultDataSource).toEqual(this.namedDataSource);
     expect(this.defaultDataSource).not.toEqual(this.subsystemDataSource);
-    
+
   }
 }
diff --git a/packages/leoric/test/multi.test.ts b/packages/leoric/test/multi.test.ts
index 58fafd2413a..c338e5a160c 100644
--- a/packages/leoric/test/multi.test.ts
+++ b/packages/leoric/test/multi.test.ts
@@ -1,4 +1,4 @@
-import { close, createHttpRequest, createApp } from '@midwayjs/mock';
+import { close, createHttpRequest, createLegacyApp } from '@midwayjs/mock';
 import { join } from 'path';
 import { existsSync, unlinkSync } from 'fs';
 import { IMidwayApplication } from '@midwayjs/core';
@@ -20,7 +20,7 @@ describe('test/multi.test.ts', () => {
   beforeAll(async () => {
     cleanFile(join(__dirname, 'fixtures/multi', 'database.sqlite'));
     cleanFile(join(__dirname, 'fixtures/multi', 'subsystem.sqlite'));
-    app = await createApp(join(__dirname, 'fixtures', 'multi'));
+    app = await createLegacyApp(join(__dirname, 'fixtures', 'multi'));
     postService = await app
       .getApplicationContext()
       .getAsync(PostService);