diff --git a/local-cli/core/__fixtures__/mockFSWorkaround.js b/local-cli/core/__fixtures__/mockFSWorkaround.js deleted file mode 100644 index c045ae4fbca..00000000000 --- a/local-cli/core/__fixtures__/mockFSWorkaround.js +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright (c) 2013-present, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. - * - * @format - */ - -'use strict'; - -const fs = require('fs'); -const mockFS = require('mock-fs'); - -/** - * @see https://github.com/tschaub/mock-fs/issues/208 - */ -mockFS(); -if (!fs.statSync(process.cwd()).isDirectory()) { - test.only('skipping tests because of mock-fs bug in Node v8.x.x', () => {}); -} -mockFS.restore(); diff --git a/local-cli/core/__tests__/android/findManifest.spec.js b/local-cli/core/__tests__/android/findManifest.spec.js index 9bc683fd7b9..032aa394f3f 100644 --- a/local-cli/core/__tests__/android/findManifest.spec.js +++ b/local-cli/core/__tests__/android/findManifest.spec.js @@ -11,8 +11,6 @@ 'use strict'; -require('../../__fixtures__/mockFSWorkaround'); - const findManifest = require('../../android/findManifest'); const mockFS = require('mock-fs'); const mocks = require('../../__fixtures__/android'); diff --git a/local-cli/core/__tests__/android/findPackageClassName.spec.js b/local-cli/core/__tests__/android/findPackageClassName.spec.js index 234a93a5f87..5c518918401 100644 --- a/local-cli/core/__tests__/android/findPackageClassName.spec.js +++ b/local-cli/core/__tests__/android/findPackageClassName.spec.js @@ -11,8 +11,6 @@ 'use strict'; -require('../../__fixtures__/mockFSWorkaround'); - const findPackageClassName = require('../../android/findPackageClassName'); const mockFS = require('mock-fs'); const mocks = require('../../__fixtures__/android'); diff --git a/local-cli/core/__tests__/android/getDependencyConfig.spec.js b/local-cli/core/__tests__/android/getDependencyConfig.spec.js index d44c0bfc591..1923327dfd0 100644 --- a/local-cli/core/__tests__/android/getDependencyConfig.spec.js +++ b/local-cli/core/__tests__/android/getDependencyConfig.spec.js @@ -11,8 +11,6 @@ 'use strict'; -require('../../__fixtures__/mockFSWorkaround'); - const getDependencyConfig = require('../../android').dependencyConfig; const mockFS = require('mock-fs'); const mocks = require('../../__fixtures__/android'); diff --git a/local-cli/core/__tests__/android/getProjectConfig.spec.js b/local-cli/core/__tests__/android/getProjectConfig.spec.js index e025a11c7bc..a6395244fb9 100644 --- a/local-cli/core/__tests__/android/getProjectConfig.spec.js +++ b/local-cli/core/__tests__/android/getProjectConfig.spec.js @@ -11,8 +11,6 @@ 'use strict'; -require('../../__fixtures__/mockFSWorkaround'); - const getProjectConfig = require('../../android').projectConfig; const mockFS = require('mock-fs'); const mocks = require('../../__fixtures__/android'); diff --git a/local-cli/core/__tests__/android/readManifest.spec.js b/local-cli/core/__tests__/android/readManifest.spec.js index 01e65589893..dd88c960ec8 100644 --- a/local-cli/core/__tests__/android/readManifest.spec.js +++ b/local-cli/core/__tests__/android/readManifest.spec.js @@ -11,8 +11,6 @@ 'use strict'; -require('../../__fixtures__/mockFSWorkaround'); - const findManifest = require('../../android/findManifest'); const readManifest = require('../../android/readManifest'); const mockFS = require('mock-fs'); diff --git a/local-cli/core/__tests__/ios/findProject.spec.js b/local-cli/core/__tests__/ios/findProject.spec.js index 2e4067116c8..1000f9733fb 100644 --- a/local-cli/core/__tests__/ios/findProject.spec.js +++ b/local-cli/core/__tests__/ios/findProject.spec.js @@ -11,8 +11,6 @@ 'use strict'; -require('../../__fixtures__/mockFSWorkaround'); - const findProject = require('../../ios/findProject'); const mockFS = require('mock-fs'); const projects = require('../../__fixtures__/projects'); diff --git a/local-cli/core/__tests__/ios/getProjectConfig.spec.js b/local-cli/core/__tests__/ios/getProjectConfig.spec.js index e6d2eb9005a..7b77f845201 100644 --- a/local-cli/core/__tests__/ios/getProjectConfig.spec.js +++ b/local-cli/core/__tests__/ios/getProjectConfig.spec.js @@ -11,8 +11,6 @@ 'use strict'; -require('../../__fixtures__/mockFSWorkaround'); - const getProjectConfig = require('../../ios').projectConfig; const mockFS = require('mock-fs'); const projects = require('../../__fixtures__/projects'); diff --git a/package.json b/package.json index 079e5f0b89e..be136ab8b19 100644 --- a/package.json +++ b/package.json @@ -230,7 +230,7 @@ "jest": "^20.0.4", "jest-repl": "^20.0.4", "jest-runtime": "^20.0.4", - "mock-fs": "^4.3.0", + "mock-fs": "^4.4.1", "react": "16.0.0-alpha.12", "react-test-renderer": "16.0.0-alpha.12", "shelljs": "0.6.0",