Skip to content

Commit

Permalink
Scripts standardize file names: Fix file names in scripts directory (#…
Browse files Browse the repository at this point in the history
…5511)

* remove _runCommand script as there is no usage for it anymore

* rename _getPackage -> getPackages to follow naming convention

* rename skip_on_windows -> SkipOnWindows to follow naming convention
  • Loading branch information
ranyitz authored and cpojer committed Feb 10, 2018
1 parent c5a2ea0 commit 95c7e5e
Show file tree
Hide file tree
Showing 49 changed files with 46 additions and 75 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
'use strict';

const path = require('path');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {run} = require('../utils');
const runJest = require('../runJest');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'use strict';

const path = require('path');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {extractSummary, cleanup, writeFiles} = require('../utils');
const runJest = require('../runJest');

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/compare_dom_nodes.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/
'use strict';

const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const runJest = require('../runJest');

skipOnWindows.suite();
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/console.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

'use strict';

const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {extractSummary} = require('../utils');
const runJest = require('../runJest');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'use strict';

const path = require('path');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {extractSummary, cleanup, writeFiles} = require('../utils');
const runJest = require('../runJest');

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/coverage_remapping.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

const {readFileSync} = require('fs');
const path = require('path');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {cleanup, run} = require('../utils');
const runJest = require('../runJest');

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/coverage_report.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

const fs = require('fs');
const path = require('path');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {extractSummary} = require('../utils');
const runJest = require('../runJest');

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/coverage_threshold.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'use strict';

const path = require('path');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {cleanup, writeFiles} = require('../utils');
const runJest = require('../runJest');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

const runJest = require('../runJest');
const {extractSummary} = require('../utils');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');

skipOnWindows.suite();

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/custom_reporters.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/
'use strict';

const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {cleanup, extractSummary, writeFiles} = require('../utils');
const runJest = require('../runJest');
const os = require('os');
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/debug.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

const path = require('path');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const runJest = require('../runJest');

