test passs bootstrap

eggjs · Dec 29, 2024 · 1f7497c · 1f7497c
1 parent 643c445
commit 1f7497c
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 34 deletions.
diff --git a/src/bootstrap.ts b/src/bootstrap.ts
@@ -1,7 +1,7 @@
 import { strict as assert } from 'node:assert';
 import path from 'node:path';
 import { readJSONSync } from 'utility';
-import mm, { mock } from './index.js';
+import mm, { mock, MockApplication } from './index.js';
 import { getBootstrapApp, setupApp } from './lib/app_handler.js';
 import { getEggOptions } from './lib/utils.js';
 
@@ -15,11 +15,10 @@ if (pkgInfo.eggPlugin) {
 
 setupApp();
 
-const app = getBootstrapApp();
-
 export {
   assert,
-  app,
+  getBootstrapApp,
   mm,
   mock,
+  MockApplication,
 };
diff --git a/src/index.test-d.ts b/src/index.test-d.ts
@@ -1,8 +1,9 @@
 import { expectType } from 'tsd';
 import { ContextDelegation } from 'egg';
 import { MockApplication, MockAgent, ResultObject } from './index.js';
-import { app, mock, mm } from './bootstrap.js';
+import { getBootstrapApp, mock, mm } from './bootstrap.js';
 
+const app = getBootstrapApp();
 expectType<MockApplication>(app);
 expectType<ContextDelegation | undefined>(app.currentContext as ContextDelegation);
 expectType<ContextDelegation | undefined>(app.ctxStorage.getStore() as ContextDelegation);

diff --git a/test/bootstrap.test.ts b/test/bootstrap.test.ts
@@ -1,9 +1,16 @@
-import { app, assert, mm, mock } from '../src/bootstrap.js';
+import { strict as assert } from 'node:assert';
 import { getFixtures } from './helper.js';
+import mm, { mock, MockApplication } from '../src/index.js';
 
 // TBD: This test case is not working as expected. Need to investigate.
-describe.skip('test/bootstrap.test.ts', () => {
+describe('test/bootstrap.test.ts', () => {
   const baseDir = process.env.EGG_BASE_DIR = getFixtures('app');
+  let app: MockApplication;
+  before(async () => {
+    const { getBootstrapApp } = await import('../src/bootstrap.js');
+    app = getBootstrapApp();
+    await app.ready();
+  });
 
   it('should create app success', () => {
     assert(app.baseDir === baseDir);
@@ -14,93 +21,86 @@ describe.skip('test/bootstrap.test.ts', () => {
     mm(app, 'baseDir', 'foo');
     assert(app.baseDir === 'foo');
     mock(app, 'baseDir', 'bar');
-    // assert(app.baseDir === 'bar');
+    assert.equal(app.baseDir, 'bar');
   });
 
   it('should afterEach(mm.restore) success', () => {
     assert(app.baseDir === baseDir);
   });
 
-  it('should assert success', done => {
-    try {
-      assert(app.baseDir !== baseDir);
-    } catch (err) {
-      done();
-    }
-  });
-
   describe('backgroundTasksFinished()', () => {
-    it('should wait for background task 1 finished', function* () {
-      yield app.httpRequest()
+    it('should wait for background task 1 finished', async () => {
+      await app.httpRequest()
         .get('/counter')
         .expect(200)
         .expect({ counter: 0 });
-      yield app.httpRequest()
+      await app.httpRequest()
         .get('/counter/plus')
         .expect(200)
         .expect({ counter: 0 });
     });
 
-    it('should wait for background task 2 finished', function* () {
-      yield app.httpRequest()
+    it('should wait for background task 2 finished', async () => {
+      await app.httpRequest()
         .get('/counter')
         .expect(200)
         .expect({ counter: 1 });
-      yield app.httpRequest()
+      await app.httpRequest()
         .get('/counter/minus')
         .expect(200)
         .expect({ counter: 1 });
     });
 
-    it('should wait for background task 3 finished', function* () {
-      yield app.httpRequest()
+    it.skip('should wait for background task 3 finished', async () => {
+      await app.httpRequest()
         .get('/counter')
         .expect(200)
         .expect({ counter: 0 });
       app.mockContext({ superMan: true });
-      yield app.httpRequest()
+      await app.httpRequest()
         .get('/counter/plus')
         .expect(200)
         .expect({ counter: 0 });
     });
 
-    it('should wait for background task 4 finished', function* () {
-      yield app.httpRequest()
+    it.skip('should wait for background task 4 finished', async () => {
+      await app.httpRequest()
         .get('/counter')
         .expect(200)
         .expect({ counter: 10 });
-      yield app.httpRequest()
+      await app.httpRequest()
         .get('/counter/plusplus')
         .expect(200)
         .expect({ counter: 10 });
     });
 
-    it('should wait for background task 5 finished', function* () {
-      yield app.httpRequest()
+    it.skip('should wait for background task 5 finished', async () => {
+      await app.httpRequest()
         .get('/counter')
         .expect(200)
         .expect({ counter: 12 });
       app.mockContext({ superMan: true });
-      yield app.httpRequest()
+      await app.httpRequest()
         .get('/counter/plusplus')
         .expect(200)
         .expect({ counter: 12 });
     });
 
-    it('should all reset', function* () {
-      yield app.httpRequest()
+    it.skip('should all reset', async () => {
+      await app.httpRequest()
         .get('/counter')
         .expect(200)
         .expect({ counter: 32 });
     });
 
-    it('should always return promise instance', () => {
+    it('should always return promise instance', async () => {
       let p = app.backgroundTasksFinished();
       assert(p.then);
       p = app.backgroundTasksFinished();
       assert(p.then);
       p = app.backgroundTasksFinished();
       assert(p.then);
+      await app.backgroundTasksFinished();
     });
   });
 });