fix: egg-layer test case

midwayjs · Dec 10, 2019 · 060cdab · 060cdab
1 parent adc96b1
commit 060cdab
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 77 deletions.
diff --git a/packages/egg-layer/test/index.test.ts b/packages/egg-layer/test/index.test.ts
@@ -5,24 +5,29 @@ import * as request from 'supertest';
 
 describe('/test/index.test.ts', () => {
   describe('should test http trigger use app directly', () => {
-    let app;
     let runtime;
-    before(async () => {
+
+    afterEach(() => {
+      if (runtime) {
+        runtime.close();
+      }
+    });
+
+    it('should test with supertest', async () => {
+      const entryDir = join(__dirname, './fixtures/eaas');
+      process.env.ENTRY_DIR = entryDir;
       runtime = createRuntime({
-        functionDir: join(__dirname, './fixtures/eaas'),
+        functionDir: entryDir,
       });
       await runtime.start();
-      app = await runtime.delegate(new HTTPTrigger());
-    });
-
-    before(() => runtime.close());
-
-    it('should test with supertest', (done) => {
-      request(app)
-        .get('/user')
-        .expect('Content-Type', 'text/html; charset=utf-8')
-        .expect(/hello Alan/)
-        .expect(200, done);
+      const app = await runtime.delegate(new HTTPTrigger());
+      return new Promise(resolve => {
+        request(app)
+          .get('/user')
+          .expect('Content-Type', 'text/html; charset=utf-8')
+          .expect(/hello Alan/)
+          .expect(200, resolve);
+      });
     });
   });
   // it('basic test while return Buffer', async () => {

diff --git a/packages/serverless-fc-spec/test/fixtures/template.yml b/packages/serverless-fc-spec/test/fixtures/template.yml
diff --git a/packages/serverless-fc-starter/src/runtime.ts b/packages/serverless-fc-starter/src/runtime.ts
@@ -54,6 +54,10 @@ export class FCRuntime extends ServerlessLightRuntime {
       }
       return handler.apply(handler, args);
     }).then(result => {
+      if (res.headersSent) {
+        return;
+      }
+
       if (result) {
         ctx.body = result;
       }

diff --git a/packages/serverless-fc-trigger/src/http.ts b/packages/serverless-fc-trigger/src/http.ts
@@ -82,8 +82,10 @@ export class HTTPTrigger extends FCBaseTrigger {
 
   createCallback(handler) {
     this.handler = handler;
-    return () => {
-      throw new Error('should not came here');
+    return err => {
+      if (err) {
+        throw err;
+      }
     };
   }