fix(async-mapper): add tests for asyncMapper in DrupalPage

headless-ninja · Mar 18, 2018 · 7a214a0 · 7a214a0
1 parent 45e1fda
commit 7a214a0
Show file tree

Hide file tree

Showing 4 changed files with 123 additions and 57 deletions.
diff --git a/src/components/DrupalPage.js b/src/components/DrupalPage.js
@@ -162,10 +162,13 @@ class DrupalPage extends Component {
 }
 
 DrupalPage.propTypes = {
-  asyncMapper: PropTypes.bool,
+  asyncMapper: PropTypes.oneOfType([
+    PropTypes.bool,
+    PropTypes.oneOfType([PropTypes.shape(), PropTypes.func]),
+  ]),
   layout: PropTypes.oneOfType([PropTypes.func, PropTypes.string]),
   layoutProps: PropTypes.shape(),
-  mapper: PropTypes.oneOfType([PropTypes.shape(), PropTypes.func]).isRequired,
+  mapper: PropTypes.oneOfType([PropTypes.shape(), PropTypes.func]),
   pageProps: PropTypes.shape(),
   renderWhileLoadingData: PropTypes.bool,
   url: PropTypes.string.isRequired,

diff --git a/src/components/DrupalPage.test.js b/src/components/DrupalPage.test.js
@@ -3,7 +3,7 @@ import React from 'react';
 import renderer from 'react-test-renderer';
 import site from '../utils/site';
 import waitForHnData from '../utils/waitForHnData';
-import { mapper } from '../utils/tests';
+import { asyncMapper, mapper } from '../utils/tests';
 
 jest.mock('../utils/site', () => {
   return require('../utils/tests').mockSite();
@@ -47,4 +47,41 @@ describe('DrupalPage', async () => {
       renderer.create(await waitForHnData(component)).toJSON(),
     ).toMatchSnapshot();
   });
+
+  test('with asyncMapper', async () => {
+    const component = (
+      <DrupalPage
+        asyncMapper={asyncMapper}
+        url={'/'}
+        layoutProps={{ testLayoutProp: true }}
+        renderWhileLoadingData={true}
+        pageProps={{ testPageProp: true }}
+      />
+    );
+
+    expect(renderer.create(component).toJSON()).toMatchSnapshot();
+
+    expect(
+      renderer.create(await waitForHnData(component)).toJSON(),
+    ).toMatchSnapshot();
+  });
+
+  test('with asyncMapper as boolean (deprecated)', async () => {
+    const component = (
+      <DrupalPage
+        asyncMapper
+        mapper={asyncMapper}
+        url={'/'}
+        layoutProps={{ testLayoutProp: true }}
+        renderWhileLoadingData={true}
+        pageProps={{ testPageProp: true }}
+      />
+    );
+
+    expect(renderer.create(component).toJSON()).toMatchSnapshot();
+
+    expect(
+      renderer.create(await waitForHnData(component)).toJSON(),
+    ).toMatchSnapshot();
+  });
 });
diff --git a/src/components/__snapshots__/DrupalPage.test.js.snap b/src/components/__snapshots__/DrupalPage.test.js.snap
@@ -63,6 +63,86 @@ exports[`DrupalPage with all props 2`] = `
 </div>
 `;
 
+exports[`DrupalPage with asyncMapper 1`] = `null`;
+
+exports[`DrupalPage with asyncMapper 2`] = `
+<div
+  bundle="unique_type_1__unique_bundle_1"
+  className="MyCustomMapperComponent"
+  entity={
+    Object {
+      "__hn": Object {
+        "entity": Object {
+          "bundle": "unique_bundle_1",
+          "type": "unique_type_1",
+        },
+      },
+    }
+  }
+  page={
+    Object {
+      "__hn": Object {
+        "entity": Object {
+          "bundle": "unique_bundle_1",
+          "type": "unique_type_1",
+        },
+      },
+    }
+  }
+  paragraph={
+    Object {
+      "__hn": Object {
+        "entity": Object {
+          "bundle": "unique_bundle_1",
+          "type": "unique_type_1",
+        },
+      },
+    }
+  }
+  testPageProp={true}
+/>
+`;
+
+exports[`DrupalPage with asyncMapper as boolean (deprecated) 1`] = `null`;
+
+exports[`DrupalPage with asyncMapper as boolean (deprecated) 2`] = `
+<div
+  bundle="unique_type_1__unique_bundle_1"
+  className="MyCustomMapperComponent"
+  entity={
+    Object {
+      "__hn": Object {
+        "entity": Object {
+          "bundle": "unique_bundle_1",
+          "type": "unique_type_1",
+        },
+      },
+    }
+  }
+  page={
+    Object {
+      "__hn": Object {
+        "entity": Object {
+          "bundle": "unique_bundle_1",
+          "type": "unique_type_1",
+        },
+      },
+    }
+  }
+  paragraph={
+    Object {
+      "__hn": Object {
+        "entity": Object {
+          "bundle": "unique_bundle_1",
+          "type": "unique_type_1",
+        },
+      },
+    }
+  }
+  testPageProp={true}
+/>
+`;
+
 exports[`DrupalPage with required props 1`] = `null`;
 
 exports[`DrupalPage with required props 2`] = `

diff --git a/src/components/__snapshots__/EntityMapper.test.js.snap b/src/components/__snapshots__/EntityMapper.test.js.snap
@@ -54,60 +54,6 @@ exports[`EntityMapper asyncMapper as boolean (deprecated) 2`] = `
 />
 `;
 
-exports[`EntityMapper asyncMapper as boolean 1`] = `
-<div
-  bundle="unique_type_1__unique_bundle_1"
-  className="MyCustomMapperComponent"
-  entity={
-    Object {
-      "__hn": Object {
-        "entity": Object {
-          "bundle": "unique_bundle_1",
-          "type": "unique_type_1",
-        },
-      },
-    }
-  }
-  paragraph={
-    Object {
-      "__hn": Object {
-        "entity": Object {
-          "bundle": "unique_bundle_1",
-          "type": "unique_type_1",
-        },
-      },
-    }
-  }
-/>
-`;
-
-exports[`EntityMapper asyncMapper as boolean 2`] = `
-<div
-  bundle="unique_type_1__unique_bundle_1"
-  className="MyCustomMapperComponent"
-  entity={
-    Object {
-      "__hn": Object {
-        "entity": Object {
-          "bundle": "unique_bundle_1",
-          "type": "unique_type_1",
-        },
-      },
-    }
-  }
-  paragraph={
-    Object {
-      "__hn": Object {
-        "entity": Object {
-          "bundle": "unique_bundle_1",
-          "type": "unique_type_1",
-        },
-      },
-    }
-  }
-/>
-`;
-
 exports[`EntityMapper non-existing entity 1`] = `null`;
 
 exports[`EntityMapper non-existing entity 2`] = `null`;