Merge pull request #10 from withspectrum/fix-tests

Fix tests

Author: mxstbr

jest.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  testRegex: "(/__tests__/.*|(\\.|/|-)(test|spec))\\.jsx?$",
+};

src/modifiers/__test__/handleImage-test.js

@@ -1,5 +1,3 @@
-import sinon from "sinon";
-import { expect } from "chai";
 import Draft, { EditorState, SelectionState } from "draft-js";
 import handleImage from "../handleImage";
 
@@ -9,7 +7,7 @@ describe("handleImage", () => {
   let selection;
   let fakeInsertImage;
 
-  after(() => {
+  afterAll(() => {
     handleImage.__ResetDependency__("insertImage"); // eslint-disable-line no-underscore-dangle
   });
 
@@ -65,7 +63,7 @@ describe("handleImage", () => {
       "insert-image"
     );
 
-    fakeInsertImage = sinon.spy(() => newEditorState);
+    fakeInsertImage = jest.fn(() => newEditorState);
 
     handleImage.__Rewire__("insertImage", fakeInsertImage); // eslint-disable-line no-underscore-dangle
 
@@ -90,20 +88,20 @@ describe("handleImage", () => {
       it("returns new editor state", () => {
         const editorState = createEditorState(text);
         const newEditorState = handleImage(editorState, " ");
-        expect(newEditorState).not.to.equal(editorState);
-        expect(
-          Draft.convertToRaw(newEditorState.getCurrentContent())
-        ).to.deep.equal(afterRawContentState);
-        expect(fakeInsertImage).to.have.callCount(1);
+        expect(newEditorState).not.toEqual(editorState);
+        expect(Draft.convertToRaw(newEditorState.getCurrentContent())).toEqual(
+          afterRawContentState
+        );
+        expect(fakeInsertImage).toHaveBeenCalledTimes(1);
       });
     });
   });
   describe("if does not match", () => {
     it("returns old editor state", () => {
       const editorState = createEditorState("yo");
       const newEditorState = handleImage(editorState, " ");
-      expect(newEditorState).to.equal(editorState);
-      expect(fakeInsertImage).not.to.have.been.called();
+      expect(newEditorState).toEqual(editorState);
+      expect(fakeInsertImage).not.toHaveBeenCalled();
     });
   });
 });

src/modifiers/__test__/handleLink-test.js

@@ -1,5 +1,4 @@
 import sinon from "sinon";
-import { expect } from "chai";
 import Draft, { EditorState, SelectionState } from "draft-js";
 import handleLink from "../handleLink";
 
@@ -9,7 +8,7 @@ describe("handleLink", () => {
   let selection;
   let fakeInsertLink;
 
-  after(() => {
+  afterAll(() => {
     handleLink.__ResetDependency__("../insertLink"); // eslint-disable-line no-underscore-dangle
   });
 
@@ -65,7 +64,7 @@ describe("handleLink", () => {
       "insert-image"
     );
 
-    fakeInsertLink = sinon.spy(() => newEditorState);
+    fakeInsertLink = jest.fn(() => newEditorState);
 
     handleLink.__Rewire__("insertLink", fakeInsertLink); // eslint-disable-line no-underscore-dangle
 
@@ -80,20 +79,20 @@ describe("handleLink", () => {
       it("returns new editor state", () => {
         const editorState = createEditorState(text);
         const newEditorState = handleLink(editorState, " ");
-        expect(newEditorState).not.to.equal(editorState);
-        expect(
-          Draft.convertToRaw(newEditorState.getCurrentContent())
-        ).to.deep.equal(afterRawContentState);
-        expect(fakeInsertLink).to.have.callCount(1);
+        expect(newEditorState).not.toEqual(editorState);
+        expect(Draft.convertToRaw(newEditorState.getCurrentContent())).toEqual(
+          afterRawContentState
+        );
+        expect(fakeInsertLink).toHaveBeenCalledTimes(1);
       });
     });
   });
   describe("if does not match", () => {
     it("returns old editor state", () => {
       const editorState = createEditorState("yo");
       const newEditorState = handleLink(editorState, " ");
-      expect(newEditorState).to.equal(editorState);
-      expect(fakeInsertLink).not.to.have.been.called();
+      expect(newEditorState).toEqual(editorState);
+      expect(fakeInsertLink).not.toHaveBeenCalled();
     });
   });
 });

src/modifiers/__test__/handleNewCodeBlock-test.js

@@ -1,4 +1,3 @@
-import { expect } from "chai";
 import sinon from "sinon";
 import Draft, { EditorState, SelectionState } from "draft-js";
 import handleNewCodeBlock from "../handleNewCodeBlock";
@@ -49,10 +48,10 @@ describe("handleNewCodeBlock", () => {
       );
       it("creates new code block", () => {
         const newEditorState = handleNewCodeBlock(editorState);
-        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
+        );
       });
     };
 
@@ -61,10 +60,10 @@ describe("handleNewCodeBlock", () => {
   });
 
   describe("in code block", () => {
-    before(() => {
+    beforeAll(() => {
       sinon.stub(Draft, "genKey").returns("item2");
     });
-    after(() => {
+    afterAll(() => {
       Draft.genKey.restore();
     });
     const beforeRawContentState = {
@@ -119,10 +118,10 @@ describe("handleNewCodeBlock", () => {
         selection
       );
       const newEditorState = handleNewCodeBlock(editorState);
-      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
+      );
     });
     it("does not add new line even inside code block", () => {
       const selection = new SelectionState({
@@ -138,10 +137,10 @@ describe("handleNewCodeBlock", () => {
         selection
       );
       const newEditorState = handleNewCodeBlock(editorState);
-      expect(newEditorState).to.equal(editorState);
-      expect(
-        Draft.convertToRaw(newEditorState.getCurrentContent())
-      ).to.deep.equal(beforeRawContentState);
+      expect(newEditorState).toEqual(editorState);
+      expect(Draft.convertToRaw(newEditorState.getCurrentContent())).toEqual(
+        beforeRawContentState
+      );
     });
   });
 
@@ -175,10 +174,10 @@ describe("handleNewCodeBlock", () => {
     );
     it("noop", () => {
       const newEditorState = handleNewCodeBlock(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
+      );
     });
   });
 });

src/modifiers/__test__/insertEmptyBlock-test.js

@@ -1,13 +1,12 @@
-import { expect } from "chai";
 import sinon from "sinon";
 import Draft, { EditorState, SelectionState } from "draft-js";
 import insertEmptyBlock from "../insertEmptyBlock";
 
 describe("insertEmptyBlock", () => {
-  before(() => {
+  beforeAll(() => {
     sinon.stub(Draft, "genKey").returns("item2");
   });
-  after(() => {
+  afterAll(() => {
     Draft.genKey.restore();
   });
   const testInsertEmptyBlock = (...args) => () => {
@@ -62,10 +61,10 @@ describe("insertEmptyBlock", () => {
 
     it("creates new code block", () => {
       const newEditorState = insertEmptyBlock(editorState, ...args);
-      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
+      );
     });
   };
 

src/modifiers/__test__/leaveList-test.js

@@ -1,13 +1,12 @@
-import { expect } from "chai";
 import sinon from "sinon";
 import Draft, { EditorState, SelectionState } from "draft-js";
 import leaveList from "../leaveList";
 
 describe("leaveList", () => {
-  before(() => {
+  beforeAll(() => {
     sinon.stub(Draft, "genKey").returns("item2");
   });
-  after(() => {
+  afterAll(() => {
     Draft.genKey.restore();
   });
   [
@@ -58,10 +57,10 @@ describe("leaveList", () => {
     );
     it("converts block type", () => {
       const newEditorState = leaveList(editorState);
-      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
+      );
     });
   });
 });