Merge branch 'master' into maintain-sub-styles

Author: mxstbr

package.json

@@ -42,13 +42,10 @@
     "babel-preset-react": "^6.16.0",
     "babel-preset-react-hmre": "^1.1.1",
     "babel-preset-stage-0": "^6.16.0",
-    "chai": "^3.5.0",
-    "chai-enzyme": "^0.6.1",
     "cheerio": "^0.22.0",
     "coveralls": "^2.11.15",
     "css-loader": "^0.26.0",
     "css-modules-require-hook": "^4.0.5",
-    "dirty-chai": "^1.2.2",
     "draft-js-plugins-editor": "2.0.0-rc2",
     "draft-js-prism":
       "ngs/draft-js-prism#6edb31c3805dd1de3fb897cc27fced6bac1bafbb",
@@ -83,13 +80,14 @@
     "react-github-fork-ribbon": "^0.4.4",
     "rimraf": "^2.5.4",
     "sinon": "^1.17.6",
-    "sinon-chai": "^2.8.0",
     "static-site-generator-webpack-plugin": "^3.1.0",
     "style-loader": "^0.13.1",
     "url-loader": "^0.5.7",
     "webpack": "^1.13.3",
     "webpack-dev-middleware": "^1.8.4",
-    "webpack-hot-middleware": "^2.13.2"
+    "webpack-hot-middleware": "^2.13.2",
+    "jest": "^21.1.0",
+    "react-test-renderer": "^16.2.0"
   },
   "peerDependencies": {
     "draft-js-plugins-editor":
@@ -103,7 +101,6 @@
     "draft-js": "~0.10.1",
     "draft-js-checkable-list-item": "^2.0.5",
     "draft-js-prism-plugin": "^0.1.1",
-    "immutable": "~3.7.4",
-    "jest": "^21.1.0"
+    "immutable": "~3.7.4"
   }
 }

src/components/Image/__test__/Image-test.js

@@ -1,13 +1,9 @@
 import React from "react";
 import { ContentState } from "draft-js";
 import { shallow } from "enzyme";
-import chai, { expect } from "chai";
-import chaiEnzyme from "chai-enzyme";
 
 import Image from "../";
 
