test: Test error handling behavior in router (4Catalyzer#303)

whatever-company · Mar 28, 2019 · b6c059b · b6c059b
1 parent 7438746
commit b6c059b
Show file tree

Hide file tree

Showing 3 changed files with 118 additions and 54 deletions.
diff --git a/test/Router.test.js b/test/Router.test.js
@@ -0,0 +1,111 @@
+import delay from 'delay';
+import MemoryProtocol from 'farce/lib/MemoryProtocol';
+import ServerProtocol from 'farce/lib/ServerProtocol';
+import React from 'react';
+import ReactTestUtils from 'react-dom/test-utils';
+
+import createFarceRouter from '../src/createFarceRouter';
+import HttpError from '../src/HttpError';
+import RedirectException from '../src/RedirectException';
+
+import { InstrumentedResolver } from './helpers';
+
+describe('Router', () => {
+  it('should support throwing HttpError in route render method', async () => {
+    const Router = createFarceRouter({
+      historyProtocol: new ServerProtocol('/foo'),
+      routeConfig: [
+        {
+          path: '/foo',
+          render: () => {
+            throw new HttpError(404);
+          },
+        },
+      ],
+
+      renderError: ({ error }) => <div className={`error-${error.status}`} />,
+    });
+
+    const resolver = new InstrumentedResolver();
+    const instance = ReactTestUtils.renderIntoDocument(
+      <Router resolver={resolver} />,
+    );
+
+    await resolver.done;
+    await delay(10);
+
+    ReactTestUtils.findRenderedDOMComponentWithClass(instance, 'error-404');
+  });
+
+  it('should support throwing RedirectException in route render method', async () => {
+    const Router = createFarceRouter({
+      historyProtocol: new MemoryProtocol('/foo'),
+      routeConfig: [
+        {
+          path: '/foo',
+          render: () => {
+            throw new RedirectException('/bar');
+          },
+        },
+        {
+          path: '/bar',
+          render: () => <div className="bar" />,
+        },
+      ],
+    });
+
+    const resolver = new InstrumentedResolver();
+    const instance = ReactTestUtils.renderIntoDocument(
+      <Router resolver={resolver} />,
+    );
+
+    await resolver.done;
+    await delay(10);
+
+    ReactTestUtils.findRenderedDOMComponentWithClass(instance, 'bar');
+  });
+
+  it('should support reloading the route configuration', async () => {
+    const Router = createFarceRouter({
+      historyProtocol: new ServerProtocol('/foo'),
+      routeConfig: [
+        {
+          path: '/foo',
+          getData: async () => {
+            await delay(20);
+          },
+          render: () => <div className="foo" />,
+        },
+      ],
+    });
+
+    const resolver = new InstrumentedResolver();
+    const instance = ReactTestUtils.renderIntoDocument(
+      <Router resolver={resolver} />,
+    );
+
+    await resolver.done;
+
+    ReactTestUtils.findRenderedDOMComponentWithClass(instance, 'foo');
+    expect(
+      ReactTestUtils.scryRenderedDOMComponentsWithClass(instance, 'bar'),
+    ).toHaveLength(0);
+
+    instance.store.found.replaceRouteConfig([
+      {
+        path: '/foo',
+        getData: async () => {
+          await delay(10);
+        },
+        render: () => <div className="bar" />,
+      },
+    ]);
+
+    await resolver.done;
+
+    ReactTestUtils.findRenderedDOMComponentWithClass(instance, 'bar');
+    expect(
+      ReactTestUtils.scryRenderedDOMComponentsWithClass(instance, 'foo'),
+    ).toHaveLength(0);
+  });
+});
diff --git a/test/helpers.js b/test/helpers.js
@@ -18,8 +18,11 @@ export class InstrumentedResolver {
       resolveDone = resolve;
     });
 
-    yield* resolver.resolveElements(match);
-    resolveDone();
+    try {
+      yield* resolver.resolveElements(match);
+    } finally {
+      resolveDone();
+    }
   }
 }
 

diff --git a/test/render.test.js b/test/render.test.js
@@ -106,9 +106,7 @@ describe('render', () => {
         },
       ],
 
-      render: createRender({
-        renderPending: () => <div className="pending" />,
-      }),
+      renderPending: () => <div className="pending" />,
     });
 
     const resolver = new InstrumentedResolver();
@@ -137,53 +135,7 @@ describe('render', () => {
     expect(quxNode.textContent).toBe('a');
   });
 
-  it('should support reloading the route configuration', async () => {
-    const Router = createFarceRouter({
-      historyProtocol: new ServerProtocol('/foo'),
-      routeConfig: [
-        {
-          path: '/foo',
-          getData: async () => {
-            await delay(20);
-          },
-          render: () => <div className="foo" />,
-        },
-      ],
-
-      render: createRender({}),
-    });
-
-    const resolver = new InstrumentedResolver();
-    const instance = ReactTestUtils.renderIntoDocument(
-      <Router resolver={resolver} />,
-    );
-
-    await resolver.done;
-
-    ReactTestUtils.findRenderedDOMComponentWithClass(instance, 'foo');
-    expect(
-      ReactTestUtils.scryRenderedDOMComponentsWithClass(instance, 'bar'),
-    ).toHaveLength(0);
-
-    instance.store.found.replaceRouteConfig([
-      {
-        path: '/foo',
-        getData: async () => {
-          await delay(10);
-        },
-        render: () => <div className="bar" />,
-      },
-    ]);
-
-    await resolver.done;
-
-    ReactTestUtils.findRenderedDOMComponentWithClass(instance, 'bar');
-    expect(
-      ReactTestUtils.scryRenderedDOMComponentsWithClass(instance, 'foo'),
-    ).toHaveLength(0);
-  });
-
-  it('should support render returning a function', async () => {
+  it('should support route render method returning a function', async () => {
     const Router = createFarceRouter({
       historyProtocol: new ServerProtocol('/foo'),
       routeConfig: [
@@ -219,8 +171,6 @@ describe('render', () => {
           ],
         },
       ],
-
-      render: createRender({}),
     });
 
     const resolver = new InstrumentedResolver();