fix(core): need to await init

usehenri · Apr 4, 2018 · 88203e6 · 88203e6
1 parent 2eb0a25
commit 88203e6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/packages/core/src/2.server.js b/packages/core/src/2.server.js
@@ -175,7 +175,9 @@ class Server extends BaseModule {
     // const ws = new Websocket(this.httpServer);
     // ws.init();
 
-    this.port = henri.config.has('port') ? henri.config.get('port') : 3000;
+    this.port = this.henri.config.has('port')
+      ? this.henri.config.get('port')
+      : 3000;
 
     app.use(timings);
 
@@ -207,7 +209,7 @@ class Server extends BaseModule {
     port = henri.isDev ? await choosePort('0.0.0.0', port) : port;
     return httpServer
       .listen(port, function() {
-        henri.pen.info('server', 'listenning');
+        henri.pen.info('server', 'ready for battle');
         const urls = prepareUrls('http', '0.0.0.0', port);
         henri.isDev && watch();
 

diff --git a/packages/core/src/__tests__/__snapshots__/henri.spec.js.snap b/packages/core/src/__tests__/__snapshots__/henri.spec.js.snap
@@ -2,6 +2,7 @@
 
 exports[`henri general should match snapshot 1`] = `
 Henri {
+  "_middlewares": Array [],
   "cwd": [Function],
   "env": "test",
   "isDev": false,

diff --git a/packages/core/src/__tests__/controllers.spec.js b/packages/core/src/__tests__/controllers.spec.js
@@ -2,9 +2,9 @@ const BaseModule = require('../base/module');
 const Henri = require('../henri');
 
 describe('controllers', () => {
-  beforeEach(() => {
+  beforeEach(async () => {
     this.henri = new Henri({ runlevel: 2 });
-    this.henri.init();
+    await this.henri.init();
   });
 
   test('should be defined', () => {

diff --git a/packages/core/src/__tests__/models.spec.js b/packages/core/src/__tests__/models.spec.js
@@ -2,13 +2,12 @@ const BaseModule = require('../base/module');
 const Henri = require('../henri');
 
 describe('models', () => {
-  beforeAll(() => {
-    this.henri = new Henri({ runlevel: 5 });
-    this.henri.init();
+  beforeAll(async () => {
+    this.henri = new Henri({ runlevel: 2 });
+    await this.henri.init();
   });
 
   test('should be defined', () => {
-    console.log(this.henri);
     expect(this.henri.model).toBeDefined();
   });