server handle port errors

usehenri · Jul 13, 2017 · de7cbd0 · de7cbd0
1 parent b277c19
commit de7cbd0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/packages/server/index.js b/packages/server/index.js
@@ -34,7 +34,6 @@ async function start(delay, cb = null) {
 
   port = henri.isTest ? await detect(port) : port;
   port = henri.isDev ? await choosePort('0.0.0.0', port) : port;
-  app.use('*', (req, res) => res.status(404).end('page not found'));
   return app
     .listen(port, function() {
       const bootTiming = delay ? ` (took ${henri.getDiff(delay)}ms)` : '';
@@ -111,6 +110,6 @@ henri.app = app;
 henri.express = express;
 henri.start = start;
 
-module.exports = { start, handleError };
+module.exports = { start, handleError, watch };
 
 log.info('server module loaded.');
diff --git a/packages/server/tests/main.test.js b/packages/server/tests/main.test.js
@@ -1,15 +1,28 @@
 const request = require('supertest');
 require('../../config/index.js');
-require('../index.js');
+const server = require('../index.js');
 
 describe('server', () => {
   let serv;
   beforeAll(done => {
+    henri.router = henri.express.Router();
+    henri.router.get('/sirop', (req, res) => res.send('ok'));
     serv = henri.start(null, done);
   });
   afterAll(done => serv.close(done));
   test('loads', async () => {
     expect(henri.getStatus('http')).toBeTruthy();
-    await request(henri.app).get('/bb').expect(500);
+
+    await request(henri._url).get('/sirop').expect(404);
+  });
+  test('handleErrors', () => {
+    henri.log.error = jest.fn();
+    henri.log.fatalError = jest.fn();
+    server.handleError('simple error');
+    expect(henri.log.fatalError).toHaveBeenCalledTimes(0);
+    expect(henri.log.error).toHaveBeenCalledTimes(1);
+    server.handleError({ code: 'EADDRINUSE', msg: 'oops' });
+    expect(henri.log.fatalError).toHaveBeenCalledTimes(1);
+    expect(henri.log.error).toHaveBeenCalledTimes(2);
   });
 });