fix: loadCustomLoader should be run before loadCustomApp (#3652)

eggjs · Apr 28, 2019 · d3b1cb5 · d3b1cb5
1 parent 7cc8aab
commit d3b1cb5
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 3 deletions.
diff --git a/lib/loader/app_worker_loader.js b/lib/loader/app_worker_loader.js
@@ -29,6 +29,8 @@ class AppWorkerLoader extends EggLoader {
     this.loadContextExtend();
     this.loadHelperExtend();
 
+    this.loadCustomLoader();
+
     // app > plugin
     this.loadCustomApp();
     // app > plugin
@@ -39,8 +41,6 @@ class AppWorkerLoader extends EggLoader {
     this.loadController();
     // app
     this.loadRouter(); // Dependent on controllers
-
-    this.loadCustomLoader();
   }
 
 }

diff --git a/test/doc.test.js b/test/doc.test.js
@@ -7,6 +7,7 @@ const runscript = require('runscript');
 const utils = require('./utils');
 
 describe('test/doc.test.js', () => {
+  if (process.platform === 'win32') return;
 
   let app;
   before(async () => {

diff --git a/test/fixtures/apps/custom-loader/app.js b/test/fixtures/apps/custom-loader/app.js
@@ -0,0 +1,12 @@
+'use strict';
+
+module.exports = class {
+  constructor(app) {
+    this.app = app;
+  }
+
+  async didLoad() {
+    const ctx = this.app.createAnonymousContext();
+    this.app.beforeLoad = await ctx.repository.user.beforeLoad();
+  }
+};
diff --git a/test/fixtures/apps/custom-loader/app/controller/user.js b/test/fixtures/apps/custom-loader/app/controller/user.js
@@ -12,6 +12,10 @@ class UserController {
       repository: await this.ctx.repository.user.get(),
     };
   }
+
+  async beforeLoad() {
+    this.ctx.body = this.app.beforeLoad;
+  }
 }
 
 module.exports = UserController;
diff --git a/test/fixtures/apps/custom-loader/app/repository/user.js b/test/fixtures/apps/custom-loader/app/repository/user.js
@@ -9,6 +9,10 @@ class UserRepository {
     return this.ctx.params.name;
   }
 
+  async beforeLoad() {
+    return 'beforeLoad';
+  }
+
 }
 
 module.exports = UserRepository;
diff --git a/test/fixtures/apps/custom-loader/app/router.js b/test/fixtures/apps/custom-loader/app/router.js
@@ -2,4 +2,5 @@
 
 module.exports = app => {
   app.router.get('/users/:name', app.controller.user.get);
+  app.router.get('/beforeLoad', app.controller.user.beforeLoad);
 };
diff --git a/test/lib/core/custom_loader.test.js b/test/lib/core/custom_loader.test.js
@@ -13,7 +13,7 @@ describe('test/lib/core/custom_loader.test.js', () => {
   });
   after(() => app.close());
 
-  it('should', async () => {
+  it('should support customLoader', async () => {
     await app.httpRequest()
       .get('/users/popomore')
       .expect({
@@ -23,4 +23,11 @@ describe('test/lib/core/custom_loader.test.js', () => {
       .expect(200);
   });
 
+  it('should loadCustomLoader before loadCustomApp', async () => {
+    await app.httpRequest()
+      .get('/beforeLoad')
+      .expect('beforeLoad')
+      .expect(200);
+  });
+
 });