facebookarchive · yangshun · Dec 7, 2019 · Dec 7, 2019 · Dec 7, 2019
diff --git a/package.json b/package.json
@@ -87,7 +87,6 @@
     "npm": "2.x || 3.x || 5.x || 6.x"
   },
   "jest": {
-    "automock": true,
     "globals": {
       "__DEV__": true
     },

diff --git a/src/component/base/__tests__/DraftEditor.react-test.js b/src/component/base/__tests__/DraftEditor.react-test.js
@@ -10,8 +10,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 jest.mock('generateRandomKey');
 
 const DraftEditor = require('DraftEditor.react');

diff --git a/src/component/contents/__tests__/DraftEditorBlock.react-test.js b/src/component/contents/__tests__/DraftEditorBlock.react-test.js
@@ -11,7 +11,6 @@
 'use strict';
 
 jest
-  .disableAutomock()
   .mock('Style')
   .mock('getElementPosition')
   .mock('getScrollPosition')

diff --git a/src/component/contents/__tests__/DraftEditorContents.react-test.js b/src/component/contents/__tests__/DraftEditorContents.react-test.js
@@ -10,8 +10,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 jest.mock('generateRandomKey');
 
 const Editor = require('DraftEditor.react');

diff --git a/src/component/contents/__tests__/DraftEditorTextNode-test.js b/src/component/contents/__tests__/DraftEditorTextNode-test.js
@@ -11,7 +11,7 @@
 
 'use strict';
 
-jest.disableAutomock().mock('UserAgent');
+jest.mock('UserAgent');
 
 const BLOCK_DELIMITER_CHAR = '\n';
 const TEST_A = 'Hello';

diff --git a/src/component/contents/exploration/__tests__/DraftEditorBlockNode.react-test.js b/src/component/contents/exploration/__tests__/DraftEditorBlockNode.react-test.js
@@ -11,7 +11,6 @@
 'use strict';
 
 jest
-  .disableAutomock()
   .mock('Style')
   .mock('getElementPosition')
   .mock('getScrollPosition')

diff --git a/src/component/contents/exploration/__tests__/DraftEditorContentsExperimental.react-test.js b/src/component/contents/exploration/__tests__/DraftEditorContentsExperimental.react-test.js
@@ -10,8 +10,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const ContentBlockNode = require('ContentBlockNode');
 const ContentState = require('ContentState');
 const DefaultDraftBlockRenderMap = require('DefaultDraftBlockRenderMap');

diff --git a/src/component/handlers/composition/__tests__/DraftEditorCompostionHandler-test.js b/src/component/handlers/composition/__tests__/DraftEditorCompostionHandler-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 // DraftEditorComposition uses timers to detect duplicate `compositionend`
 // events.
 jest.useFakeTimers();

diff --git a/src/component/handlers/edit/__tests__/editOnBeforeInput-test.js b/src/component/handlers/edit/__tests__/editOnBeforeInput-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 import type DraftEditor from 'DraftEditor.react';
 
 const CompositeDraftDecorator = require('CompositeDraftDecorator');

diff --git a/src/component/handlers/edit/__tests__/editOnBlur-test.js b/src/component/handlers/edit/__tests__/editOnBlur-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const ContentBlock = require('ContentBlock');
 const ContentState = require('ContentState');
 const EditorState = require('EditorState');

diff --git a/src/component/handlers/edit/__tests__/editOnInput-test.js b/src/component/handlers/edit/__tests__/editOnInput-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const ContentBlock = require('ContentBlock');
 const ContentState = require('ContentState');
 const EditorState = require('EditorState');

diff --git a/src/component/handlers/edit/commands/__tests__/SecondaryClipboard-test.js b/src/component/handlers/edit/commands/__tests__/SecondaryClipboard-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 jest.mock('generateRandomKey');
 
 const toggleExperimentalTreeDataSupport = enabled => {

diff --git a/src/component/handlers/edit/commands/__tests__/removeTextWithStrategy-test.js b/src/component/handlers/edit/commands/__tests__/removeTextWithStrategy-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 jest.mock('generateRandomKey');
 
 const toggleExperimentalTreeDataSupport = enabled => {

diff --git a/src/component/selection/__tests__/DraftOffsetKey-test.js b/src/component/selection/__tests__/DraftOffsetKey-test.js
@@ -9,8 +9,6 @@
  * @flow strict-local
  */
 
-jest.disableAutomock();
-
 const DraftOffsetKey = require('DraftOffsetKey');
 
 test('decodes offset key with no delimiter', () => {

diff --git a/src/component/selection/__tests__/getDraftEditorSelection-test.js b/src/component/selection/__tests__/getDraftEditorSelection-test.js
@@ -10,8 +10,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const getDraftEditorSelection = require('getDraftEditorSelection');
 const getSampleSelectionMocksForTesting = require('getSampleSelectionMocksForTesting');
 const getSampleSelectionMocksForTestingNestedBlocks = require('getSampleSelectionMocksForTestingNestedBlocks');

diff --git a/src/component/utils/__tests__/getContentEditableContainer-test.js b/src/component/utils/__tests__/getContentEditableContainer-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 jest.mock('ReactDOM');
 
 const getContentEditableContainer = require('getContentEditableContainer');

diff --git a/src/component/utils/__tests__/isHTMLBRElement-test.js b/src/component/utils/__tests__/isHTMLBRElement-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const isHTMLBRElement = require('isHTMLBRElement');
 
 test('isHTMLBRElement recognizes null', () => {

diff --git a/src/component/utils/exploration/__tests__/DraftTreeAdapter-test.js b/src/component/utils/exploration/__tests__/DraftTreeAdapter-test.js
@@ -10,8 +10,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 jest.mock('generateRandomKey');
 
 const DraftTreeAdapter = require('DraftTreeAdapter');

diff --git a/src/component/utils/exploration/__tests__/DraftTreeInvariants-test.js b/src/component/utils/exploration/__tests__/DraftTreeInvariants-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 // missing parent -> child connection
 
 const ContentBlockNode = require('ContentBlockNode');

diff --git a/src/model/decorators/__tests__/CompositeDraftDecorator-test.js b/src/model/decorators/__tests__/CompositeDraftDecorator-test.js
@@ -8,7 +8,7 @@
  * @format
  */
 
-jest.disableAutomock().mock('ContentState');
+jest.mock('ContentState');
 
 const CompositeDraftDecorator = require('CompositeDraftDecorator');
 const ContentState = require('ContentState');

diff --git a/src/model/encoding/__tests__/DraftStringKey-test.js b/src/model/encoding/__tests__/DraftStringKey-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const {stringify, unstringify} = require('DraftStringKey');
 
 test('must convert maybe strings to a string key', () => {

diff --git a/src/model/encoding/__tests__/convertFromDraftStateToRaw-test.js b/src/model/encoding/__tests__/convertFromDraftStateToRaw-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const BlockMapBuilder = require('BlockMapBuilder');
 const CharacterMetadata = require('CharacterMetadata');
 const ContentBlock = require('ContentBlock');

diff --git a/src/model/encoding/__tests__/convertFromHTMLToContentBlocks-test.js b/src/model/encoding/__tests__/convertFromHTMLToContentBlocks-test.js
@@ -11,7 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
 expect.addSnapshotSerializer(require('NonASCIIStringSnapshotSerializer'));
 
 jest.mock('generateRandomKey');

diff --git a/src/model/encoding/__tests__/convertFromRawToDraftState-test.js b/src/model/encoding/__tests__/convertFromRawToDraftState-test.js
@@ -10,8 +10,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 jest.mock('generateRandomKey');
 
 const convertFromRawToDraftState = require('convertFromRawToDraftState');

diff --git a/src/model/encoding/__tests__/decodeEntityRanges-test.js b/src/model/encoding/__tests__/decodeEntityRanges-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const decodeEntityRanges = require('decodeEntityRanges');
 
 test('must decode when no entities present', () => {

diff --git a/src/model/encoding/__tests__/decodeInlineStyleRanges-test.js b/src/model/encoding/__tests__/decodeInlineStyleRanges-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const decodeInlineStyleRanges = require('decodeInlineStyleRanges');
 
 test('must decode for an unstyled block', () => {

diff --git a/src/model/encoding/__tests__/encodeEntityRanges-test.js b/src/model/encoding/__tests__/encodeEntityRanges-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const ContentBlock = require('ContentBlock');
 
 const createCharacterList = require('createCharacterList');

diff --git a/src/model/encoding/__tests__/encodeInlineStyleRanges-test.js b/src/model/encoding/__tests__/encodeInlineStyleRanges-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const ContentBlock = require('ContentBlock');
 const SampleDraftInlineStyle = require('SampleDraftInlineStyle');
 

diff --git a/src/model/encoding/__tests__/sanitizeDraftText-test.js b/src/model/encoding/__tests__/sanitizeDraftText-test.js
@@ -9,8 +9,6 @@
  * @format
  */
 
-jest.disableAutomock();
-
 const sanitizeDraftText = require('sanitizeDraftText');
 
 test('must strip trailing carriage returns', () => {

diff --git a/src/model/entity/__tests__/DraftEntity-test.js b/src/model/entity/__tests__/DraftEntity-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const DraftEntity = require('DraftEntity');
 
 beforeEach(() => {

diff --git a/src/model/entity/__tests__/getEntityKeyForSelection-test.js b/src/model/entity/__tests__/getEntityKeyForSelection-test.js
@@ -9,8 +9,6 @@
  * @format
  */
 
-jest.disableAutomock();
-
 const getEntityKeyForSelection = require('getEntityKeyForSelection');
 const getSampleStateForTesting = require('getSampleStateForTesting');
 

diff --git a/src/model/immutable/__tests__/BlockTree-test.js b/src/model/immutable/__tests__/BlockTree-test.js
@@ -10,8 +10,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const BlockTree = require('BlockTree');
 const CharacterMetadata = require('CharacterMetadata');
 const ContentBlock = require('ContentBlock');

diff --git a/src/model/immutable/__tests__/CharacterMetadata-test.js b/src/model/immutable/__tests__/CharacterMetadata-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const CharacterMetadata = require('CharacterMetadata');
 const {BOLD, BOLD_ITALIC, NONE, UNDERLINE} = require('SampleDraftInlineStyle');
 

diff --git a/src/model/immutable/__tests__/ContentBlock-test.js b/src/model/immutable/__tests__/ContentBlock-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const CharacterMetadata = require('CharacterMetadata');
 const ContentBlock = require('ContentBlock');
 const {BOLD} = require('SampleDraftInlineStyle');

diff --git a/src/model/immutable/__tests__/ContentBlockNode-test.js b/src/model/immutable/__tests__/ContentBlockNode-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const CharacterMetadata = require('CharacterMetadata');
 const ContentBlockNode = require('ContentBlockNode');
 const {BOLD, NONE} = require('SampleDraftInlineStyle');

diff --git a/src/model/immutable/__tests__/ContentState-test.js b/src/model/immutable/__tests__/ContentState-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 jest.mock('SelectionState');
 
 let contentState;

diff --git a/src/model/immutable/__tests__/EditorBidiService-test.js b/src/model/immutable/__tests__/EditorBidiService-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const ContentBlock = require('ContentBlock');
 const ContentState = require('ContentState');
 const EditorBidiService = require('EditorBidiService');

diff --git a/src/model/immutable/__tests__/EditorState-test.js b/src/model/immutable/__tests__/EditorState-test.js
@@ -10,8 +10,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const CharacterMetadata = require('CharacterMetadata');
 const ContentBlock = require('ContentBlock');
 const ContentState = require('ContentState');

diff --git a/src/model/immutable/__tests__/SelectionState-test.js b/src/model/immutable/__tests__/SelectionState-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const SelectionState = require('SelectionState');
 
 const DEFAULT_CONFIG = {

diff --git a/src/model/immutable/__tests__/findRangesImmutable-test.js b/src/model/immutable/__tests__/findRangesImmutable-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 const findRangesImmutable = require('findRangesImmutable');
 const Immutable = require('immutable');
 

diff --git a/src/model/modifier/__tests__/AtomicBlockUtils-test.js b/src/model/modifier/__tests__/AtomicBlockUtils-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 jest.mock('generateRandomKey');
 
 const AtomicBlockUtils = require('AtomicBlockUtils');

diff --git a/src/model/modifier/__tests__/DraftRemovableWord-test.js b/src/model/modifier/__tests__/DraftRemovableWord-test.js
@@ -11,7 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
 expect.addSnapshotSerializer(require('NonASCIIStringSnapshotSerializer'));
 
 const DraftRemovableWord = require('DraftRemovableWord');

diff --git a/src/model/modifier/__tests__/RichTextEditorUtil-test.js b/src/model/modifier/__tests__/RichTextEditorUtil-test.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-jest.disableAutomock();
-
 const AtomicBlockUtils = require('AtomicBlockUtils');
 const DraftModifier = require('DraftModifier');
 const EditorState = require('EditorState');

diff --git a/src/model/modifier/exploration/__tests__/DraftTreeOperations-test.js b/src/model/modifier/exploration/__tests__/DraftTreeOperations-test.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-jest.disableAutomock();
-
 jest.mock('generateRandomKey');
 
 const ContentBlockNode = require('ContentBlockNode');

diff --git a/src/model/modifier/exploration/__tests__/NestedRichTextEditorUtil-test.js b/src/model/modifier/exploration/__tests__/NestedRichTextEditorUtil-test.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-jest.disableAutomock();
-
 jest.mock('generateRandomKey');
 
 const AtomicBlockUtils = require('AtomicBlockUtils');