fix(moduleRoute): return promises (#68)

americanexpress · Jan 20, 2021 · cbaa54d · cbaa54d
1 parent 7b7d2d8
commit cbaa54d
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 4 deletions.
diff --git a/packages/holocron-module-route/__tests__/ModuleRouteUtils.spec.jsx b/packages/holocron-module-route/__tests__/ModuleRouteUtils.spec.jsx
@@ -149,6 +149,20 @@ describe('ModuleRouteUtils', () => {
         });
         return moduleRoute.getIndexRoute(undefined, callback);
       });
+
+      it('errors can be caught', async () => {
+        expect.assertions(1);
+        const moduleName = 'test-module';
+        const props = { moduleName, store };
+        const moduleRoute = createModuleRoute(defaultProps, props);
+        // eslint-disable-next-line no-throw-literal
+        const callback = jest.fn(() => { throw 'some error'; });
+        try {
+          await moduleRoute.getIndexRoute(undefined, callback);
+        } catch (e) {
+          expect(e).toEqual('some error');
+        }
+      });
     });
 
     describe('getChildRoutes', () => {
@@ -163,6 +177,20 @@ describe('ModuleRouteUtils', () => {
         });
         return moduleRoute.getChildRoutes(undefined, callback);
       });
+
+      it('errors can be caught', async () => {
+        expect.assertions(1);
+        const moduleName = 'test-module';
+        const props = { moduleName, store };
+        const moduleRoute = createModuleRoute(defaultProps, props);
+        // eslint-disable-next-line no-throw-literal
+        const callback = jest.fn(() => { throw 'some error'; });
+        try {
+          await moduleRoute.getChildRoutes(undefined, callback);
+        } catch (e) {
+          expect(e).toEqual('some error');
+        }
+      });
     });
 
     describe('getComponent', () => {
@@ -177,6 +205,20 @@ describe('ModuleRouteUtils', () => {
         });
         return moduleRoute.getComponent(undefined, callback);
       });
+
+      it('errors can be caught', async () => {
+        expect.assertions(1);
+        const moduleName = 'test-module';
+        const props = { moduleName, store };
+        const moduleRoute = createModuleRoute(defaultProps, props);
+        // eslint-disable-next-line no-throw-literal
+        const callback = jest.fn(() => { throw 'some error'; });
+        try {
+          await moduleRoute.getComponent(undefined, callback);
+        } catch (e) {
+          expect(e).toEqual('some error');
+        }
+      });
     });
 
     describe('onEnter', () => {
@@ -195,6 +237,21 @@ describe('ModuleRouteUtils', () => {
         moduleRoute.onEnter('nextState', replace, cb);
       });
 
+      it('errors can be caught', async () => {
+        expect.assertions(1);
+        const moduleName = 'store-hook-module';
+        const props = { moduleName, store };
+        const moduleRoute = createModuleRoute(defaultProps, props);
+        // eslint-disable-next-line no-throw-literal
+        const cb = jest.fn(() => { throw 'onEnter error'; });
+        const replace = jest.fn();
+        try {
+          await moduleRoute.onEnter('nextState', replace, cb);
+        } catch (e) {
+          expect(e).toEqual('onEnter error');
+        }
+      });
+
       it('should allow the Module to specify a synchronous onEnter hook', (done) => {
         const moduleName = 'sync-hook-module';
         const props = { moduleName, store };

diff --git a/packages/holocron-module-route/src/ModuleRouteUtils.jsx b/packages/holocron-module-route/src/ModuleRouteUtils.jsx
@@ -48,21 +48,21 @@ export const createModuleRoute = (defaultProps, props) => {
   if (moduleName) {
     moduleRoute = Object.assign(moduleRoute, {
       getIndexRoute(partialNextState, cb) {
-        store.dispatch(loadModule(moduleName))
+        return store.dispatch(loadModule(moduleName))
           .then(
             ({ childRoutes }) => cb(null, getRouteIndex(childRoutes, { store })),
             cb
           );
       },
       getChildRoutes(location, cb) {
-        store.dispatch(loadModule(moduleName))
+        return store.dispatch(loadModule(moduleName))
           .then(
             ({ childRoutes }) => cb(null, passChildrenProps(childRoutes, { store })),
             cb
           );
       },
       getComponent(nextState, cb) {
-        store.dispatch(loadModule(moduleName))
+        return store.dispatch(loadModule(moduleName))
           .then(
             (module) => cb(null, module),
             cb
@@ -73,7 +73,7 @@ export const createModuleRoute = (defaultProps, props) => {
   if (moduleName && !moduleRoute.onEnter) {
     moduleRoute = Object.assign(moduleRoute, {
       onEnter(nextState, replace, cb) {
-        store.dispatch(loadModule(moduleName))
+        return store.dispatch(loadModule(moduleName))
           .then(
             ({ onEnterRouteHook }) => {
               if (!onEnterRouteHook) {