Dynamic Routing Beta: Render default.hbs as fallback for static routes

refs refs #9601 - instead of index.hbs (that doesn't make sense)
TryGhost · Jun 24, 2018 · 07c72d7 · 07c72d7
1 parent c2fa469
commit 07c72d7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/core/server/services/routing/StaticRoutesRouter.js b/core/server/services/routing/StaticRoutesRouter.js
@@ -81,7 +81,8 @@ class StaticRoutesRouter extends ParentRouter {
 
         res._route = {
             type: 'custom',
-            templates: this.templates
+            templates: this.templates,
+            defaultTemplate: 'default'
         };
 
         next();

diff --git a/core/test/integration/web/site_spec.js b/core/test/integration/web/site_spec.js
@@ -475,7 +475,7 @@ describe('Integration - Web - Site', function () {
                 sandbox.restore();
             });
 
-            it('serve home', function () {
+            it('serve static route', function () {
                 const req = {
                     secure: true,
                     method: 'GET',
@@ -486,9 +486,7 @@ describe('Integration - Web - Site', function () {
                 return testUtils.mocks.express.invoke(app, req)
                     .then(function (response) {
                         response.statusCode.should.eql(200);
-
-                        // falls back to index, because Casper has no home.hbs
-                        response.template.should.eql('index');
+                        response.template.should.eql('default');
                     });
             });
 
@@ -604,7 +602,7 @@ describe('Integration - Web - Site', function () {
                 return testUtils.mocks.express.invoke(app, req)
                     .then(function (response) {
                         response.statusCode.should.eql(200);
-                        response.template.should.eql('index');
+                        response.template.should.eql('default');
                     });
             });
         });

diff --git a/core/test/unit/services/routing/StaticRoutesRouter_spec.js b/core/test/unit/services/routing/StaticRoutesRouter_spec.js
@@ -83,7 +83,8 @@ describe('UNIT - services/routing/StaticRoutesRouter', function () {
             next.called.should.be.true();
             res._route.should.eql({
                 type: 'custom',
-                templates: []
+                templates: [],
+                defaultTemplate: 'default'
             });
 
             res.locals.routerOptions.should.eql({context: [], data: {}});