core 404 and 500 routes tests

kommander · Jun 21, 2017 · 012fbec · 012fbec
1 parent 6ea873f
commit 012fbec
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 4 deletions.
diff --git a/lib/aden.routes.js b/lib/aden.routes.js
@@ -58,7 +58,7 @@ function setupApp(pages) {
     .then(() => this.applyHook('post:setup', { pages, app: this.app }))
     .then(() => {
       this.app.use((req, res, next) => this.notFoundRoute(req, res, next));
-      this.app.use(pages[0].basePath, (err, req, res, next) =>
+      this.app.use((err, req, res, next) =>
         this.errorRoute(err, req, res, next));
     });
 }
@@ -79,9 +79,8 @@ function notFoundRoute(req, res, next) {
 
 function errorRoute(err, req, res, next) {
   this.log.error('Unhandled:', err);
-
+  
   if (res.headersSent) {
-    next(err);
     return;
   }
 
@@ -92,7 +91,7 @@ function errorRoute(err, req, res, next) {
   if (!res.headersSent) {
     res.status(500);
     if (this.isDEV) {
-      res.send(`<pre>${err.stack || err.message || err.code || err}</pre>`);
+      res.send(`<pre>${err.stack || err}</pre>`);
     } else {
       res.send('Internal Server Error');
     }

diff --git a/test/integration/routing.dev.spec.js b/test/integration/routing.dev.spec.js
@@ -177,6 +177,51 @@ describe('Routing Dev', () => {
       .catch(done);
   });
 
+  she('has a core status page (404)', (done) => {
+    aden({ 
+      dev: true,
+      attitudes: ['!statuspages'],
+    })
+    .init(path.resolve(__dirname, '../tmpdata/emptypath'))
+    .then((an) => an.run('dev'))
+    .then((an) => {
+      request(an.app)
+        .get('/')
+        .end((err, res) => {
+          if (err) done(err);
+          expect(res.status).toBe(404);
+          expect(res.text).toMatch(/Could not find what you were looking for\./ig);
+          an.shutdown(done);
+        });
+    })
+    .catch(done);
+  });
+
+  she('core error route returns when headers already sent (500)', (done) => {
+    aden({ 
+      dev: true,
+      attitudes: ['!statuspages'],
+    })
+    .hook('post:setup', ({ app }) => {
+      app.use((err, req, res, next) => {
+        res.send('errrrr');
+        next(err);
+      });
+    })
+    .init(path.resolve(__dirname, '../tmpdata/custom/provoke'))
+    .then((an) => an.run('dev'))
+    .then((an) => {
+      request(an.app)
+        .get('/')
+        .end((err, res) => {
+          if (err) done(err);
+          expect(res.text).toMatch(/errrrr/ig);
+          an.shutdown(done);
+        });
+    })
+    .catch(done);
+  });
+
   she('// Things Aden already does but are untested...');
   she('allows params in { route: \'/:id\'} > .server');
   she('mounts absolute routes absolute');

diff --git a/test/integration/routing.prod.spec.js b/test/integration/routing.prod.spec.js
@@ -171,6 +171,51 @@ describe('Routing Prod', () => {
       .catch(done);
   });
 
+  she('has a core status page (404)', (done) => {
+    aden({ 
+      attitudes: ['!statuspages'],
+    })
+    .init(path.resolve(__dirname, '../tmpdata/emptypath'))
+    .then((an) => an.run('build'))
+    .then((an) => an.run('production'))
+    .then((an) => {
+      request(an.app)
+        .get('/')
+        .end((err, res) => {
+          if (err) done(err);
+          expect(res.status).toBe(404);
+          expect(res.text).toMatch(/Could not find what you were looking for\./ig);
+          an.shutdown(done);
+        });
+    })
+    .catch(done);
+  });
+
+  she('core error route returns when headers already sent (500)', (done) => {
+    aden({ 
+      attitudes: ['!statuspages'],
+    })
+    .hook('post:setup', ({ app }) => {
+      app.use((err, req, res, next) => {
+        res.send('errrrr');
+        next(err);
+      });
+    })
+    .init(path.resolve(__dirname, '../tmpdata/custom/provoke'))
+    .then((an) => an.run('build'))
+    .then((an) => an.run('production'))
+    .then((an) => {
+      request(an.app)
+        .get('/')
+        .end((err, res) => {
+          if (err) done(err);
+          expect(res.text).toMatch(/errrrr/ig);
+          an.shutdown(done);
+        });
+    })
+    .catch(done);
+  });
+
   she('// Things Aden already does but are untested...');
   she('allows params in { route: \'/:id\'} > .server');
   she('mounts absolute routes absolute');