Remove Node.js 4, and move skipOnWindows to scripts directory.

dotfold · Sep 3, 2016 · 8425a27 · 8425a27
1 parent a83dddf
commit 8425a27
Show file tree

Hide file tree

Showing 32 changed files with 35 additions and 33 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,6 @@
 environment:
   matrix:
-    - nodejs_version: "4"
+    #- nodejs_version: "4"
     - nodejs_version: "6"
 
 install:
@@ -12,10 +12,11 @@ install:
 
 test_script:
   - npm run build
-  # Hax - Some snapshot tests don't currently work on Windows, so the tests are
+  # Some snapshot tests don't currently work on Windows, so the tests are
   # commented out. Jest complains that obsolete snapshot files exist, so the
   # "-u" will just delete those snapshots when running in the AppVeyor run,
-  # instead of failing the build.
+  # instead of failing the build. Note that this means that all snapshot tests
+  # WILL ALWAYS PASS, as it updates the snapshots.
   - npm run jest -- -u --color
 
 # Don't actually build.

diff --git a/integration_tests/__tests__/babel-plugin-jest-hoist-test.js b/integration_tests/__tests__/babel-plugin-jest-hoist-test.js
@@ -12,7 +12,7 @@
 const {linkJestPackage, run} = require('../utils');
 const path = require('path');
 const runJest = require('../runJest');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 const DIR = path.resolve(__dirname, '..', 'babel-plugin-jest-hoist');
 

diff --git a/integration_tests/__tests__/config-test.js b/integration_tests/__tests__/config-test.js
@@ -10,7 +10,7 @@
 'use strict';
 
 const runJest = require('../runJest');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 skipOnWindows.suite();
 

diff --git a/integration_tests/__tests__/console-test.js b/integration_tests/__tests__/console-test.js
@@ -10,7 +10,7 @@
 'use strict';
 
 const runJest = require('../runJest');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 skipOnWindows.suite();
 

diff --git a/integration_tests/__tests__/coverage_report-test.js b/integration_tests/__tests__/coverage_report-test.js
@@ -13,7 +13,7 @@ const {linkJestPackage} = require('../utils');
 const runJest = require('../runJest');
 const fs = require('fs');
 const path = require('path');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 const DIR = path.resolve(__dirname, '../coverage_report');
 