-chai.use(chaiEnzyme());
-
 describe("<Image />", () => {
   it("renders anchor tag", () => {
     const contentState = ContentState.createFromText(
@@ -24,7 +20,7 @@ describe("<Image />", () => {
           &nbsp;
         </Image>
       ).html()
-    ).to.equal(
+    ).toEqual(
       '<span> <img src="http://cultofthepartyparrot.com/parrots/aussieparrot.gif" alt="alt" title="parrot"/></span>'
     );
   });

src/components/Link/__test__/Link-test.js

@@ -1,12 +1,10 @@
 import React from "react";
 import { ContentState } from "draft-js";
-import { shallow } from "enzyme";
-import chai, { expect } from "chai";
-import chaiEnzyme from "chai-enzyme";
+import ShallowRenderer from "react-test-renderer/shallow";
 
-import Link from "../";
+const renderer = new ShallowRenderer();
 
-chai.use(chaiEnzyme());
+import Link from "../";
 
 describe("<Link />", () => {
   it("renders anchor tag", () => {
@@ -17,14 +15,15 @@ describe("<Link />", () => {
       title: "parrot",
     });
     const entityKey = contentState.getLastCreatedEntityKey();
-    expect(
-      shallow(
-        <Link entityKey={entityKey} contentState={contentState}>
-          <b>Hello</b>
-        </Link>
-      ).html()
-    ).to.equal(
-      '<a href="http://cultofthepartyparrot.com/" title="parrot"><b>Hello</b></a>'
+    renderer.render(
+      <Link entityKey={entityKey} contentState={contentState}>
+        <b>Hello</b>
+      </Link>
+    );
+    expect(renderer.getRenderOutput()).toEqual(
+      <a href="http://cultofthepartyparrot.com/" title="parrot">
+        <b>Hello</b>
+      </a>
     );
   });
 });

src/decorators/image/__test__/imageStrategy-test.js

@@ -1,11 +1,6 @@
-import chai, { expect } from "chai";
-import sinon from "sinon";
-import sinonChai from "sinon-chai";
 import Draft from "draft-js";
 import createImageStrategy from "../imageStrategy";
 
-chai.use(sinonChai);
-
 describe("imageStrategy", () => {
   const contentState = Draft.convertFromRaw({
     entityMap: {
@@ -40,9 +35,9 @@ describe("imageStrategy", () => {
   it("callbacks range", () => {
     const block = contentState.getBlockForKey("dtehj");
     const strategy = createImageStrategy();
-    const cb = sinon.spy();
-    expect(block).to.be.an("object");
+    const cb = jest.fn();
+    expect(typeof block).toBe("object");
     strategy(block, cb, contentState);
-    expect(cb).to.have.been.calledWith(0, 1);
+    expect(cb).toHaveBeenCalledWith(0, 1);
   });
 });

src/decorators/link/__test__/linkStrategy-test.js

@@ -1,11 +1,6 @@
-import chai, { expect } from "chai";
-import sinon from "sinon";
-import sinonChai from "sinon-chai";
 import Draft from "draft-js";
 import createLinkStrategy from "../linkStrategy";
 
-chai.use(sinonChai);
-
 describe("linkStrategy", () => {
   const contentState = Draft.convertFromRaw({
     entityMap: {
@@ -39,9 +34,9 @@ describe("linkStrategy", () => {
   it("callbacks range", () => {
     const block = contentState.getBlockForKey("dtehj");
     const strategy = createLinkStrategy();
-    const cb = sinon.spy();
-    expect(block).to.be.an("object");
+    const cb = jest.fn();
+    expect(typeof block).toBe("object");
     strategy(block, cb, contentState);
-    expect(cb).to.have.been.calledWith(7, 12);
+    expect(cb).toHaveBeenCalledWith(7, 12);
   });
 });

src/modifiers/__test__/adjustBlockDepth-test.js

@@ -1,11 +1,7 @@
-import chai, { expect } from "chai";
 import sinon from "sinon";
-import sinonChai from "sinon-chai";
 import Draft, { EditorState, SelectionState } from "draft-js";
 import adjustBlockDepth from "../adjustBlockDepth";
 
-chai.use(sinonChai);
-
 describe("adjustBlockDepth", () => {
   const createEvent = () => {
     const e = new window.KeyboardEvent("keydown", { shiftKey: false });
@@ -44,10 +40,10 @@ describe("adjustBlockDepth", () => {
       const event = createEvent();
       const editorState = createEditorState("unstyled", 0, 0);
       const newEditorState = adjustBlockDepth(editorState, event);
-      expect(newEditorState).to.equal(editorState);
-      expect(
-        Draft.convertToRaw(newEditorState.getCurrentContent())
-      ).to.deep.equal(rawContentState("unstyled", 0, 0));
+      expect(newEditorState).toEqual(editorState);
+      expect(Draft.convertToRaw(newEditorState.getCurrentContent())).toEqual(
+        rawContentState("unstyled", 0, 0)
+      );
     });
   });
   [
@@ -60,10 +56,10 @@ describe("adjustBlockDepth", () => {
         const event = createEvent();
         const editorState = createEditorState(type, 0, 0);
         const newEditorState = adjustBlockDepth(editorState, event);
-        expect(newEditorState).not.to.equal(editorState);
-        expect(
-          Draft.convertToRaw(newEditorState.getCurrentContent())
-        ).to.deep.equal(rawContentState(type, 0, 1));
+        expect(newEditorState).not.toEqual(editorState);
+        expect(Draft.convertToRaw(newEditorState.getCurrentContent())).toEqual(
+          rawContentState(type, 0, 1)
+        );
       });
     });
   });

src/modifiers/__test__/changeCurrentBlockType-test.js

@@ -1,4 +1,3 @@
-import { expect } from "chai";
 import Draft, { EditorState, SelectionState } from "draft-js";
 import changeCurrentBlockType from "../changeCurrentBlockType";
 
@@ -40,10 +39,8 @@ describe("changeCurrentBlockType", () => {
       "Hello world",
       { foo: "bar" }
     );
-    expect(newEditorState).not.to.equal(editorState);
-    expect(
-      Draft.convertToRaw(newEditorState.getCurrentContent())
-    ).to.deep.equal(
+    expect(newEditorState).not.toEqual(editorState);
+    expect(Draft.convertToRaw(newEditorState.getCurrentContent())).toEqual(
       rawContentState("Hello world", "header-one", { foo: "bar" })
     );
   });
@@ -55,9 +52,9 @@ describe("changeCurrentBlockType", () => {
       "Hello world",
       null
     );
-    expect(newEditorState).not.to.equal(editorState);
-    expect(
-      Draft.convertToRaw(newEditorState.getCurrentContent())
-    ).to.deep.equal(rawContentState("Hello world", "header-one", {}));
+    expect(newEditorState).not.toEqual(editorState);
+    expect(Draft.convertToRaw(newEditorState.getCurrentContent())).toEqual(
+      rawContentState("Hello world", "header-one", {})
+    );
   });
 });

src/modifiers/__test__/handleBlockType-test.js

@@ -1,4 +1,3 @@
-import { expect } from "chai";
 import Draft, { EditorState, SelectionState } from "draft-js";
 import handleBlockType from "../handleBlockType";
 
@@ -33,10 +32,10 @@ describe("handleBlockType", () => {
     );
     it("does not convert block type", () => {
       const newEditorState = handleBlockType(editorState, " ");
-      expect(newEditorState).to.equal(editorState);
-      expect(
-        Draft.convertToRaw(newEditorState.getCurrentContent())
-      ).to.deep.equal(rawContentState);
+      expect(newEditorState).toEqual(editorState);
+      expect(Draft.convertToRaw(newEditorState.getCurrentContent())).toEqual(
+        rawContentState
+      );
     });
   });
 
@@ -513,10 +512,10 @@ describe("handleBlockType", () => {
       );
       it("converts block type", () => {
         const newEditorState = handleBlockType(editorState, character);
-        expect(newEditorState).not.to.equal(editorState);
-        expect(
-          Draft.convertToRaw(newEditorState.getCurrentContent())
-        ).to.deep.equal(after);
+        expect(newEditorState).not.toEqual(editorState);
+        expect(Draft.convertToRaw(newEditorState.getCurrentContent())).toEqual(
+          after
+        );
       });
     });
   });

src/modifiers/__test__/handleInlineStyle-test.js

@@ -532,8 +532,6 @@ describe("handleInlineStyle", () => {
       it("converts block type", () => {
         const newEditorState = handleInlineStyle(editorState, character);
         expect(newEditorState).not.toEqual(editorState);
-        // console.log('actual', JSON.stringify(Draft.convertToRaw(newEditorState.getCurrentContent()), null, 2))
-        // console.log('expected', JSON.stringify(after, null, 2))
         expect(Draft.convertToRaw(newEditorState.getCurrentContent())).toEqual(
           after
         );

src/modifiers/__test__/insertImage-test.js

@@ -1,4 +1,3 @@
-import { expect } from "chai";
 import Draft, { EditorState, SelectionState } from "draft-js";
 import insertImage from "../insertImage";
 
@@ -73,9 +72,9 @@ describe("insertImage", () => {
     matchArr.index = 4;
     matchArr.input = text;
     const newEditorState = insertImage(editorState, matchArr);
-    expect(newEditorState).not.to.equal(editorState);
-    expect(
-      Draft.convertToRaw(newEditorState.getCurrentContent())
-    ).to.deep.equal(afterRawContentState);
+    expect(newEditorState).not.toEqual(editorState);
+    expect(Draft.convertToRaw(newEditorState.getCurrentContent())).toEqual(
+      afterRawContentState
+    );
   });
 });