diff --git a/package.json b/package.json index bf6ef1dd..5069f54e 100644 --- a/package.json +++ b/package.json @@ -46,19 +46,10 @@ "watch": "yarn run build --silent && node ./scripts/watch.js" }, "jest": { - "automock": true, "testEnvironment": "node", "timers": "fake", "setupFiles": [ "/scripts/setupJest.js" - ], - "unmockedModulePathPatterns": [ - "promise", - "source-map", - "denodeify", - "fbjs", - "sinon", - "core-js" ] } } diff --git a/packages/metro-bundler/src/AssetServer/__tests__/AssetServer-test.js b/packages/metro-bundler/src/AssetServer/__tests__/AssetServer-test.js index 64692c49..9e869403 100644 --- a/packages/metro-bundler/src/AssetServer/__tests__/AssetServer-test.js +++ b/packages/metro-bundler/src/AssetServer/__tests__/AssetServer-test.js @@ -9,8 +9,6 @@ 'use strict'; -jest.disableAutomock(); - jest.mock('fs'); const AssetServer = require('../'); diff --git a/packages/metro-bundler/src/Bundler/__tests__/Bundle-test.js b/packages/metro-bundler/src/Bundler/__tests__/Bundle-test.js index aebe7ffc..9ae64913 100644 --- a/packages/metro-bundler/src/Bundler/__tests__/Bundle-test.js +++ b/packages/metro-bundler/src/Bundler/__tests__/Bundle-test.js @@ -10,8 +10,6 @@ */ 'use strict'; -jest.disableAutomock(); - const Bundle = require('../Bundle'); const ModuleTransport = require('../../lib/ModuleTransport'); const crypto = require('crypto'); diff --git a/packages/metro-bundler/src/Bundler/__tests__/Bundler-test.js b/packages/metro-bundler/src/Bundler/__tests__/Bundler-test.js index ef3ea89c..818f9faf 100644 --- a/packages/metro-bundler/src/Bundler/__tests__/Bundler-test.js +++ b/packages/metro-bundler/src/Bundler/__tests__/Bundler-test.js @@ -8,8 +8,6 @@ */ 'use strict'; -jest.disableAutomock(); - jest .setMock('worker-farm', () => () => undefined) .setMock('../../worker-farm', () => () => undefined) diff --git a/packages/metro-bundler/src/Bundler/source-map/__tests__/B64Builder-test.js b/packages/metro-bundler/src/Bundler/source-map/__tests__/B64Builder-test.js index 4f62614f..affceb3b 100644 --- a/packages/metro-bundler/src/Bundler/source-map/__tests__/B64Builder-test.js +++ b/packages/metro-bundler/src/Bundler/source-map/__tests__/B64Builder-test.js @@ -8,8 +8,6 @@ */ 'use strict'; -jest.disableAutomock(); - const B64Builder = require('../B64Builder'); let builder; diff --git a/packages/metro-bundler/src/Bundler/source-map/__tests__/Generator-test.js b/packages/metro-bundler/src/Bundler/source-map/__tests__/Generator-test.js index 0cad1999..2447dc21 100644 --- a/packages/metro-bundler/src/Bundler/source-map/__tests__/Generator-test.js +++ b/packages/metro-bundler/src/Bundler/source-map/__tests__/Generator-test.js @@ -8,8 +8,6 @@ */ 'use strict'; -jest.disableAutomock(); - const Generator = require('../Generator'); const {objectContaining} = expect; diff --git a/packages/metro-bundler/src/Bundler/source-map/__tests__/source-map-test.js b/packages/metro-bundler/src/Bundler/source-map/__tests__/source-map-test.js index fab0aab6..9637991b 100644 --- a/packages/metro-bundler/src/Bundler/source-map/__tests__/source-map-test.js +++ b/packages/metro-bundler/src/Bundler/source-map/__tests__/source-map-test.js @@ -8,8 +8,6 @@ */ 'use strict'; -jest.disableAutomock(); - const Generator = require('../Generator'); const {compactMapping, fromRawMappings} = require('..'); diff --git a/packages/metro-bundler/src/JSTransformer/__tests__/Transformer-test.js b/packages/metro-bundler/src/JSTransformer/__tests__/Transformer-test.js index ae9b59b1..156f459a 100644 --- a/packages/metro-bundler/src/JSTransformer/__tests__/Transformer-test.js +++ b/packages/metro-bundler/src/JSTransformer/__tests__/Transformer-test.js @@ -9,18 +9,10 @@ 'use strict'; jest - .unmock('stream') - .unmock('crypto') - .unmock('../../lib/ModuleTransport') - .unmock('../'); - -const fs = {writeFileSync: jest.fn()}; -const temp = {path: () => '/arbitrary/path'}; -const workerFarm = jest.fn(); -jest.setMock('fs', fs); -jest.setMock('temp', temp); -jest.setMock('worker-farm', workerFarm); -jest.setMock('../../worker-farm', workerFarm); + .mock('fs', () => ({writeFileSync: jest.fn()})) + .mock('temp', () => ({path: () => '/arbitrary/path'})) + .mock('worker-farm', () => jest.fn()) + .mock('../../worker-farm', () => jest.fn()); var Transformer = require('../'); @@ -37,6 +29,8 @@ describe('Transformer', function() { Cache = jest.fn(); Cache.prototype.get = jest.fn((a, b, c) => c()); + const fs = require('fs'); + const workerFarm = require('../../worker-farm'); fs.writeFileSync.mockClear(); workerFarm.mockClear(); workerFarm.mockImplementation((opts, path, methods) => { diff --git a/packages/metro-bundler/src/JSTransformer/worker/__tests__/constant-folding-test.js b/packages/metro-bundler/src/JSTransformer/worker/__tests__/constant-folding-test.js index b1899fca..1f8a26cb 100644 --- a/packages/metro-bundler/src/JSTransformer/worker/__tests__/constant-folding-test.js +++ b/packages/metro-bundler/src/JSTransformer/worker/__tests__/constant-folding-test.js @@ -8,7 +8,6 @@ */ 'use strict'; -jest.disableAutomock(); const babel = require('babel-core'); const constantFolding = require('../constant-folding'); diff --git a/packages/metro-bundler/src/JSTransformer/worker/__tests__/extract-dependencies-test.js b/packages/metro-bundler/src/JSTransformer/worker/__tests__/extract-dependencies-test.js index 998ee7da..53725cdd 100644 --- a/packages/metro-bundler/src/JSTransformer/worker/__tests__/extract-dependencies-test.js +++ b/packages/metro-bundler/src/JSTransformer/worker/__tests__/extract-dependencies-test.js @@ -8,8 +8,6 @@ */ 'use strict'; -jest.disableAutomock(); - const extractDependencies = require('../extract-dependencies'); describe('Dependency extraction:', () => { diff --git a/packages/metro-bundler/src/JSTransformer/worker/__tests__/inline-test.js b/packages/metro-bundler/src/JSTransformer/worker/__tests__/inline-test.js index a08a242f..d329a715 100644 --- a/packages/metro-bundler/src/JSTransformer/worker/__tests__/inline-test.js +++ b/packages/metro-bundler/src/JSTransformer/worker/__tests__/inline-test.js @@ -10,7 +10,6 @@ /* eslint-disable max-len */ -jest.disableAutomock(); const inline = require('../inline'); const {transform, transformFromAst} = require('babel-core'); diff --git a/packages/metro-bundler/src/JSTransformer/worker/__tests__/minify-test.js b/packages/metro-bundler/src/JSTransformer/worker/__tests__/minify-test.js index 8eff672e..6a2e8329 100644 --- a/packages/metro-bundler/src/JSTransformer/worker/__tests__/minify-test.js +++ b/packages/metro-bundler/src/JSTransformer/worker/__tests__/minify-test.js @@ -8,17 +8,14 @@ */ 'use strict'; -jest.disableAutomock(); - -const uglify = { +jest.mock('uglify-js', () => ({ minify: jest.fn(code => { return { code: code.replace(/(^|\W)\s+/g, '$1'), map: {}, }; }), -}; -jest.setMock('uglify-js', uglify); +})); const minify = require('../minify'); const {objectContaining} = jasmine; @@ -27,8 +24,10 @@ describe('Minification:', () => { const filename = '/arbitrary/file.js'; const code = 'arbitrary(code)'; let map; + let uglify; beforeEach(() => { + uglify = require('uglify-js'); uglify.minify.mockClear(); uglify.minify.mockReturnValue({code: '', map: '{}'}); map = {version: 3, sources: ['?'], mappings: ''}; diff --git a/packages/metro-bundler/src/JSTransformer/worker/__tests__/worker-test.js b/packages/metro-bundler/src/JSTransformer/worker/__tests__/worker-test.js index c404aea5..3c8d50a8 100644 --- a/packages/metro-bundler/src/JSTransformer/worker/__tests__/worker-test.js +++ b/packages/metro-bundler/src/JSTransformer/worker/__tests__/worker-test.js @@ -8,11 +8,10 @@ */ 'use strict'; -jest.disableAutomock(); -jest.mock('../constant-folding'); -jest.mock('../extract-dependencies'); -jest.mock('../inline'); -jest.mock('../minify'); +jest.mock('../constant-folding') + .mock('../extract-dependencies') + .mock('../inline') + .mock('../minify'); const {objectContaining} = jasmine; diff --git a/packages/metro-bundler/src/Logger/__tests__/Logger-test.js b/packages/metro-bundler/src/Logger/__tests__/Logger-test.js index 96d10c3c..e573348d 100644 --- a/packages/metro-bundler/src/Logger/__tests__/Logger-test.js +++ b/packages/metro-bundler/src/Logger/__tests__/Logger-test.js @@ -11,8 +11,6 @@ */ 'use strict'; -jest.disableAutomock(); - const { createEntry, createActionStartEntry, diff --git a/packages/metro-bundler/src/ModuleGraph/__tests__/Graph-test.js b/packages/metro-bundler/src/ModuleGraph/__tests__/Graph-test.js index 032bd3fd..c61a548a 100644 --- a/packages/metro-bundler/src/ModuleGraph/__tests__/Graph-test.js +++ b/packages/metro-bundler/src/ModuleGraph/__tests__/Graph-test.js @@ -9,7 +9,6 @@ 'use strict'; jest - .disableAutomock() .useRealTimers() .mock('console'); diff --git a/packages/metro-bundler/src/ModuleGraph/__tests__/ModuleGraph-test.js b/packages/metro-bundler/src/ModuleGraph/__tests__/ModuleGraph-test.js index 8efc533f..50fa3a0c 100644 --- a/packages/metro-bundler/src/ModuleGraph/__tests__/ModuleGraph-test.js +++ b/packages/metro-bundler/src/ModuleGraph/__tests__/ModuleGraph-test.js @@ -8,8 +8,6 @@ */ 'use strict'; -jest.disableAutomock(); - const ModuleGraph = require('../ModuleGraph'); const defaults = require('../../defaults'); diff --git a/packages/metro-bundler/src/ModuleGraph/output/__tests__/indexed-ram-bundle-test.js b/packages/metro-bundler/src/ModuleGraph/output/__tests__/indexed-ram-bundle-test.js index 8305146c..e3e10228 100644 --- a/packages/metro-bundler/src/ModuleGraph/output/__tests__/indexed-ram-bundle-test.js +++ b/packages/metro-bundler/src/ModuleGraph/output/__tests__/indexed-ram-bundle-test.js @@ -11,7 +11,6 @@ 'use strict'; declare var jest: any; -jest.disableAutomock(); const indexedRamBundle = require('../indexed-ram-bundle'); const {addModuleIdsToModuleWrapper} = require('../util'); diff --git a/packages/metro-bundler/src/ModuleGraph/output/__tests__/util-test.js b/packages/metro-bundler/src/ModuleGraph/output/__tests__/util-test.js index 6984b76f..6c9e5c55 100644 --- a/packages/metro-bundler/src/ModuleGraph/output/__tests__/util-test.js +++ b/packages/metro-bundler/src/ModuleGraph/output/__tests__/util-test.js @@ -8,8 +8,6 @@ */ 'use strict'; -jest.disableAutomock(); - const {match} = require('sinon'); const {fn} = require('../../test-helpers'); const { diff --git a/packages/metro-bundler/src/ModuleGraph/worker/__tests__/collect-dependencies-test.js b/packages/metro-bundler/src/ModuleGraph/worker/__tests__/collect-dependencies-test.js index 5ce6310a..7fa577fa 100644 --- a/packages/metro-bundler/src/ModuleGraph/worker/__tests__/collect-dependencies-test.js +++ b/packages/metro-bundler/src/ModuleGraph/worker/__tests__/collect-dependencies-test.js @@ -8,8 +8,6 @@ */ 'use strict'; -jest.disableAutomock(); - const collectDependencies = require('../collect-dependencies'); const astFromCode = require('babylon').parse; const {codeFromAst, comparableCode} = require('../../test-helpers'); diff --git a/packages/metro-bundler/src/ModuleGraph/worker/__tests__/optimize-module-test.js b/packages/metro-bundler/src/ModuleGraph/worker/__tests__/optimize-module-test.js index 4f2c023e..eeebb5da 100644 --- a/packages/metro-bundler/src/ModuleGraph/worker/__tests__/optimize-module-test.js +++ b/packages/metro-bundler/src/ModuleGraph/worker/__tests__/optimize-module-test.js @@ -8,8 +8,6 @@ */ 'use strict'; -jest.disableAutomock(); - const optimizeModule = require('../optimize-module'); const transformModule = require('../transform-module'); const transformer = require('../../../transformer.js'); diff --git a/packages/metro-bundler/src/ModuleGraph/worker/__tests__/transform-module-test.js b/packages/metro-bundler/src/ModuleGraph/worker/__tests__/transform-module-test.js index 5503448e..ae8d3b19 100644 --- a/packages/metro-bundler/src/ModuleGraph/worker/__tests__/transform-module-test.js +++ b/packages/metro-bundler/src/ModuleGraph/worker/__tests__/transform-module-test.js @@ -10,8 +10,6 @@ */ 'use strict'; -jest.disableAutomock(); - const transformModule = require('../transform-module'); const t = require('babel-types'); diff --git a/packages/metro-bundler/src/ModuleGraph/worker/__tests__/wrap-worker-fn-test.js b/packages/metro-bundler/src/ModuleGraph/worker/__tests__/wrap-worker-fn-test.js index e543511d..233a809c 100644 --- a/packages/metro-bundler/src/ModuleGraph/worker/__tests__/wrap-worker-fn-test.js +++ b/packages/metro-bundler/src/ModuleGraph/worker/__tests__/wrap-worker-fn-test.js @@ -9,8 +9,7 @@ 'use strict'; jest - .disableAutomock() - .setMock('fs', jest.genMockFromModule('fs')) + .mock('fs', () => jest.genMockFromModule('fs')) .mock('mkdirp'); const wrapWorkerFn = require('../wrap-worker-fn'); diff --git a/packages/metro-bundler/src/Resolver/__tests__/Resolver-test.js b/packages/metro-bundler/src/Resolver/__tests__/Resolver-test.js index 353a6848..a79ed18c 100644 --- a/packages/metro-bundler/src/Resolver/__tests__/Resolver-test.js +++ b/packages/metro-bundler/src/Resolver/__tests__/Resolver-test.js @@ -10,8 +10,6 @@ jest.useRealTimers(); -jest.unmock('../'); -jest.unmock('../../defaults'); jest.mock('path'); const {join: pathJoin} = require.requireActual('path'); diff --git a/packages/metro-bundler/src/Resolver/polyfills/__tests__/Object.es7-test.js b/packages/metro-bundler/src/Resolver/polyfills/__tests__/Object.es7-test.js index 9024d97f..e820848d 100644 --- a/packages/metro-bundler/src/Resolver/polyfills/__tests__/Object.es7-test.js +++ b/packages/metro-bundler/src/Resolver/polyfills/__tests__/Object.es7-test.js @@ -13,8 +13,6 @@ 'use strict'; -jest.disableAutomock(); - describe('Object (ES7)', () => { beforeEach(() => { delete Object.entries; diff --git a/packages/metro-bundler/src/Server/__tests__/MultipartResponse-test.js b/packages/metro-bundler/src/Server/__tests__/MultipartResponse-test.js index 3920b508..580d3756 100644 --- a/packages/metro-bundler/src/Server/__tests__/MultipartResponse-test.js +++ b/packages/metro-bundler/src/Server/__tests__/MultipartResponse-test.js @@ -8,8 +8,6 @@ */ 'use strict'; -jest.dontMock('../MultipartResponse'); - const MultipartResponse = require('../MultipartResponse'); describe('MultipartResponse', () => { diff --git a/packages/metro-bundler/src/Server/__tests__/Server-test.js b/packages/metro-bundler/src/Server/__tests__/Server-test.js index 01e8ec46..acf75a5d 100644 --- a/packages/metro-bundler/src/Server/__tests__/Server-test.js +++ b/packages/metro-bundler/src/Server/__tests__/Server-test.js @@ -9,8 +9,6 @@ 'use strict'; -jest.disableAutomock(); - jest.mock('../../worker-farm', () => () => () => {}) .mock('worker-farm', () => () => () => {}) .mock('timers', () => ({setImmediate: fn => setTimeout(fn, 0)})) diff --git a/packages/metro-bundler/src/Server/symbolicate/__tests__/symbolicate-test.js b/packages/metro-bundler/src/Server/symbolicate/__tests__/symbolicate-test.js index d5dcc72a..b22387a3 100644 --- a/packages/metro-bundler/src/Server/symbolicate/__tests__/symbolicate-test.js +++ b/packages/metro-bundler/src/Server/symbolicate/__tests__/symbolicate-test.js @@ -8,9 +8,8 @@ */ 'use strict'; -jest.disableAutomock(); -jest.mock('child_process'); -jest.mock('net'); +jest.mock('child_process') + .mock('net'); const EventEmitter = require('events'); const {Readable} = require('stream'); diff --git a/packages/metro-bundler/src/Server/symbolicate/__tests__/util-test.js b/packages/metro-bundler/src/Server/symbolicate/__tests__/util-test.js index 1311b920..cf887e9a 100644 --- a/packages/metro-bundler/src/Server/symbolicate/__tests__/util-test.js +++ b/packages/metro-bundler/src/Server/symbolicate/__tests__/util-test.js @@ -9,8 +9,6 @@ 'use strict'; -jest.disableAutomock(); - const {LazyPromise, LockingPromise} = require('../util'); describe('Lazy Promise', () => { diff --git a/packages/metro-bundler/src/Server/symbolicate/__tests__/worker-test.js b/packages/metro-bundler/src/Server/symbolicate/__tests__/worker-test.js index efa77038..10ab9cfb 100644 --- a/packages/metro-bundler/src/Server/symbolicate/__tests__/worker-test.js +++ b/packages/metro-bundler/src/Server/symbolicate/__tests__/worker-test.js @@ -10,8 +10,6 @@ */ 'use strict'; -jest.disableAutomock(); - const SourceMapGenerator = require('../../../Bundler/source-map/Generator'); const {symbolicate} = require('../worker'); diff --git a/packages/metro-bundler/src/integration_tests/__tests__/basic_bundle-test.js b/packages/metro-bundler/src/integration_tests/__tests__/basic_bundle-test.js index fce916d0..4242ce68 100644 --- a/packages/metro-bundler/src/integration_tests/__tests__/basic_bundle-test.js +++ b/packages/metro-bundler/src/integration_tests/__tests__/basic_bundle-test.js @@ -11,11 +11,9 @@ 'use strict'; -jest.disableAutomock(); -jest.useRealTimers(); - -jest.dontMock('fs'); -jest.dontMock('graceful-fs'); +jest.useRealTimers() + .unmock('fs') + .unmock('graceful-fs'); /** * Don't waste time creating a worker-farm from jest-haste-map, use the function diff --git a/packages/metro-bundler/src/lib/__tests__/BatchProcessor-test.js b/packages/metro-bundler/src/lib/__tests__/BatchProcessor-test.js index 856cd822..83d6146a 100644 --- a/packages/metro-bundler/src/lib/__tests__/BatchProcessor-test.js +++ b/packages/metro-bundler/src/lib/__tests__/BatchProcessor-test.js @@ -9,9 +9,7 @@ 'use strict'; -jest - .useRealTimers() - .dontMock('../BatchProcessor'); +jest.useRealTimers(); const BatchProcessor = require('../BatchProcessor'); diff --git a/packages/metro-bundler/src/lib/__tests__/GlobalTransformCache-test.js b/packages/metro-bundler/src/lib/__tests__/GlobalTransformCache-test.js index c95a4e05..1dc0890e 100644 --- a/packages/metro-bundler/src/lib/__tests__/GlobalTransformCache-test.js +++ b/packages/metro-bundler/src/lib/__tests__/GlobalTransformCache-test.js @@ -9,7 +9,6 @@ 'use strict'; -jest.disableAutomock(); jest.useRealTimers(); const mockFetch = jest.fn(); diff --git a/packages/metro-bundler/src/lib/__tests__/TerminalClass-test.js b/packages/metro-bundler/src/lib/__tests__/TerminalClass-test.js index 9c8470f9..36079936 100644 --- a/packages/metro-bundler/src/lib/__tests__/TerminalClass-test.js +++ b/packages/metro-bundler/src/lib/__tests__/TerminalClass-test.js @@ -9,8 +9,6 @@ 'use strict'; -jest.dontMock('../TerminalClass').dontMock('lodash/throttle'); - jest.mock('readline', () => ({ moveCursor: (stream, dx, dy) => { const {cursor, columns} = stream; diff --git a/packages/metro-bundler/src/lib/__tests__/TransformCaching-test.js b/packages/metro-bundler/src/lib/__tests__/TransformCaching-test.js index 107503d1..8de1b9e3 100644 --- a/packages/metro-bundler/src/lib/__tests__/TransformCaching-test.js +++ b/packages/metro-bundler/src/lib/__tests__/TransformCaching-test.js @@ -9,13 +9,6 @@ 'use strict'; -jest - .dontMock('json-stable-stringify') - .dontMock('../TransformCaching') - .dontMock('left-pad') - .dontMock('lodash/throttle') - .dontMock('crypto'); - const crypto = require('crypto'); const jsonStableStringify = require('json-stable-stringify'); @@ -32,6 +25,7 @@ jest.mock('fs', () => ({ // Not required for it to work. return []; }, + mkdirSync: jest.fn(), })); jest.mock('write-file-atomic', () => ({ diff --git a/packages/metro-bundler/src/node-haste/__tests__/AssetModule-test.js b/packages/metro-bundler/src/node-haste/__tests__/AssetModule-test.js index 76d548cb..fe1f002a 100644 --- a/packages/metro-bundler/src/node-haste/__tests__/AssetModule-test.js +++ b/packages/metro-bundler/src/node-haste/__tests__/AssetModule-test.js @@ -8,8 +8,6 @@ */ 'use strict'; -jest.autoMockOff(); - const AssetModule = require('../AssetModule'); describe('AssetModule:', () => { diff --git a/packages/metro-bundler/src/node-haste/__tests__/AssetResolutionCache-test.js b/packages/metro-bundler/src/node-haste/__tests__/AssetResolutionCache-test.js index a5396848..89d61e29 100644 --- a/packages/metro-bundler/src/node-haste/__tests__/AssetResolutionCache-test.js +++ b/packages/metro-bundler/src/node-haste/__tests__/AssetResolutionCache-test.js @@ -11,8 +11,6 @@ 'use strict'; -jest.disableAutomock(); - const AssetResolutionCache = require('../AssetResolutionCache'); const MOCK_FILE_NAMES = [ diff --git a/packages/metro-bundler/src/node-haste/__tests__/DependencyGraph-test.js b/packages/metro-bundler/src/node-haste/__tests__/DependencyGraph-test.js index 34b0cf41..66976ceb 100644 --- a/packages/metro-bundler/src/node-haste/__tests__/DependencyGraph-test.js +++ b/packages/metro-bundler/src/node-haste/__tests__/DependencyGraph-test.js @@ -10,7 +10,6 @@ */ 'use strict'; -jest.disableAutomock(); jest.useRealTimers(); jest .mock('fs') diff --git a/packages/metro-bundler/src/node-haste/__tests__/Module-test.js b/packages/metro-bundler/src/node-haste/__tests__/Module-test.js index 1c92071d..bfc047d9 100644 --- a/packages/metro-bundler/src/node-haste/__tests__/Module-test.js +++ b/packages/metro-bundler/src/node-haste/__tests__/Module-test.js @@ -8,21 +8,18 @@ */ 'use strict'; -jest - .dontMock('absolute-path') - .dontMock('json-stable-stringify') - .dontMock('crypto') - .dontMock('../DependencyGraph/docblock') - .dontMock('../Module'); - -jest - .mock('fs'); +jest.mock('fs') + .mock('graceful-fs') + .mock('../ModuleCache') + .mock('../DependencyGraph/DependencyGraphHelpers') + .mock('../../lib/TransformCaching'); +console.log(require.resolve('../../lib/TransformCaching')); const Module = require('../Module'); const ModuleCache = require('../ModuleCache'); const DependencyGraphHelpers = require('../DependencyGraph/DependencyGraphHelpers'); const TransformCaching = require('../../lib/TransformCaching'); -const fs = require('graceful-fs'); +const fs = require('fs'); const packageJson = JSON.stringify({ diff --git a/packages/metro-bundler/src/node-haste/lib/__tests__/AssetPaths-test.js b/packages/metro-bundler/src/node-haste/lib/__tests__/AssetPaths-test.js index bdf3987e..97f4fea3 100644 --- a/packages/metro-bundler/src/node-haste/lib/__tests__/AssetPaths-test.js +++ b/packages/metro-bundler/src/node-haste/lib/__tests__/AssetPaths-test.js @@ -8,9 +8,6 @@ */ 'use strict'; -jest.dontMock('../parsePlatformFilePath') - .dontMock('../AssetPaths'); - var AssetPaths = require('../AssetPaths'); const TEST_PLATFORMS = new Set(['ios', 'android']); diff --git a/packages/metro-bundler/src/node-haste/lib/__tests__/MapWithDefaults-test.js b/packages/metro-bundler/src/node-haste/lib/__tests__/MapWithDefaults-test.js index efb122b3..f135e48d 100644 --- a/packages/metro-bundler/src/node-haste/lib/__tests__/MapWithDefaults-test.js +++ b/packages/metro-bundler/src/node-haste/lib/__tests__/MapWithDefaults-test.js @@ -11,8 +11,6 @@ 'use strict'; -jest.disableAutomock(); - const MapWithDefaults = require('../MapWithDefaults'); describe('MapWithDefaults', function() { diff --git a/packages/metro-bundler/src/node-haste/lib/__tests__/parsePlatformFilePath-test.js b/packages/metro-bundler/src/node-haste/lib/__tests__/parsePlatformFilePath-test.js index 967cdecc..7500f31c 100644 --- a/packages/metro-bundler/src/node-haste/lib/__tests__/parsePlatformFilePath-test.js +++ b/packages/metro-bundler/src/node-haste/lib/__tests__/parsePlatformFilePath-test.js @@ -8,8 +8,6 @@ */ 'use strict'; -jest.dontMock('../parsePlatformFilePath'); - var parsePlatformFilePath = require('../parsePlatformFilePath'); const TEST_PLATFORMS = new Set(['ios', 'android']);