diff --git a/integration_tests/__tests__/debug-test.js b/integration_tests/__tests__/debug-test.js
@@ -11,7 +11,7 @@
 const {linkJestPackage} = require('../utils');
 const path = require('path');
 const runJest = require('../runJest');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 describe('jest --debug', () => {
   skipOnWindows.suite();

diff --git a/integration_tests/__tests__/empty_suite_error-test.js b/integration_tests/__tests__/empty_suite_error-test.js
@@ -10,7 +10,7 @@
 
 const path = require('path');
 const runJest = require('../runJest');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 const DIR = path.resolve(__dirname, '../empty_suite_error');
 

diff --git a/integration_tests/__tests__/env-test.js b/integration_tests/__tests__/env-test.js
@@ -10,7 +10,7 @@
 'use strict';
 
 const runJest = require('../runJest');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 const getLog = result => result.stdout.toString().split('\n')[1].trim();
 

diff --git a/integration_tests/__tests__/failures-test.js b/integration_tests/__tests__/failures-test.js
@@ -10,7 +10,7 @@
 
 const path = require('path');
 const runJest = require('../runJest');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 const dir = path.resolve(__dirname, '../failures');
 

diff --git a/integration_tests/__tests__/jasmine_async-test.js b/integration_tests/__tests__/jasmine_async-test.js
@@ -9,7 +9,7 @@
 'use strict';
 
 const runJest = require('../runJest');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 describe('async jasmine', () => {
   skipOnWindows.suite();

diff --git a/integration_tests/__tests__/json_reporter-test.js b/integration_tests/__tests__/json_reporter-test.js
@@ -8,7 +8,7 @@
 'use strict';
 
 const runJest = require('../runJest');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 describe('JSON Reporter', () => {
   skipOnWindows.suite();

diff --git a/integration_tests/__tests__/no-test-found-test.js b/integration_tests/__tests__/no-test-found-test.js
@@ -10,7 +10,7 @@
 'use strict';
 
 const runJest = require('../runJest');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 describe('Coverage Report', () => {
   skipOnWindows.suite();

diff --git a/integration_tests/__tests__/regex-(char-in-path-test.js b/integration_tests/__tests__/regex-(char-in-path-test.js
@@ -10,7 +10,7 @@
 'use strict';
 
 const runJest = require('../runJest');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 describe('Regex Char In Path', () => {
   skipOnWindows.suite();

diff --git a/integration_tests/__tests__/set-immediate-test.js b/integration_tests/__tests__/set-immediate-test.js
@@ -10,7 +10,7 @@
 'use strict';
 
 const runJest = require('../runJest');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 skipOnWindows.suite();
 

diff --git a/integration_tests/__tests__/setup_test_framework_script_file_cli_config-test.js b/integration_tests/__tests__/setup_test_framework_script_file_cli_config-test.js
@@ -8,7 +8,7 @@
 'use strict';
 
 const runJest = require('../runJest');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 describe('--setupTestFrameworkScriptFile setup.js', () => {
   skipOnWindows.suite();

diff --git a/integration_tests/__tests__/snapshot-test.js b/integration_tests/__tests__/snapshot-test.js
@@ -12,7 +12,7 @@
 const fs = require('fs');
 const path = require('path');
 const runJest = require('../runJest');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 const emptyTest = 'describe("", () => {it("", () => {})})';
 const snapshotDir =

diff --git a/integration_tests/__tests__/stack_trace-test.js b/integration_tests/__tests__/stack_trace-test.js
@@ -8,7 +8,7 @@
 'use strict';
 
 const runJest = require('../runJest');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 describe('Stack Trace', () => {
   skipOnWindows.suite();

diff --git a/integration_tests/__tests__/testcheck-test.js b/integration_tests/__tests__/testcheck-test.js
@@ -9,7 +9,7 @@
 'use strict';
 
 const runJest = require('../runJest');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 describe('testcheck', () => {
   skipOnWindows.suite();

diff --git a/integration_tests/__tests__/transform-test.js b/integration_tests/__tests__/transform-test.js
@@ -11,7 +11,7 @@
 const {linkJestPackage, run} = require('../utils');
 const path = require('path');
 const runJest = require('../runJest');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 describe('babel-jest', () => {
   skipOnWindows.suite();

diff --git a/integration_tests/__tests__/typescript-coverage-test.js b/integration_tests/__tests__/typescript-coverage-test.js
@@ -11,7 +11,7 @@
 const {run} = require('../utils');
 const path = require('path');
 const runJest = require('../runJest');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 skipOnWindows.suite();
 

diff --git a/integration_tests/__tests__/verbose-test.js b/integration_tests/__tests__/verbose-test.js
@@ -10,7 +10,7 @@
 'use strict';
 
 const runJest = require('../runJest');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 skipOnWindows.suite();
 

diff --git a/packages/jest-cli/src/__tests__/SearchSource-test.js b/packages/jest-cli/src/__tests__/SearchSource-test.js
@@ -12,7 +12,7 @@
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 15000;
 
 const path = require('path');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 const rootDir = path.resolve(__dirname, 'test_root');
 const testRegex = path.sep + '__testtests__' + path.sep;

diff --git a/packages/jest-haste-map/src/__tests__/index-test.js b/packages/jest-haste-map/src/__tests__/index-test.js
@@ -9,7 +9,7 @@
  */
 'use strict';
 
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 jest.mock('child_process', () => ({
   // If this does not throw, we'll use the (mocked) watchman crawler

diff --git a/packages/jest-haste-map/src/__tests__/worker-test.js b/packages/jest-haste-map/src/__tests__/worker-test.js
@@ -10,7 +10,7 @@
 'use strict';
 
 const H = require('../constants');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 const worker = require('../worker');
 
 const fs = require('graceful-fs');

diff --git a/packages/jest-haste-map/src/crawlers/__tests__/node-test.js b/packages/jest-haste-map/src/crawlers/__tests__/node-test.js
@@ -9,7 +9,7 @@
  */
 'use strict';
 
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 jest.mock('child_process', () => ({
   spawn: jest.fn((cmd, args) => {

diff --git a/packages/jest-haste-map/src/crawlers/__tests__/watchman-test.js b/packages/jest-haste-map/src/crawlers/__tests__/watchman-test.js
@@ -9,7 +9,7 @@
  */
 'use strict';
 
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 jest.mock('fb-watchman', () => {
   const Client = jest.fn();

diff --git a/packages/jest-matchers/src/__tests__/toThrowMatchers-test.js b/packages/jest-matchers/src/__tests__/toThrowMatchers-test.js
@@ -12,7 +12,7 @@
 
 const jestExpect = require('../').expect;
 const matchErrorSnapshot = require('./_matchErrorSnapshot');
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 // Custom Error class because node versions have different stack trace strings.
 class Error {

diff --git a/packages/jest-repl/src/__tests__/jest-repl-test.js b/packages/jest-repl/src/__tests__/jest-repl-test.js
@@ -9,7 +9,7 @@
  */
 'use strict';
 
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 const spawnSync = require('child_process').spawnSync;
 const path = require('path');
 

diff --git a/packages/jest-runtime/src/__tests__/Runtime-cli-test.js b/packages/jest-runtime/src/__tests__/Runtime-cli-test.js
@@ -9,7 +9,7 @@
  */
 'use strict';
 
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 const spawnSync = require('child_process').spawnSync;
 const path = require('path');
 

diff --git a/packages/jest-runtime/src/__tests__/transform-test.js b/packages/jest-runtime/src/__tests__/transform-test.js
@@ -9,7 +9,7 @@
  */
 'use strict';
 
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 jest
   .mock('graceful-fs')

diff --git a/packages/jest-util/src/__tests__/FakeTimers-test.js b/packages/jest-util/src/__tests__/FakeTimers-test.js
@@ -9,7 +9,7 @@
  */
 'use strict';
 
-const skipOnWindows = require('jest-util/build/skipOnWindows');
+const skipOnWindows = require('skipOnWindows');
 
 describe('FakeTimers', () => {
   let FakeTimers;

diff --git a/packages/jest-util/src/skipOnWindows.js → scripts/skipOnWindows.js b/packages/jest-util/src/skipOnWindows.js → scripts/skipOnWindows.js
@@ -6,6 +6,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  *
  * @flow
+ * @providesModule skipOnWindows
  */
 'use strict';
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ @@
      * of patent rights can be found in the PATENTS file in the same directory.
      *
      * @flow
+     * @providesModule skipOnWindows
      */
     'use strict';
@@ Expand Down @@