Update tests to use Draft.js 0.10 API

wagtaildraftail/client/decorators/Document.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import { Entity } from 'draft-js';
+import { convertFromHTML, ContentState } from 'draft-js';
 import Document from './Document';
 
 describe('Document', () => {
@@ -9,9 +9,15 @@ describe('Document', () => {
   });
 
   it('renders', () => {
-    const entityKey = Entity.create('DOCUMENT', 'MUTABLE', { title: 'Test title' });
+    const contentBlocks = convertFromHTML('<h1>aaaaaaaaaa</h1>');
+    const contentState = ContentState.createFromBlockArray(contentBlocks);
+    const contentStateWithEntity = contentState.createEntity('DOCUMENT', 'MUTABLE', { title: 'Test title' });
+    const entityKey = contentStateWithEntity.getLastCreatedEntityKey();
     expect(shallow((
-      <Document entityKey={entityKey}>
+      <Document
+        entityKey={entityKey}
+        contentState={contentStateWithEntity}
+      >
         <span>Test children</span>
       </Document>
     ))).toMatchSnapshot();

wagtaildraftail/client/decorators/Link.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import { Entity } from 'draft-js';
+import { convertFromHTML, ContentState } from 'draft-js';
 import Link from './Link';
 
 describe('Link', () => {
@@ -9,18 +9,30 @@ describe('Link', () => {
   });
 
   it('renders', () => {
-    const entityKey = Entity.create('LINK', 'MUTABLE', { url: 'http://example.com/' });
+    const contentBlocks = convertFromHTML('<h1>aaaaaaaaaa</h1>');
+    const contentState = ContentState.createFromBlockArray(contentBlocks);
+    const contentStateWithEntity = contentState.createEntity('LINK', 'MUTABLE', { url: 'http://example.com/' });
+    const entityKey = contentStateWithEntity.getLastCreatedEntityKey();
     expect(shallow((
-      <Link entityKey={entityKey}>
+      <Link
+        entityKey={entityKey}
+        contentState={contentStateWithEntity}
+      >
         <span>Test children</span>
       </Link>
     ))).toMatchSnapshot();
   });
 
   it('renders email', () => {
-    const entityKey = Entity.create('LINK', 'MUTABLE', { url: 'mailto:[email protected]' });
+    const contentBlocks = convertFromHTML('<h1>aaaaaaaaaa</h1>');
+    const contentState = ContentState.createFromBlockArray(contentBlocks);
+    const contentStateWithEntity = contentState.createEntity('LINK', 'MUTABLE', { url: 'mailto:[email protected]' });
+    const entityKey = contentStateWithEntity.getLastCreatedEntityKey();
     expect(shallow((
-      <Link entityKey={entityKey}>
+      <Link
+        entityKey={entityKey}
+        contentState={contentStateWithEntity}
+      >
         <span>Test children</span>
       </Link>
     ))).toMatchSnapshot();

wagtaildraftail/client/sources/ModalSource.js

@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import { EditorState, AtomicBlockUtils, RichUtils } from 'draft-js';
+import { AtomicBlockUtils, RichUtils } from 'draft-js';
 
 const $ = global.jQuery;
 
@@ -49,8 +49,9 @@ class ModalSource extends React.Component {
 }
 
 ModalSource.propTypes = {
-  editorState: PropTypes.instanceOf(EditorState).isRequired,
+  editorState: PropTypes.object.isRequired,
   options: PropTypes.object.isRequired,
+  // eslint-disable-next-line
   entity: PropTypes.object,
   onUpdate: PropTypes.func.isRequired,
   onClose: PropTypes.func.isRequired,

wagtaildraftail/client/wagtaildraftail.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Entity } from 'draft-js';
 import DraftailEditor from 'draftail';
 
 import 'draftail/dist/draftail.css';