CQ-4282110-Page with no extension is not rendered (#58)

* CQ-4282110-Page with no extension is not rendered * CQ-4282110-Page with no extension is not rendered
adobe · Nov 1, 2019 · 337fb3d · 337fb3d
1 parent cec9597
commit 337fb3d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/react-app/src/RouteHelper.js b/react-app/src/RouteHelper.js
@@ -38,10 +38,10 @@ export const withRoute = (WrappedComponent, extension) => {
 
             extension = extension || 'html';
 
-            // Context path + route path + extension
-            return <Route key={ routePath } path={ '(.*)' + routePath + '.' + extension } render={ (routeProps) => {
+            // Context path + route path + optional extension
+            return <Route key={ routePath } exact path={ '(.*)' + routePath + '(.' + extension + ')?'} render={ (routeProps) => {
                 return <WrappedComponent {...this.props} {...routeProps}/>;
             } } />
         }
     }
-};
+};
diff --git a/react-app/tests/RouteHelper.test.js b/react-app/tests/RouteHelper.test.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
-import { BrowserRouter } from 'react-router-dom';
+import { BrowserRouter, MemoryRouter } from 'react-router-dom';
 import { getVerifyObserver } from './Utils';
 import { RouteListener, withRoute } from '../src/RouteHelper';
 import { ModelManager } from '@adobe/cq-spa-page-model-manager';
@@ -71,5 +71,29 @@ describe('RouterHelper ->', () => {
             let WrappedComponent = withRoute(RouteContent);
             ReactDOM.render(<BrowserRouter><WrappedComponent cqModel={cqModel}/></BrowserRouter>, rootNode);
         });
+
+        it('should render page with extension', () => {
+            let WrappedComponent = withRoute(RouteContent, 'extension');
+            ReactDOM.render(
+                <MemoryRouter initialEntries={[CUSTOM_ROUTE_PATH + '.extension']}>
+                    <WrappedComponent cqPath={CUSTOM_ROUTE_PATH} />
+                </MemoryRouter>,
+                rootNode
+            );
+
+            expect(rootNode.querySelector('.' + ROUTE_CONTENT_CLASS_NAME)).to.not.be.null;
+        });
+
+        it('should render page if extension is not provided', () => {
+            let WrappedComponent = withRoute(RouteContent);
+            ReactDOM.render(
+                <MemoryRouter initialEntries={[CUSTOM_ROUTE_PATH]}>
+                    <WrappedComponent cqPath={CUSTOM_ROUTE_PATH}/>
+                </MemoryRouter>,
+                rootNode
+            );
+
+            expect(rootNode.querySelector('.' + ROUTE_CONTENT_CLASS_NAME)).to.not.be.null;
+        });
     });
 });