Improve branch coverage

Author: ngs

.nycrc

@@ -1,4 +1,7 @@
 {
+  "exclude": [
+    "src/**/__test__/*.js"
+  ],
   "reporter": [
     "lcov",
     "text-summary",

src/modifiers/__test__/changeCurrentBlockType-test.js

@@ -40,4 +40,15 @@ describe('changeCurrentBlockType', () => {
       rawContentState('Hello world', 'header-one', { foo: 'bar' })
     );
   });
+  it('changes block type even if data is null', () => {
+    const editorState = createEditorState('Yo', 'unstyled');
+    const newEditorState = changeCurrentBlockType(
+      editorState, 'header-one', 'Hello world', null);
+    expect(newEditorState).not.to.equal(editorState);
+    expect(
+      Draft.convertToRaw(newEditorState.getCurrentContent())
+    ).to.deep.equal(
+      rawContentState('Hello world', 'header-one', {})
+    );
+  });
 });

src/modifiers/__test__/handleBlockType-test.js

@@ -8,7 +8,7 @@ describe('handleBlockType', () => {
       entityMap: {},
       blocks: [{
         key: 'item1',
-        text: 'Test',
+        text: '[ ]',
         type: 'unstyled',
         depth: 0,
         inlineStyleRanges: [],
@@ -19,9 +19,9 @@ describe('handleBlockType', () => {
     const contentState = Draft.convertFromRaw(rawContentState);
     const selection = new SelectionState({
       anchorKey: 'item1',
-      anchorOffset: 6,
+      anchorOffset: 3,
       focusKey: 'item1',
-      focusOffset: 6,
+      focusOffset: 3,
       isBackward: false,
       hasFocus: true
     });

src/modifiers/__test__/insertEmptyBlock-test.js

@@ -10,53 +10,60 @@ describe('insertEmptyBlock', () => {
   after(() => {
     Draft.genKey.restore();
   });
-  const firstBlock = {
-    key: 'item1',
-    text: 'asdf',
-    type: 'unstyled',
-    depth: 0,
-    inlineStyleRanges: [{
-      length: 2,
-      offset: 1,
-      style: 'ITALIC'
-    }],
-    entityRanges: [],
-    data: { foo: 'bar' }
-  };
-  const beforeRawContentState = {
-    entityMap: {},
-    blocks: [firstBlock]
-  };
-  const afterRawContentState = {
-    entityMap: {},
-    blocks: [firstBlock, {
-      key: 'item2',
-      text: '',
-      type: 'header-one',
+  const testInsertEmptyBlock = (...args) => () => {
+    const [type = 'unstyled', data = {}] = args;
+    const firstBlock = {
+      key: 'item1',
+      text: 'asdf',
+      type: 'unstyled',
       depth: 0,
-      inlineStyleRanges: [],
+      inlineStyleRanges: [{
+        length: 2,
+        offset: 1,
+        style: 'ITALIC'
+      }],
       entityRanges: [],
-      data: { bar: 'baz' }
-    }]
+      data: { foo: 'bar' }
+    };
+    const beforeRawContentState = {
+      entityMap: {},
+      blocks: [firstBlock]
+    };
+    const afterRawContentState = {
+      entityMap: {},
+      blocks: [firstBlock, {
+        key: 'item2',
+        text: '',
+        type,
+        depth: 0,
+        inlineStyleRanges: [],
+        entityRanges: [],
+        data
+      }]
+    };
+    const contentState = Draft.convertFromRaw(beforeRawContentState);
+    const selection = new SelectionState({
+      anchorKey: 'item1',
+      anchorOffset: 4,
+      focusKey: 'item1',
+      focusOffset: 4,
+      isBackward: false,
+      hasFocus: true
+    });
+    const editorState = EditorState.forceSelection(
+      EditorState.createWithContent(contentState), selection);
+
+    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
+      );
+    });
   };
-  const contentState = Draft.convertFromRaw(beforeRawContentState);
-  const selection = new SelectionState({
-    anchorKey: 'item1',
-    anchorOffset: 4,
-    focusKey: 'item1',
-    focusOffset: 4,
-    isBackward: false,
-    hasFocus: true
-  });
-  const editorState = EditorState.forceSelection(
-    EditorState.createWithContent(contentState), selection);
-  it('creates new code block', () => {
-    const newEditorState = insertEmptyBlock(editorState, 'header-one', { bar: 'baz' });
-    expect(newEditorState).not.to.equal(editorState);
-    expect(
-      Draft.convertToRaw(newEditorState.getCurrentContent())
-    ).to.deep.equal(
-      afterRawContentState
-    );
-  });
+
+  describe('with arguments', testInsertEmptyBlock('header-one', { bar: 'baz' }));
+  describe('without arguments', testInsertEmptyBlock());
 });

src/modifiers/changeCurrentBlockType.js

@@ -6,10 +6,7 @@ const changeCurrentBlockType = (editorState, type, text, blockMetadata = {}) =>
   const key = selection.getStartKey();
   const blockMap = currentContent.getBlockMap();
   const block = blockMap.get(key);
-  let data = block.getData();
-  if (data && data.merge) {
-    data = data.merge(blockMetadata);
-  }
+  const data = block.getData().merge(blockMetadata);
   const newBlock = block.merge({ type, data, text: text || '' });
   const newSelection = selection.merge({
     anchorOffset: 0,

src/modifiers/handleBlockType.js

@@ -45,7 +45,7 @@ const handleBlockType = (editorState, character) => {
     return changeCurrentBlockType(editorState, 'blockquote', matchArr[1]);
   }
   matchArr = line.match(/^\[([x ])] (.*)$/i);
-  if (blockType === 'unordered-list-item' && matchArr) {
+  if (matchArr && blockType === 'unordered-list-item') {
     return changeCurrentBlockType(editorState, CHECKABLE_LIST_ITEM, matchArr[2], { checked: matchArr[1] !== ' ' });
   }
   return editorState;

src/modifiers/handleInlineStyle.js

@@ -35,7 +35,7 @@ const handleInlineStyle = (editorState, character) => {
     });
     return newEditorState !== editorState;
   });
-  return newEditorState || editorState;
+  return newEditorState;
 };
 
 export default handleInlineStyle;