Merge branch '0.7.5' into develop

Author: birdofpreyru

__tests__/shared/components/Modal.jsx

@@ -0,0 +1,49 @@
+import Modal, { BaseModal } from 'components/Modal';
+import React from 'react';
+import ReactDom from 'react-dom';
+import {
+  findInDomByClass,
+  renderDom,
+  simulate,
+  snapshot,
+} from 'utils/jest';
+
+beforeAll(() => {
+  /* Modal uses ReactJS portals to ensure proper rendering. react-test-renderer,
+   * used by utils/jest under the hood, does not support it properly, thus this
+   * simple mock for the createPortal(..) function. */
+  ReactDom.createPortal = jest.fn(element => (
+    <div className="MOCK_PORTAL">
+      {element}
+    </div>
+  ));
+});
+
+test('Snapshot match', () => {
+  snapshot(<Modal>CONTENT</Modal>);
+});
+
+test('onCancel', () => {
+  const onCancel = jest.fn();
+  const dom = renderDom((
+    <BaseModal
+      onCancel={onCancel}
+      theme={{ overlay: 'overlay' }}
+    />
+  ));
+  const overlay = findInDomByClass(dom, 'overlay');
+  simulate.click(overlay);
+  expect(onCancel).toHaveBeenCalled();
+});
+
+test('onWheel', () => {
+  const dom = renderDom((
+    <BaseModal
+      theme={{ container: 'container' }}
+    />
+  ));
+  const container = findInDomByClass(dom, 'container');
+  const stopPropagation = jest.fn();
+  simulate.wheel(container, { stopPropagation });
+  expect(stopPropagation).toHaveBeenCalled();
+});

__tests__/shared/components/__snapshots__/Modal.jsx.snap

@@ -0,0 +1,19 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Snapshot match 1`] = `
+<div
+  className="MOCK_PORTAL"
+>
+  <div
+    className="style__container___1SoeQ"
+    onWheel={[Function]}
+  >
+    CONTENT
+  </div>
+  <button
+    className="style__overlay___X12tn"
+    onClick={[Function]}
+    type="button"
+  />
+</div>
+`;

package-lock.json

@@ -121,5 +121,5 @@
     "mkDistDir:prod": "mkdir -p dist/prod/shared/utils && mkdir -p dist/prod/client",
     "test": "npm run lint && npm run jest"
   },
-  "version": "0.7.7"
+  "version": "0.7.8"
 }

package.json

@@ -19,7 +19,7 @@ import defaultStyle from './style.scss';
 
 /* NOTE: Modal component is implemented as class, as it demands advanced
  * interaction with DOM upon mount and unmount. */
-class Modal extends React.Component {
+class BaseModal extends React.Component {
   constructor(props) {
     super(props);
     this.portal = document.createElement('div');
@@ -62,19 +62,19 @@ class Modal extends React.Component {
   }
 }
 
-Modal.defaultProps = {
+BaseModal.defaultProps = {
   onCancel: _.noop,
   children: null,
   theme: {},
 };
 
-Modal.propTypes = {
+BaseModal.propTypes = {
   onCancel: PT.func,
   children: PT.node,
   theme: PT.shape(),
 };
 
 /* Non-themed version of the Modal. */
-export const BaseModal = Modal;
+export { BaseModal };
 
-export default themr('Modal', defaultStyle)(Modal);
+export default themr('Modal', defaultStyle)(BaseModal);