fix: allow a 404 route to skip validation

jimlambie · jimlambie · commit 9ba36b608bf9 · 2016-12-02T15:15:19.000+11:00
diff --git a/dadi/lib/controller/router.js b/dadi/lib/controller/router.js
@@ -172,6 +172,11 @@ Router.prototype.validate = function (route, req, res) {
     var regex = pathToRegexp(route.path)
     var match = regex.exec(pathname)
 
+    // allow a 404 to sail through this
+    if (route.path === '/404') {
+      return resolve()
+    }
+
     // move to the next route if no match
     if (!match) {
       return reject('')
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "@dadi/api-wrapper": "^1.1.0",
     "@dadi/cache": "latest",
     "@dadi/logger": "latest",
-    "@dadi/passport": "^1.0.x",
+    "@dadi/passport": "latest",
     "@dadi/status": "git+https://git@github.com/dadi/status.git",
     "async": "^1.4.2",
     "aws-kinesis-writable": "^1.3.1",
diff --git a/test/app/pages/404.dust b/test/app/pages/404.dust
@@ -0,0 +1,3 @@
+
+Page Not Found Template
+
diff --git a/test/help.js b/test/help.js
@@ -132,6 +132,21 @@ TestHelper.prototype.setUpPages = function () {
   return pages
 }
 
+TestHelper.prototype.setUp404Page = function () {
+  var page = Page('404', this.getPageSchema())
+  page.name = '404'
+  page.template = '404.dust'
+  page.routes[0].path = '/404'
+  page.datasources = []
+  page.events = []
+  page.settings.cache = false
+
+  var pages = []
+  pages.push(page)
+
+  return pages
+}
+
 TestHelper.prototype.newPage = function (name, path, template, datasources, events) {
   var page = Page(name, this.getPageSchema())
   page.datasources = datasources
diff --git a/test/unit/controller.js b/test/unit/controller.js
@@ -28,6 +28,26 @@ describe('Controller', function (done) {
     TestHelper.stopServer(done)
   })
 
+  it("should return a 404 template if one is configured", function (done) {
+    TestHelper.disableApiConfig().then(() => {
+      var pages = TestHelper.setUp404Page()
+      pages[0].settings.cache = false
+
+      TestHelper.startServer(pages).then(() => {
+        var client = request(connectionString)
+
+        client
+          .get('/not-a-page')
+          .expect(404)
+          .end(function (err, res) {
+            if (err) return done(err)
+            res.text.should.eql('Page Not Found Template')
+            done()
+          })
+      })
+    })
+  })
+
   it("should return a 404 if a page's requiredDatasources are not populated", function (done) {
     TestHelper.disableApiConfig().then(() => {
       var pages = TestHelper.setUpPages()
@@ -127,14 +147,16 @@ describe('Controller', function (done) {
   describe('Preload Events', function (done) {
     it('should load preloadEvents in the controller instance', function (done) {
       TestHelper.disableApiConfig().then(() => {
-        var pages = TestHelper.setUpPages()
-        pages[0].events = ['test_event']
-        pages[0].preloadEvents = ['test_preload_event']
+        TestHelper.updateConfig({'globalEvents': []}).then(() => {
+          var pages = TestHelper.setUpPages()
+          pages[0].events = ['test_event']
+          pages[0].preloadEvents = ['test_preload_event']
 
-        controller = Controller(pages[0], TestHelper.getPathOptions())
-        controller.preloadEvents.should.exist
-        controller.preloadEvents[0].name.should.eql(pages[0].preloadEvents[0])
-        done()
+          controller = Controller(pages[0], TestHelper.getPathOptions())
+          should.exist(controller.preloadEvents)
+          controller.preloadEvents[0].name.should.eql(pages[0].preloadEvents[0])
+          done()
+        })
       })
     })
 
