Merge pull request #316 from raveljs/bugfix/315

Missing await on lifecycle-decorated methods

documentation.yml

@@ -1,7 +1,8 @@
 name: Ravel API
-version: 1.0.0-rc.13
+version: 1.0.0-rc.14
 favicon: assets/logo.png
 versions:
+  - 1.0.0-rc.14
   - 1.0.0-rc.13
   - 1.0.0-rc.12
   - 1.0.0-rc.11

jest/integration/ravel-lifecycle.test.js

@@ -1,3 +1,5 @@
+const { fail } = require('assert');
+
 let app;
 let postinjectHandlerCalled = 0;
 let anotherPostinjectHandlerCalled = 0;
@@ -59,20 +61,49 @@ describe('Ravel lifeycle test', () => {
       }
 
       @postinject
-      doPostInject () {
+      async doPostInject () {
         expect(this.another.test).toBe('hello world');
-        postinjectHandlerCalled += 1;
+        try {
+          await request('localhost:8080').get('').expect(200);
+          fail('Ravel application should not be listening at this lifecycle stage.');
+        } catch (err) {}
+        await new Promise((resolve) => {
+          process.nextTick(() => {
+            postinjectHandlerCalled += 1;
+            expect(postinitHandlerCalled).toBe(0);
+            expect(anotherPostinitHandlerCalled).toBe(0);
+            resolve();
+          });
+        });
       }
 
       @postinject
-      doAnotherPostInject () {
+      async doAnotherPostInject () {
         expect(this.another.test).toBe('hello world');
-        anotherPostinjectHandlerCalled += 1;
+        await new Promise((resolve) => {
+          process.nextTick(() => {
+            anotherPostinjectHandlerCalled += 1;
+            expect(postinitHandlerCalled).toBe(0);
+            expect(anotherPostinitHandlerCalled).toBe(0);
+            resolve();
+          });
+        });
       }
 
       @postinit
-      doPostInit () {
-        postinitHandlerCalled += 1;
+      async doPostInit () {
+        try {
+          await request('localhost:8080').get('').expect(200);
+          fail('Ravel application should not be listening at this lifecycle stage.');
+        } catch (err) {}
+        expect(postinjectHandlerCalled).toBe(1);
+        expect(anotherPostinjectHandlerCalled).toBe(1);
+        await new Promise((resolve) => {
+          process.nextTick(() => {
+            postinitHandlerCalled += 1;
+            resolve();
+          });
+        });
       }
 
       @postinit
@@ -81,12 +112,16 @@ describe('Ravel lifeycle test', () => {
       }
 
       @prelisten
-      doPreListen () {
+      async doPreListen () {
+        try {
+          await request('localhost:8080').get('').expect(200);
+          fail('Ravel application should not be listening at this lifecycle stage.');
+        } catch (err) {}
         prelistenHandlerCalled += 1;
       }
 
       @postlisten
-      doPostListen () {
+      async doPostListen () {
         postlistenHandlerCalled += 1;
       }
 

lib/core/module.js

@@ -21,9 +21,9 @@ async function initModule (ravelInstance) {
   function connectHandlers (decorator, event) {
     const handlers = Metadata.getClassMeta(Object.getPrototypeOf(self), decorator, Object.create(null));
     for (const f of Object.keys(handlers)) {
-      ravelInstance.once(event, (...args) => {
+      ravelInstance.once(event, async (...args) => {
         ravelInstance.$log.trace(`${name}: Invoking ${decorator} ${f}`);
-        handlers[f].apply(self, args);
+        await handlers[f].apply(self, args);
       });
     }
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ravel",
-  "version": "1.0.0-rc.13",
+  "version": "1.0.0-rc.14",
   "author": "Sean McIntyre <[email protected]>",
   "description": "Ravel Rapid Application Development Framework",
   "engines": {