describe('jest --debug', () => {
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/execute-tests-once-in-mpr.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'use strict';

const path = require('path');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {extractSummary, cleanup, writeFiles} = require('../utils');
const runJest = require('../runJest');

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/failures.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

const path = require('path');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {extractSummary} = require('../utils');
const runJest = require('../runJest');

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/find_related_files.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import path from 'path';

const {cleanup, writeFiles} = require('../utils');

const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const DIR = path.resolve(os.tmpdir(), 'find_related_tests_test');

skipOnWindows.suite();
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/force_exit.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import os from 'os';
import path from 'path';
const {cleanup, writeFiles} = require('../utils');

const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const DIR = path.resolve(os.tmpdir(), 'force_exit_test');

skipOnWindows.suite();
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/globals.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

const path = require('path');
const os = require('os');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const runJest = require('../runJest');
const {extractSummary} = require('../utils');
const {createEmptyPackage, writeFiles, cleanup} = require('../utils');
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/jest.config.js.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'use strict';

const path = require('path');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {extractSummary, cleanup, writeFiles} = require('../utils');
const runJest = require('../runJest');

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/jest_changed_files.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
findRepos,
getChangedFilesForRoots,
} from '../../packages/jest-changed-files/src';
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {cleanup, run, writeFiles} = require('../utils');

skipOnWindows.suite();
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/jest_require_actual.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

const path = require('path');
const os = require('os');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {cleanup, writeFiles} = require('../utils');
const runJest = require('../runJest');

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/jest_require_mock.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

const path = require('path');
const os = require('os');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {cleanup, writeFiles} = require('../utils');
const runJest = require('../runJest');

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/log_heap_usage.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

const path = require('path');
const os = require('os');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {cleanup, writeFiles} = require('../utils');
const runJest = require('../runJest');

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/module_name_mapper.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

const runJest = require('../runJest');
const {extractSummary} = require('../utils');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');

// Works on windows, we just need to adjust snapshot test output
skipOnWindows.suite();
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/multi_project_runner.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import os from 'os';
import path from 'path';

const {cleanup, extractSummary, writeFiles} = require('../utils');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const DIR = path.resolve(os.tmpdir(), 'multi_project_runner_test');

skipOnWindows.suite();
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/native_async_mock.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'use strict';

const path = require('path');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {run, extractSummary} = require('../utils');
const runJest = require('../runJest');

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/regex_(char_in_path.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/
'use strict';

const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const runJest = require('../runJest');

describe('Regex Char In Path', () => {
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/run_tests_by_path.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import os from 'os';
import path from 'path';
const {cleanup, writeFiles} = require('../utils');

const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const DIR = path.resolve(os.tmpdir(), 'run_tests_by_path_test');

skipOnWindows.suite();
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/show_config.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'use strict';

const path = require('path');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const runJest = require('../runJest');
const os = require('os');
const {cleanup, writeFiles} = require('../utils');
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/snapshot.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const path = require('path');
const {extractSummary} = require('../utils');
const runJest = require('../runJest');

const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
skipOnWindows.suite();

const emptyTest = 'describe("", () => {it("", () => {})})';
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/test_failure_exit_code.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

const path = require('path');
const os = require('os');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {cleanup, writeFiles} = require('../utils');
const runJest = require('../runJest');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import os from 'os';
import path from 'path';
const {cleanup, writeFiles} = require('../utils');

const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const DIR = path.resolve(os.tmpdir(), 'jest_path_pattern_reporter_message');

skipOnWindows.suite();
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/timeouts.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
'use strict';

const path = require('path');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {extractSummary, cleanup, writeFiles} = require('../utils');
const runJest = require('../runJest');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

'use strict';

const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const runJest = require('../runJest');

skipOnWindows.suite();
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/transform.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

const path = require('path');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {
run,
cleanup,
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/typescript_coverage.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

const path = require('path');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {run} = require('../utils');
const runJest = require('../runJest');

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/use_stderr.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import os from 'os';
import path from 'path';
const {cleanup, writeFiles} = require('../utils');

const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const DIR = path.resolve(os.tmpdir(), 'use_stderr_test');

skipOnWindows.suite();
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/__tests__/version.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

const path = require('path');
const os = require('os');
const skipOnWindows = require('../../scripts/skip_on_windows');
const skipOnWindows = require('../../scripts/SkipOnWindows');
const {cleanup, writeFiles} = require('../utils');
const runJest = require('../runJest');

Expand Down
2 changes: 1 addition & 1 deletion packages/expect/src/__tests__/assertion_counts.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

const jestExpect = require('../');

const skipOnWindows = require('../../../../scripts/skip_on_windows');
const skipOnWindows = require('../../../../scripts/SkipOnWindows');

describe('.assertions()', () => {
it('does not throw', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-cli/src/__tests__/search_source.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import path from 'path';

jest.setTimeout(15000);

const skipOnWindows = require('../../../../scripts/skip_on_windows');
const skipOnWindows = require('../../../../scripts/SkipOnWindows');

const rootDir = path.resolve(__dirname, 'test_root');
const testRegex = path.sep + '__testtests__' + path.sep;
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-haste-map/src/__tests__/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jest.mock('graceful-fs', () => ({
}));
jest.mock('fs', () => require('graceful-fs'));

const skipOnWindows = require('../../../../scripts/skip_on_windows');
const skipOnWindows = require('../../../../scripts/SkipOnWindows');

const cacheFilePath = '/cache-file';
let consoleWarn;
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-haste-map/src/__tests__/worker.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import path from 'path';
import fs from 'graceful-fs';
import skipOnWindows from '../../../../scripts/skip_on_windows';
import skipOnWindows from '../../../../scripts/SkipOnWindows';

import H from '../constants';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

'use strict';

const skipOnWindows = require('../../../../../scripts/skip_on_windows');
const skipOnWindows = require('../../../../../scripts/SkipOnWindows');

jest.mock('child_process', () => ({
spawn: jest.fn((cmd, args) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

'use strict';

const skipOnWindows = require('../../../../../scripts/skip_on_windows');
const skipOnWindows = require('../../../../../scripts/SkipOnWindows');

jest.mock('fb-watchman', () => {
const Client = jest.fn();
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-repl/src/__tests__/jest_repl.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

const {spawnSync} = require('child_process');
const path = require('path');
const skipOnWindows = require('../../../../scripts/skip_on_windows');
const skipOnWindows = require('../../../../scripts/SkipOnWindows');

const JEST_RUNTIME = path.resolve(__dirname, '../../bin/jest-repl.js');

Expand Down
2 changes: 1 addition & 1 deletion packages/jest-runtime/src/__tests__/runtime_cli.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

const path = require('path');
const {sync: spawnSync} = require('cross-spawn');
const skipOnWindows = require('../../../../scripts/skip_on_windows');
const skipOnWindows = require('../../../../scripts/SkipOnWindows');

skipOnWindows.suite();

Expand Down
File renamed without changes.

0 comments on commit 95c7e5e

Please sign in to comment.