From 435298ddba36ce081915d7d626068c97358e7fe0 Mon Sep 17 00:00:00 2001 From: Michael Baldwin Date: Fri, 9 Feb 2018 20:58:49 -0500 Subject: [PATCH 1/3] standardize file names in integration-tests - updated tests - added to changelog --- CHANGELOG.md | 2 ++ integration-tests/{utils.js => Utils.js} | 0 .../coverage_report.test.js.snap | 32 +++++++++---------- .../__snapshots__/transform.test.js.snap | 4 +-- .../__tests__/babel_plugin_jest_hoist.test.js | 2 +- .../cli-accepts-exact-filenames.test.js | 2 +- integration-tests/__tests__/console.test.js | 2 +- ...onsole_log_output_when_run_in_band.test.js | 2 +- .../__tests__/coverage_remapping.test.js | 2 +- .../__tests__/coverage_report.test.js | 18 +++++------ .../__tests__/coverage_threshold.test.js | 2 +- .../custom_matcher_stack_trace.test.js | 2 +- .../__tests__/custom_reporters.test.js | 13 +++----- .../__tests__/execute-tests-once-in-mpr.js | 2 +- integration-tests/__tests__/failures.test.js | 2 +- .../__tests__/find_related_files.test.js | 2 +- .../__tests__/force_exit.test.js | 2 +- .../__tests__/global_setup.test.js | 2 +- .../__tests__/global_teardown.test.js | 2 +- integration-tests/__tests__/globals.test.js | 4 +-- .../__tests__/jest.config.js.test.js | 2 +- .../__tests__/jest_changed_files.test.js | 2 +- .../__tests__/jest_require_actual.test.js | 2 +- .../__tests__/jest_require_mock.test.js | 2 +- .../__tests__/log_heap_usage.test.js | 2 +- .../__tests__/module_name_mapper.test.js | 2 +- .../__tests__/multi_project_runner.test.js | 2 +- .../__tests__/native_async_mock.test.js | 2 +- .../__tests__/only_changed.test.js | 2 +- .../__tests__/run_tests_by_path.test.js | 2 +- .../__tests__/show_config.test.js | 2 +- integration-tests/__tests__/snapshot.test.js | 2 +- .../__tests__/snapshot_serializers.test.js | 2 +- .../__tests__/stack_trace.test.js | 2 +- .../__tests__/test_environment_async.test.js | 2 +- .../__tests__/test_failure_exit_code.test.js | 2 +- .../__tests__/test_name_pattern.test.js | 2 +- ...test_path_pattern_reporter_message.test.js | 2 +- integration-tests/__tests__/timeouts.test.js | 2 +- .../__tests__/to_match_snapshot.test.js | 2 +- .../to_throw_error_matching_snapshot.test.js | 2 +- integration-tests/__tests__/transform.test.js | 12 +++---- .../__tests__/typescript_coverage.test.js | 2 +- .../__tests__/use_stderr.test.js | 2 +- integration-tests/__tests__/version.test.js | 2 +- ...processor.js => TypescriptPreprocessor.js} | 0 .../coverage-remapping/package.json | 2 +- .../{other-file.js => OtherFile.js} | 0 .../coverage-report/{sum.js => Sum.js} | 4 +-- .../{sum_dependency.js => SumDependency.js} | 0 .../{sum_dependency.js => SumDependency.js} | 0 .../__tests__/{sum.test.js => Sum.test.js} | 4 +-- .../a/{identical.js => Identical.js} | 0 .../{identical.test.js => Identical.test.js} | 2 +- .../b/{identical.js => Identical.js} | 0 .../{identical.test.js => Identical.test.js} | 2 +- ...est-suite.js => notRequiredInTestSuite.js} | 0 .../custom-reporters/package.json | 2 +- ...lete_reporter.js => IncompleteReporter.js} | 0 .../{test_reporter.js => TestReporter.js} | 0 .../{native.js => Native.js} | 0 .../__tests__/native_async_mock.test.js | 4 +-- integration-tests/runJest.js | 2 +- .../{transformer.js => Transformer.js} | 0 .../{utils.js => Utils.js} | 0 .../snapshot-serializers/package.json | 2 +- .../snapshot-serializers/plugins/bar.js | 2 +- .../snapshot-serializers/plugins/foo/index.js | 2 +- ...test-environment.js => TestEnvironment.js} | 0 .../test-environment-async/package.json | 2 +- .../{preprocessor.js => Preprocessor.js} | 0 .../transform-linked-modules/package.json | 2 +- .../{not-covered.js => NotCovered.js} | 0 .../babel-jest/__tests__/babel_jest.test.js | 2 +- .../transform/babel-jest/package.json | 6 ++-- .../{covered.js => Covered.js} | 0 ...om-coverage.js => ExcludedFromCoverage.js} | 4 +-- .../{preprocessor.js => Preprocessor.js} | 0 .../package.json | 2 +- .../src/index.js | 2 +- .../{some-other-file.js => someOtherFile.js} | 0 ...{cssPreprocessor.js => CssPreprocessor.js} | 0 ...ilePreprocessor.js => FilePreprocessor.js} | 0 .../{jsPreprocessor.js => JsPreprocessor.js} | 0 .../multiple-transformers/package.json | 6 ++-- .../__tests__/passes-with-no-babel-jest.js | 2 +- .../transform/no-babel-jest/package.json | 6 ++-- .../{covered.js => Covered.js} | 0 ...om-coverage.js => ExcludedFromCoverage.js} | 2 +- ...processor.js => TypescriptPreprocessor.js} | 0 .../typescript-coverage/package.json | 2 +- .../src/__tests__/resolve_config_path.test.js | 2 +- packages/jest-config/src/valid_config.js | 2 +- .../src/__tests__/fixtures/jest_config.js | 2 +- 94 files changed, 115 insertions(+), 116 deletions(-) rename integration-tests/{utils.js => Utils.js} (100%) rename integration-tests/coverage-remapping/{typescript-preprocessor.js => TypescriptPreprocessor.js} (100%) rename integration-tests/coverage-report/{other-file.js => OtherFile.js} (100%) rename integration-tests/coverage-report/{sum.js => Sum.js} (86%) rename integration-tests/coverage-report/{sum_dependency.js => SumDependency.js} (100%) rename integration-tests/coverage-report/__mocks__/{sum_dependency.js => SumDependency.js} (100%) rename integration-tests/coverage-report/__tests__/{sum.test.js => Sum.test.js} (80%) rename integration-tests/coverage-report/cached-duplicates/a/{identical.js => Identical.js} (100%) rename integration-tests/coverage-report/cached-duplicates/a/__tests__/{identical.test.js => Identical.test.js} (88%) rename integration-tests/coverage-report/cached-duplicates/b/{identical.js => Identical.js} (100%) rename integration-tests/coverage-report/cached-duplicates/b/__tests__/{identical.test.js => Identical.test.js} (88%) rename integration-tests/coverage-report/{not-required-in-test-suite.js => notRequiredInTestSuite.js} (100%) rename integration-tests/custom-reporters/reporters/{incomplete_reporter.js => IncompleteReporter.js} (100%) rename integration-tests/custom-reporters/reporters/{test_reporter.js => TestReporter.js} (100%) rename integration-tests/native-async-mock/{native.js => Native.js} (100%) rename integration-tests/snapshot-serializers/{transformer.js => Transformer.js} (100%) rename integration-tests/snapshot-serializers/{utils.js => Utils.js} (100%) rename integration-tests/test-environment-async/{test-environment.js => TestEnvironment.js} (100%) rename integration-tests/transform-linked-modules/{preprocessor.js => Preprocessor.js} (100%) rename integration-tests/transform/babel-jest/{not-covered.js => NotCovered.js} (100%) rename integration-tests/transform/babel-jest/this-directory-is-covered/{covered.js => Covered.js} (100%) rename integration-tests/transform/babel-jest/this-directory-is-covered/{excluded-from-coverage.js => ExcludedFromCoverage.js} (87%) rename integration-tests/transform/custom-instrumenting-preprocessor/{preprocessor.js => Preprocessor.js} (100%) rename integration-tests/transform/custom-instrumenting-preprocessor/src/{some-other-file.js => someOtherFile.js} (100%) rename integration-tests/transform/multiple-transformers/{cssPreprocessor.js => CssPreprocessor.js} (100%) rename integration-tests/transform/multiple-transformers/{filePreprocessor.js => FilePreprocessor.js} (100%) rename integration-tests/transform/multiple-transformers/{jsPreprocessor.js => JsPreprocessor.js} (100%) rename integration-tests/transform/no-babel-jest/this-directory-is-covered/{covered.js => Covered.js} (100%) rename integration-tests/transform/no-babel-jest/this-directory-is-covered/{excluded-from-coverage.js => ExcludedFromCoverage.js} (93%) rename integration-tests/typescript-coverage/{typescript-preprocessor.js => TypescriptPreprocessor.js} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index fae564f6a8d4..1f9aa036b0f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,8 @@ * `[jest-config]` Allow `` to be used with `collectCoverageFrom` ([#5524](https://github.com/facebook/jest/pull/5524)) +* `[filenames]` Standardize files names in "integration-tests" folder ([#5513](https://github.com/facebook/jest/pull/5513)) + ## jest 22.2.2 diff --git a/integration-tests/utils.js b/integration-tests/Utils.js similarity index 100% rename from integration-tests/utils.js rename to integration-tests/Utils.js diff --git a/integration-tests/__tests__/__snapshots__/coverage_report.test.js.snap b/integration-tests/__tests__/__snapshots__/coverage_report.test.js.snap index 8b586d9c054c..109d957bb519 100644 --- a/integration-tests/__tests__/__snapshots__/coverage_report.test.js.snap +++ b/integration-tests/__tests__/__snapshots__/coverage_report.test.js.snap @@ -6,21 +6,21 @@ File | % Stmts | % Branch | % Funcs | % Lines |Uncovered Lines | ---------------|----------|----------|----------|----------|----------------| All files | 100 | 100 | 100 | 100 | | a | 100 | 100 | 100 | 100 | | - identical.js | 100 | 100 | 100 | 100 | | + Identical.js | 100 | 100 | 100 | 100 | | b | 100 | 100 | 100 | 100 | | - identical.js | 100 | 100 | 100 | 100 | | + Identical.js | 100 | 100 | 100 | 100 | | ---------------|----------|----------|----------|----------|----------------| " `; exports[`collects coverage only from multiple specified files 1`] = ` -"---------------|----------|----------|----------|----------|----------------| -File | % Stmts | % Branch | % Funcs | % Lines |Uncovered Lines | ----------------|----------|----------|----------|----------|----------------| -All files | 100 | 100 | 100 | 100 | | - other-file.js | 100 | 100 | 100 | 100 | | - setup.js | 100 | 100 | 100 | 100 | | ----------------|----------|----------|----------|----------|----------------| +"--------------|----------|----------|----------|----------|----------------| +File | % Stmts | % Branch | % Funcs | % Lines |Uncovered Lines | +--------------|----------|----------|----------|----------|----------------| +All files | 100 | 100 | 100 | 100 | | + OtherFile.js | 100 | 100 | 100 | 100 | | + setup.js | 100 | 100 | 100 | 100 | | +--------------|----------|----------|----------|----------|----------------| " `; @@ -39,7 +39,7 @@ exports[`collects coverage only from specified files avoiding dependencies 1`] = File | % Stmts | % Branch | % Funcs | % Lines |Uncovered Lines | ----------|----------|----------|----------|----------|----------------| All files | 85.71 | 100 | 50 | 85.71 | | - sum.js | 85.71 | 100 | 50 | 85.71 | 12 | + Sum.js | 85.71 | 100 | 50 | 85.71 | 12 | ----------|----------|----------|----------|----------|----------------| " `; @@ -59,14 +59,14 @@ File | % Stmts | % Branch | % Funcs | % Lines -------------------------------------|----------|----------|----------|----------|----------------| All files | 56.52 | 0 | 50 | 56.52 | | coverage-report | 41.18 | 0 | 25 | 41.18 | | - not-required-in-test-suite.js | 0 | 0 | 0 | 0 | 8,15,16,17,19 | - other-file.js | 100 | 100 | 100 | 100 | | - sum.js | 85.71 | 100 | 50 | 85.71 | 12 | - sum_dependency.js | 0 | 0 | 0 | 0 | 8,10,11,14 | + OtherFile.js | 100 | 100 | 100 | 100 | | + Sum.js | 85.71 | 100 | 50 | 85.71 | 12 | + SumDependency.js | 0 | 0 | 0 | 0 | 8,10,11,14 | + notRequiredInTestSuite.js | 0 | 0 | 0 | 0 | 8,15,16,17,19 | coverage-report/cached-duplicates/a | 100 | 100 | 100 | 100 | | - identical.js | 100 | 100 | 100 | 100 | | + Identical.js | 100 | 100 | 100 | 100 | | coverage-report/cached-duplicates/b | 100 | 100 | 100 | 100 | | - identical.js | 100 | 100 | 100 | 100 | | + Identical.js | 100 | 100 | 100 | 100 | | -------------------------------------|----------|----------|----------|----------|----------------| " `; diff --git a/integration-tests/__tests__/__snapshots__/transform.test.js.snap b/integration-tests/__tests__/__snapshots__/transform.test.js.snap index f459ecdc5448..dac9f1bc9999 100644 --- a/integration-tests/__tests__/__snapshots__/transform.test.js.snap +++ b/integration-tests/__tests__/__snapshots__/transform.test.js.snap @@ -5,7 +5,7 @@ exports[`babel-jest instruments only specific files and collects coverage 1`] = File | % Stmts | % Branch | % Funcs | % Lines |Uncovered Lines | ------------|----------|----------|----------|----------|----------------| All files | 83.33 | 100 | 50 | 83.33 | | - covered.js | 83.33 | 100 | 50 | 83.33 | 15 | + Covered.js | 83.33 | 100 | 50 | 83.33 | 15 | ------------|----------|----------|----------|----------|----------------| " `; @@ -24,7 +24,7 @@ exports[`no babel-jest instrumentation with no babel-jest 1`] = ` File | % Stmts | % Branch | % Funcs | % Lines |Uncovered Lines | ------------|----------|----------|----------|----------|----------------| All files | 83.33 | 100 | 50 | 83.33 | | - covered.js | 83.33 | 100 | 50 | 83.33 | 15 | + Covered.js | 83.33 | 100 | 50 | 83.33 | 15 | ------------|----------|----------|----------|----------|----------------| " `; diff --git a/integration-tests/__tests__/babel_plugin_jest_hoist.test.js b/integration-tests/__tests__/babel_plugin_jest_hoist.test.js index e7493473a222..bb4d0b76ea7f 100644 --- a/integration-tests/__tests__/babel_plugin_jest_hoist.test.js +++ b/integration-tests/__tests__/babel_plugin_jest_hoist.test.js @@ -9,7 +9,7 @@ 'use strict'; const path = require('path'); -const {run} = require('../utils'); +const {run} = require('../Utils'); const runJest = require('../runJest'); const DIR = path.resolve(__dirname, '..', 'babel-plugin-jest-hoist'); diff --git a/integration-tests/__tests__/cli-accepts-exact-filenames.test.js b/integration-tests/__tests__/cli-accepts-exact-filenames.test.js index 41bc746e7c32..083c6cc1b278 100644 --- a/integration-tests/__tests__/cli-accepts-exact-filenames.test.js +++ b/integration-tests/__tests__/cli-accepts-exact-filenames.test.js @@ -11,7 +11,7 @@ const path = require('path'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); -const {extractSummary, cleanup, writeFiles} = require('../utils'); +const {extractSummary, cleanup, writeFiles} = require('../Utils'); const runJest = require('../runJest'); const DIR = path.resolve(__dirname, '../cli_accepts_exact_filenames'); diff --git a/integration-tests/__tests__/console.test.js b/integration-tests/__tests__/console.test.js index d90eec70ffd1..f1870d5042b7 100644 --- a/integration-tests/__tests__/console.test.js +++ b/integration-tests/__tests__/console.test.js @@ -10,7 +10,7 @@ 'use strict'; const SkipOnWindows = require('../../scripts/SkipOnWindows'); -const {extractSummary} = require('../utils'); +const {extractSummary} = require('../Utils'); const runJest = require('../runJest'); SkipOnWindows.suite(); diff --git a/integration-tests/__tests__/console_log_output_when_run_in_band.test.js b/integration-tests/__tests__/console_log_output_when_run_in_band.test.js index e9c95ba4152c..73b7a90c5e51 100644 --- a/integration-tests/__tests__/console_log_output_when_run_in_band.test.js +++ b/integration-tests/__tests__/console_log_output_when_run_in_band.test.js @@ -11,7 +11,7 @@ const path = require('path'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); -const {extractSummary, cleanup, writeFiles} = require('../utils'); +const {extractSummary, cleanup, writeFiles} = require('../Utils'); const runJest = require('../runJest'); const DIR = path.resolve(__dirname, '../console_log_output_when_run_in_band'); diff --git a/integration-tests/__tests__/coverage_remapping.test.js b/integration-tests/__tests__/coverage_remapping.test.js index 390a14a9a135..44cf0fd77a77 100644 --- a/integration-tests/__tests__/coverage_remapping.test.js +++ b/integration-tests/__tests__/coverage_remapping.test.js @@ -12,7 +12,7 @@ const {readFileSync} = require('fs'); const path = require('path'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); -const {cleanup, run} = require('../utils'); +const {cleanup, run} = require('../Utils'); const runJest = require('../runJest'); const dir = path.resolve(__dirname, '../coverage-remapping'); diff --git a/integration-tests/__tests__/coverage_report.test.js b/integration-tests/__tests__/coverage_report.test.js index ae52de826ae5..136ead1c3b21 100644 --- a/integration-tests/__tests__/coverage_report.test.js +++ b/integration-tests/__tests__/coverage_report.test.js @@ -11,7 +11,7 @@ const fs = require('fs'); const path = require('path'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); -const {extractSummary} = require('../utils'); +const {extractSummary} = require('../Utils'); const runJest = require('../runJest'); const DIR = path.resolve(__dirname, '../coverage-report'); @@ -23,9 +23,9 @@ test('outputs coverage report', () => { const coverageDir = path.resolve(__dirname, '../coverage-report/coverage'); // - the `setup.js` file is ignored and should not be in the coverage report. - // - `sum_dependency.js` is mocked and the real module is never required but + // - `SumDependency.js` is mocked and the real module is never required but // is listed with 0 % coverage. - // - `not-required-in-test-suite.js` is not required but it is listed + // - `notRequiredInTestSuite.js` is not required but it is listed // with 0 % coverage. expect(stdout).toMatchSnapshot(); @@ -51,7 +51,7 @@ test('collects coverage only from multiple specified files', () => { '--coverage', '--collectCoverageFrom', // overwrites the one in package.json 'setup.js', - 'other-file.js', + 'OtherFile.js', ]); expect(stdout).toMatchSnapshot(); @@ -62,9 +62,9 @@ test('collects coverage only from specified files avoiding dependencies', () => '--no-cache', '--coverage', '--collectCoverageOnlyFrom', - 'sum.js', + 'Sum.js', '--', - 'sum.test.js', + 'Sum.test.js', ]); // Coverage report should only have `sum.js` coverage info @@ -98,11 +98,11 @@ test('collects coverage from duplicate files avoiding shared cache', () => { '--coverageThreshold', '{"global": {"lines": 100}}', '--collectCoverageOnlyFrom', - 'cached-duplicates/a/identical.js', + 'cached-duplicates/a/Identical.js', '--collectCoverageOnlyFrom', - 'cached-duplicates/b/identical.js', + 'cached-duplicates/b/Identical.js', '--', - 'identical.test.js', + 'Identical.test.js', ]; // Run once to prime the cache runJest(DIR, args); diff --git a/integration-tests/__tests__/coverage_threshold.test.js b/integration-tests/__tests__/coverage_threshold.test.js index 5f871ae332f3..a8493959a4b7 100644 --- a/integration-tests/__tests__/coverage_threshold.test.js +++ b/integration-tests/__tests__/coverage_threshold.test.js @@ -11,7 +11,7 @@ const path = require('path'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); -const {cleanup, writeFiles} = require('../utils'); +const {cleanup, writeFiles} = require('../Utils'); const runJest = require('../runJest'); const DIR = path.resolve(__dirname, '../coverage-threshold'); diff --git a/integration-tests/__tests__/custom_matcher_stack_trace.test.js b/integration-tests/__tests__/custom_matcher_stack_trace.test.js index 40d4405c5b19..1023dae042fe 100644 --- a/integration-tests/__tests__/custom_matcher_stack_trace.test.js +++ b/integration-tests/__tests__/custom_matcher_stack_trace.test.js @@ -9,7 +9,7 @@ 'use strict'; const runJest = require('../runJest'); -const {extractSummary} = require('../utils'); +const {extractSummary} = require('../Utils'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); SkipOnWindows.suite(); diff --git a/integration-tests/__tests__/custom_reporters.test.js b/integration-tests/__tests__/custom_reporters.test.js index 4d35834aecf5..a1bcf0ee3c00 100644 --- a/integration-tests/__tests__/custom_reporters.test.js +++ b/integration-tests/__tests__/custom_reporters.test.js @@ -9,7 +9,7 @@ 'use strict'; const SkipOnWindows = require('../../scripts/SkipOnWindows'); -const {cleanup, extractSummary, writeFiles} = require('../utils'); +const {cleanup, extractSummary, writeFiles} = require('../Utils'); const runJest = require('../runJest'); const os = require('os'); const path = require('path'); @@ -24,7 +24,7 @@ describe('Custom Reporters Integration', () => { test('valid string format for adding reporters', () => { const reporterConfig = { - reporters: ['/reporters/test_reporter.js'], + reporters: ['/reporters/TestReporter.js'], }; const {status} = runJest('custom-reporters', [ @@ -39,10 +39,7 @@ describe('Custom Reporters Integration', () => { test('valid array format for adding reporters', () => { const reporterConfig = { reporters: [ - [ - '/reporters/test_reporter.js', - {'Dmitrii Abramov': 'Awesome'}, - ], + ['/reporters/TestReporter.js', {'Dmitrii Abramov': 'Awesome'}], ], }; @@ -75,7 +72,7 @@ describe('Custom Reporters Integration', () => { const {stderr, stdout, status} = runJest('custom-reporters', [ '--config', JSON.stringify({ - reporters: ['default', '/reporters/test_reporter.js'], + reporters: ['default', '/reporters/TestReporter.js'], }), 'add.test.js', ]); @@ -118,7 +115,7 @@ describe('Custom Reporters Integration', () => { '--no-cache', '--config', JSON.stringify({ - reporters: ['/reporters/incomplete_reporter.js'], + reporters: ['/reporters/IncompleteReporter.js'], }), 'add.test.js', ]); diff --git a/integration-tests/__tests__/execute-tests-once-in-mpr.js b/integration-tests/__tests__/execute-tests-once-in-mpr.js index 85c5f8c1e664..a9cb3c0763ef 100644 --- a/integration-tests/__tests__/execute-tests-once-in-mpr.js +++ b/integration-tests/__tests__/execute-tests-once-in-mpr.js @@ -11,7 +11,7 @@ const path = require('path'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); -const {extractSummary, cleanup, writeFiles} = require('../utils'); +const {extractSummary, cleanup, writeFiles} = require('../Utils'); const runJest = require('../runJest'); const DIR = path.resolve(__dirname, '../execute-tests-once-in-mpr'); diff --git a/integration-tests/__tests__/failures.test.js b/integration-tests/__tests__/failures.test.js index 5e91558b48f9..d4a551cd5c30 100644 --- a/integration-tests/__tests__/failures.test.js +++ b/integration-tests/__tests__/failures.test.js @@ -9,7 +9,7 @@ const path = require('path'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); -const {extractSummary} = require('../utils'); +const {extractSummary} = require('../Utils'); const runJest = require('../runJest'); const dir = path.resolve(__dirname, '../failures'); diff --git a/integration-tests/__tests__/find_related_files.test.js b/integration-tests/__tests__/find_related_files.test.js index 71dbb1b30f5f..18a25d08ef86 100644 --- a/integration-tests/__tests__/find_related_files.test.js +++ b/integration-tests/__tests__/find_related_files.test.js @@ -13,7 +13,7 @@ import runJest from '../runJest'; import os from 'os'; import path from 'path'; -const {cleanup, writeFiles} = require('../utils'); +const {cleanup, writeFiles} = require('../Utils'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); const DIR = path.resolve(os.tmpdir(), 'find_related_tests_test'); diff --git a/integration-tests/__tests__/force_exit.test.js b/integration-tests/__tests__/force_exit.test.js index 7f18ec2377e0..dd48784ec6f1 100644 --- a/integration-tests/__tests__/force_exit.test.js +++ b/integration-tests/__tests__/force_exit.test.js @@ -12,7 +12,7 @@ import runJest from '../runJest'; import os from 'os'; import path from 'path'; -const {cleanup, writeFiles} = require('../utils'); +const {cleanup, writeFiles} = require('../Utils'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); const DIR = path.resolve(os.tmpdir(), 'force_exit_test'); diff --git a/integration-tests/__tests__/global_setup.test.js b/integration-tests/__tests__/global_setup.test.js index 9e880c17c938..1f957229e8e7 100644 --- a/integration-tests/__tests__/global_setup.test.js +++ b/integration-tests/__tests__/global_setup.test.js @@ -11,7 +11,7 @@ const fs = require('fs'); const os = require('os'); const path = require('path'); const runJest = require('../runJest'); -const {cleanup} = require('../utils'); +const {cleanup} = require('../Utils'); const DIR = path.join(os.tmpdir(), 'jest-global-setup'); diff --git a/integration-tests/__tests__/global_teardown.test.js b/integration-tests/__tests__/global_teardown.test.js index bc9dec1264e0..3c9efae86086 100644 --- a/integration-tests/__tests__/global_teardown.test.js +++ b/integration-tests/__tests__/global_teardown.test.js @@ -12,7 +12,7 @@ const mkdirp = require('mkdirp'); const os = require('os'); const path = require('path'); const runJest = require('../runJest'); -const {cleanup} = require('../utils'); +const {cleanup} = require('../Utils'); const DIR = path.join(os.tmpdir(), 'jest-global-teardown'); diff --git a/integration-tests/__tests__/globals.test.js b/integration-tests/__tests__/globals.test.js index 7c41819f0b6b..e141b0e9c715 100644 --- a/integration-tests/__tests__/globals.test.js +++ b/integration-tests/__tests__/globals.test.js @@ -13,8 +13,8 @@ const path = require('path'); const os = require('os'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); const runJest = require('../runJest'); -const {extractSummary} = require('../utils'); -const {createEmptyPackage, writeFiles, cleanup} = require('../utils'); +const {extractSummary} = require('../Utils'); +const {createEmptyPackage, writeFiles, cleanup} = require('../Utils'); const DIR = path.resolve(os.tmpdir(), 'global-variables.test'); const TEST_DIR = path.resolve(DIR, '__tests__'); diff --git a/integration-tests/__tests__/jest.config.js.test.js b/integration-tests/__tests__/jest.config.js.test.js index be40d38bd710..78cf65e97557 100644 --- a/integration-tests/__tests__/jest.config.js.test.js +++ b/integration-tests/__tests__/jest.config.js.test.js @@ -11,7 +11,7 @@ const path = require('path'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); -const {extractSummary, cleanup, writeFiles} = require('../utils'); +const {extractSummary, cleanup, writeFiles} = require('../Utils'); const runJest = require('../runJest'); const DIR = path.resolve(__dirname, '../jest.config.js'); diff --git a/integration-tests/__tests__/jest_changed_files.test.js b/integration-tests/__tests__/jest_changed_files.test.js index 1c3fc30008da..7289f761667e 100644 --- a/integration-tests/__tests__/jest_changed_files.test.js +++ b/integration-tests/__tests__/jest_changed_files.test.js @@ -16,7 +16,7 @@ import { getChangedFilesForRoots, } from '../../packages/jest-changed-files/src'; const SkipOnWindows = require('../../scripts/SkipOnWindows'); -const {cleanup, run, writeFiles} = require('../utils'); +const {cleanup, run, writeFiles} = require('../Utils'); SkipOnWindows.suite(); diff --git a/integration-tests/__tests__/jest_require_actual.test.js b/integration-tests/__tests__/jest_require_actual.test.js index ba066d3cfa36..37cde924a196 100644 --- a/integration-tests/__tests__/jest_require_actual.test.js +++ b/integration-tests/__tests__/jest_require_actual.test.js @@ -12,7 +12,7 @@ const path = require('path'); const os = require('os'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); -const {cleanup, writeFiles} = require('../utils'); +const {cleanup, writeFiles} = require('../Utils'); const runJest = require('../runJest'); const DIR = path.resolve(os.tmpdir(), 'jest_require_actual_test'); diff --git a/integration-tests/__tests__/jest_require_mock.test.js b/integration-tests/__tests__/jest_require_mock.test.js index 82925d6075b7..8b1e6b19437b 100644 --- a/integration-tests/__tests__/jest_require_mock.test.js +++ b/integration-tests/__tests__/jest_require_mock.test.js @@ -12,7 +12,7 @@ const path = require('path'); const os = require('os'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); -const {cleanup, writeFiles} = require('../utils'); +const {cleanup, writeFiles} = require('../Utils'); const runJest = require('../runJest'); const DIR = path.resolve(os.tmpdir(), 'jest_require_mock_test'); diff --git a/integration-tests/__tests__/log_heap_usage.test.js b/integration-tests/__tests__/log_heap_usage.test.js index 2773cee06015..12de67c22e26 100644 --- a/integration-tests/__tests__/log_heap_usage.test.js +++ b/integration-tests/__tests__/log_heap_usage.test.js @@ -12,7 +12,7 @@ const path = require('path'); const os = require('os'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); -const {cleanup, writeFiles} = require('../utils'); +const {cleanup, writeFiles} = require('../Utils'); const runJest = require('../runJest'); const DIR = path.resolve(os.tmpdir(), 'log_heap_usage_test'); diff --git a/integration-tests/__tests__/module_name_mapper.test.js b/integration-tests/__tests__/module_name_mapper.test.js index 94cb193ff28f..a26725165da7 100644 --- a/integration-tests/__tests__/module_name_mapper.test.js +++ b/integration-tests/__tests__/module_name_mapper.test.js @@ -9,8 +9,8 @@ 'use strict'; const runJest = require('../runJest'); -const {extractSummary} = require('../utils'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); +const {extractSummary} = require('../Utils'); // Works on windows, we just need to adjust snapshot test output SkipOnWindows.suite(); diff --git a/integration-tests/__tests__/multi_project_runner.test.js b/integration-tests/__tests__/multi_project_runner.test.js index 9c752045b714..6d2d6e369cd1 100644 --- a/integration-tests/__tests__/multi_project_runner.test.js +++ b/integration-tests/__tests__/multi_project_runner.test.js @@ -13,7 +13,7 @@ import runJest from '../runJest'; import os from 'os'; import path from 'path'; -const {cleanup, extractSummary, writeFiles} = require('../utils'); +const {cleanup, extractSummary, writeFiles} = require('../Utils'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); const DIR = path.resolve(os.tmpdir(), 'multi_project_runner_test'); diff --git a/integration-tests/__tests__/native_async_mock.test.js b/integration-tests/__tests__/native_async_mock.test.js index 4da3ee02aa1d..3fd9c4517dde 100644 --- a/integration-tests/__tests__/native_async_mock.test.js +++ b/integration-tests/__tests__/native_async_mock.test.js @@ -10,7 +10,7 @@ 'use strict'; const path = require('path'); -const {run, extractSummary} = require('../utils'); +const {run, extractSummary} = require('../Utils'); const runJest = require('../runJest'); const dir = path.resolve(__dirname, '..', 'native-async-mock'); diff --git a/integration-tests/__tests__/only_changed.test.js b/integration-tests/__tests__/only_changed.test.js index 85f326b24ab8..16ff3e633b7a 100644 --- a/integration-tests/__tests__/only_changed.test.js +++ b/integration-tests/__tests__/only_changed.test.js @@ -12,7 +12,7 @@ import runJest from '../runJest'; import os from 'os'; import path from 'path'; -const {cleanup, run, writeFiles} = require('../utils'); +const {cleanup, run, writeFiles} = require('../Utils'); const DIR = path.resolve(os.tmpdir(), 'jest_only_changed'); const GIT = 'git -c user.name=jest_test -c user.email=jest_test@test.com'; diff --git a/integration-tests/__tests__/run_tests_by_path.test.js b/integration-tests/__tests__/run_tests_by_path.test.js index a4076ac6db63..c60aa6d489c6 100644 --- a/integration-tests/__tests__/run_tests_by_path.test.js +++ b/integration-tests/__tests__/run_tests_by_path.test.js @@ -12,7 +12,7 @@ import runJest from '../runJest'; import os from 'os'; import path from 'path'; -const {cleanup, writeFiles} = require('../utils'); +const {cleanup, writeFiles} = require('../Utils'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); const DIR = path.resolve(os.tmpdir(), 'run_tests_by_path_test'); diff --git a/integration-tests/__tests__/show_config.test.js b/integration-tests/__tests__/show_config.test.js index d45a2f48926f..83858f11c3f7 100644 --- a/integration-tests/__tests__/show_config.test.js +++ b/integration-tests/__tests__/show_config.test.js @@ -13,7 +13,7 @@ const path = require('path'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); const runJest = require('../runJest'); const os = require('os'); -const {cleanup, writeFiles} = require('../utils'); +const {cleanup, writeFiles} = require('../Utils'); SkipOnWindows.suite(); const DIR = path.resolve(os.tmpdir(), 'show_config_test'); diff --git a/integration-tests/__tests__/snapshot.test.js b/integration-tests/__tests__/snapshot.test.js index 422d4f77f52c..eb3a02934019 100644 --- a/integration-tests/__tests__/snapshot.test.js +++ b/integration-tests/__tests__/snapshot.test.js @@ -10,7 +10,7 @@ const fs = require('fs'); const path = require('path'); -const {extractSummary} = require('../utils'); +const {extractSummary} = require('../Utils'); const runJest = require('../runJest'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); diff --git a/integration-tests/__tests__/snapshot_serializers.test.js b/integration-tests/__tests__/snapshot_serializers.test.js index 0a2d561e873d..720f4e004767 100644 --- a/integration-tests/__tests__/snapshot_serializers.test.js +++ b/integration-tests/__tests__/snapshot_serializers.test.js @@ -9,7 +9,7 @@ 'use strict'; const path = require('path'); -const {cleanup} = require('../utils'); +const {cleanup} = require('../Utils'); const runJest = require('../runJest'); const testDir = path.resolve(__dirname, '../snapshot-serializers'); diff --git a/integration-tests/__tests__/stack_trace.test.js b/integration-tests/__tests__/stack_trace.test.js index 606ed05ff173..c8ace9a23f50 100644 --- a/integration-tests/__tests__/stack_trace.test.js +++ b/integration-tests/__tests__/stack_trace.test.js @@ -9,7 +9,7 @@ 'use strict'; const runJest = require('../runJest'); -const {extractSummary} = require('../utils'); +const {extractSummary} = require('../Utils'); describe('Stack Trace', () => { it('prints a stack trace for runtime errors', () => { diff --git a/integration-tests/__tests__/test_environment_async.test.js b/integration-tests/__tests__/test_environment_async.test.js index 7e3ddd921787..b10181689af4 100644 --- a/integration-tests/__tests__/test_environment_async.test.js +++ b/integration-tests/__tests__/test_environment_async.test.js @@ -11,7 +11,7 @@ const fs = require('fs'); const os = require('os'); const runJest = require('../runJest'); -const {cleanup} = require('../utils'); +const {cleanup} = require('../Utils'); const DIR = os.tmpdir() + '/jest'; diff --git a/integration-tests/__tests__/test_failure_exit_code.test.js b/integration-tests/__tests__/test_failure_exit_code.test.js index 3cec351ad83d..40d5a3ec234e 100644 --- a/integration-tests/__tests__/test_failure_exit_code.test.js +++ b/integration-tests/__tests__/test_failure_exit_code.test.js @@ -12,7 +12,7 @@ const path = require('path'); const os = require('os'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); -const {cleanup, writeFiles} = require('../utils'); +const {cleanup, writeFiles} = require('../Utils'); const runJest = require('../runJest'); const DIR = path.resolve(os.tmpdir(), 'test_failure_exit_code_test'); diff --git a/integration-tests/__tests__/test_name_pattern.test.js b/integration-tests/__tests__/test_name_pattern.test.js index 9c87270fee08..2aeaed42df97 100644 --- a/integration-tests/__tests__/test_name_pattern.test.js +++ b/integration-tests/__tests__/test_name_pattern.test.js @@ -8,7 +8,7 @@ */ 'use strict'; -const {extractSummary} = require('../utils'); +const {extractSummary} = require('../Utils'); const runJest = require('../runJest'); test('testNamePattern', () => { diff --git a/integration-tests/__tests__/test_path_pattern_reporter_message.test.js b/integration-tests/__tests__/test_path_pattern_reporter_message.test.js index 313e5964df72..ae0675f8ef24 100644 --- a/integration-tests/__tests__/test_path_pattern_reporter_message.test.js +++ b/integration-tests/__tests__/test_path_pattern_reporter_message.test.js @@ -11,7 +11,7 @@ import runJest from '../runJest'; import os from 'os'; import path from 'path'; -const {cleanup, writeFiles} = require('../utils'); +const {cleanup, writeFiles} = require('../Utils'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); const DIR = path.resolve(os.tmpdir(), 'jest_path_pattern_reporter_message'); diff --git a/integration-tests/__tests__/timeouts.test.js b/integration-tests/__tests__/timeouts.test.js index 4a62575c3024..357b6d696d1a 100644 --- a/integration-tests/__tests__/timeouts.test.js +++ b/integration-tests/__tests__/timeouts.test.js @@ -10,7 +10,7 @@ const path = require('path'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); -const {extractSummary, cleanup, writeFiles} = require('../utils'); +const {extractSummary, cleanup, writeFiles} = require('../Utils'); const runJest = require('../runJest'); const DIR = path.resolve(__dirname, '../timeouts'); diff --git a/integration-tests/__tests__/to_match_snapshot.test.js b/integration-tests/__tests__/to_match_snapshot.test.js index 1df44f165376..eceb5b79e049 100644 --- a/integration-tests/__tests__/to_match_snapshot.test.js +++ b/integration-tests/__tests__/to_match_snapshot.test.js @@ -8,7 +8,7 @@ */ const path = require('path'); -const {makeTemplate, writeFiles, cleanup} = require('../utils'); +const {makeTemplate, writeFiles, cleanup} = require('../Utils'); const runJest = require('../runJest'); const DIR = path.resolve(__dirname, '../toMatchSnapshot'); diff --git a/integration-tests/__tests__/to_throw_error_matching_snapshot.test.js b/integration-tests/__tests__/to_throw_error_matching_snapshot.test.js index 5a935c1e6baa..f20daf57be1d 100644 --- a/integration-tests/__tests__/to_throw_error_matching_snapshot.test.js +++ b/integration-tests/__tests__/to_throw_error_matching_snapshot.test.js @@ -9,7 +9,7 @@ const path = require('path'); const fs = require('fs'); -const {makeTemplate, writeFiles, cleanup} = require('../utils'); +const {makeTemplate, writeFiles, cleanup} = require('../Utils'); const runJest = require('../runJest'); const DIR = path.resolve(__dirname, '../toThrowErrorMatchingSnapshot'); diff --git a/integration-tests/__tests__/transform.test.js b/integration-tests/__tests__/transform.test.js index d5b9e389b84c..0f1db011b9ff 100644 --- a/integration-tests/__tests__/transform.test.js +++ b/integration-tests/__tests__/transform.test.js @@ -14,7 +14,7 @@ const { createEmptyPackage, linkJestPackage, copyDir, -} = require('../utils'); +} = require('../Utils'); const runJest = require('../runJest'); const os = require('os'); @@ -34,9 +34,9 @@ describe('babel-jest', () => { it('instruments only specific files and collects coverage', () => { const {stdout} = runJest(dir, ['--coverage', '--no-cache']); - expect(stdout).toMatch('covered.js'); - expect(stdout).not.toMatch('not_covered.js'); - expect(stdout).not.toMatch('excluded_from_coverage.js'); + expect(stdout).toMatch('Covered.js'); + expect(stdout).not.toMatch('NotCovered.js'); + expect(stdout).not.toMatch('ExcludedFromCoverage.js'); // coverage result should not change expect(stdout).toMatchSnapshot(); }); @@ -68,8 +68,8 @@ describe('no babel-jest', () => { '--coverage', '--no-watchman', ]); - expect(stdout).toMatch('covered.js'); - expect(stdout).not.toMatch('excluded_from_coverage.js'); + expect(stdout).toMatch('Covered.js'); + expect(stdout).not.toMatch('ExcludedFromCoverage.js'); // coverage result should not change expect(stdout).toMatchSnapshot(); }); diff --git a/integration-tests/__tests__/typescript_coverage.test.js b/integration-tests/__tests__/typescript_coverage.test.js index 3decda820cf1..1ba535c33133 100644 --- a/integration-tests/__tests__/typescript_coverage.test.js +++ b/integration-tests/__tests__/typescript_coverage.test.js @@ -8,7 +8,7 @@ */ const path = require('path'); -const {run} = require('../utils'); +const {run} = require('../Utils'); const runJest = require('../runJest'); it('instruments and collects coverage for typescript files', () => { diff --git a/integration-tests/__tests__/use_stderr.test.js b/integration-tests/__tests__/use_stderr.test.js index 105503808e3d..633626a7e114 100644 --- a/integration-tests/__tests__/use_stderr.test.js +++ b/integration-tests/__tests__/use_stderr.test.js @@ -12,7 +12,7 @@ import runJest from '../runJest'; import os from 'os'; import path from 'path'; -const {cleanup, writeFiles} = require('../utils'); +const {cleanup, writeFiles} = require('../Utils'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); const DIR = path.resolve(os.tmpdir(), 'use_stderr_test'); diff --git a/integration-tests/__tests__/version.test.js b/integration-tests/__tests__/version.test.js index a330ebe68862..1a34fbddfbd9 100644 --- a/integration-tests/__tests__/version.test.js +++ b/integration-tests/__tests__/version.test.js @@ -12,7 +12,7 @@ const path = require('path'); const os = require('os'); const SkipOnWindows = require('../../scripts/SkipOnWindows'); -const {cleanup, writeFiles} = require('../utils'); +const {cleanup, writeFiles} = require('../Utils'); const runJest = require('../runJest'); const DIR = path.resolve(os.tmpdir(), 'version_test'); diff --git a/integration-tests/coverage-remapping/typescript-preprocessor.js b/integration-tests/coverage-remapping/TypescriptPreprocessor.js similarity index 100% rename from integration-tests/coverage-remapping/typescript-preprocessor.js rename to integration-tests/coverage-remapping/TypescriptPreprocessor.js diff --git a/integration-tests/coverage-remapping/package.json b/integration-tests/coverage-remapping/package.json index ee9d5db999dc..6a0bc877eed1 100644 --- a/integration-tests/coverage-remapping/package.json +++ b/integration-tests/coverage-remapping/package.json @@ -2,7 +2,7 @@ "jest": { "rootDir": "./", "transform": { - "^.+\\.(ts|js)$": "/typescript-preprocessor.js" + "^.+\\.(ts|js)$": "/TypescriptPreprocessor.js" }, "testRegex": "/__tests__/.*\\.(ts|tsx|js)$", "testEnvironment": "node", diff --git a/integration-tests/coverage-report/other-file.js b/integration-tests/coverage-report/OtherFile.js similarity index 100% rename from integration-tests/coverage-report/other-file.js rename to integration-tests/coverage-report/OtherFile.js diff --git a/integration-tests/coverage-report/sum.js b/integration-tests/coverage-report/Sum.js similarity index 86% rename from integration-tests/coverage-report/sum.js rename to integration-tests/coverage-report/Sum.js index 67f7a516b126..606c4416f9ca 100644 --- a/integration-tests/coverage-report/sum.js +++ b/integration-tests/coverage-report/Sum.js @@ -5,8 +5,8 @@ * LICENSE file in the root directory of this source tree. */ -require('./sum_dependency.js'); -require('./other-file'); +require('./SumDependency.js'); +require('./OtherFile'); const uncoveredFunction = () => { return 1 + 'abc'; diff --git a/integration-tests/coverage-report/sum_dependency.js b/integration-tests/coverage-report/SumDependency.js similarity index 100% rename from integration-tests/coverage-report/sum_dependency.js rename to integration-tests/coverage-report/SumDependency.js diff --git a/integration-tests/coverage-report/__mocks__/sum_dependency.js b/integration-tests/coverage-report/__mocks__/SumDependency.js similarity index 100% rename from integration-tests/coverage-report/__mocks__/sum_dependency.js rename to integration-tests/coverage-report/__mocks__/SumDependency.js diff --git a/integration-tests/coverage-report/__tests__/sum.test.js b/integration-tests/coverage-report/__tests__/Sum.test.js similarity index 80% rename from integration-tests/coverage-report/__tests__/sum.test.js rename to integration-tests/coverage-report/__tests__/Sum.test.js index 774e28f8004e..576787764462 100644 --- a/integration-tests/coverage-report/__tests__/sum.test.js +++ b/integration-tests/coverage-report/__tests__/Sum.test.js @@ -6,9 +6,9 @@ */ 'use strict'; -jest.mock('../sum_dependency.js'); // call mock explicitly +jest.mock('../SumDependency.js'); // call mock explicitly -const sum = require('../sum').sum; +const sum = require('../Sum').sum; if (!global.setup) { throw new Error('setup.js was not called.'); diff --git a/integration-tests/coverage-report/cached-duplicates/a/identical.js b/integration-tests/coverage-report/cached-duplicates/a/Identical.js similarity index 100% rename from integration-tests/coverage-report/cached-duplicates/a/identical.js rename to integration-tests/coverage-report/cached-duplicates/a/Identical.js diff --git a/integration-tests/coverage-report/cached-duplicates/a/__tests__/identical.test.js b/integration-tests/coverage-report/cached-duplicates/a/__tests__/Identical.test.js similarity index 88% rename from integration-tests/coverage-report/cached-duplicates/a/__tests__/identical.test.js rename to integration-tests/coverage-report/cached-duplicates/a/__tests__/Identical.test.js index 213edaeae026..85ba0905484a 100644 --- a/integration-tests/coverage-report/cached-duplicates/a/__tests__/identical.test.js +++ b/integration-tests/coverage-report/cached-duplicates/a/__tests__/Identical.test.js @@ -6,7 +6,7 @@ */ 'use strict'; -const sum = require('../identical').sum; +const sum = require('../Identical').sum; describe('sum', () => { it('adds numbers', () => { diff --git a/integration-tests/coverage-report/cached-duplicates/b/identical.js b/integration-tests/coverage-report/cached-duplicates/b/Identical.js similarity index 100% rename from integration-tests/coverage-report/cached-duplicates/b/identical.js rename to integration-tests/coverage-report/cached-duplicates/b/Identical.js diff --git a/integration-tests/coverage-report/cached-duplicates/b/__tests__/identical.test.js b/integration-tests/coverage-report/cached-duplicates/b/__tests__/Identical.test.js similarity index 88% rename from integration-tests/coverage-report/cached-duplicates/b/__tests__/identical.test.js rename to integration-tests/coverage-report/cached-duplicates/b/__tests__/Identical.test.js index 213edaeae026..85ba0905484a 100644 --- a/integration-tests/coverage-report/cached-duplicates/b/__tests__/identical.test.js +++ b/integration-tests/coverage-report/cached-duplicates/b/__tests__/Identical.test.js @@ -6,7 +6,7 @@ */ 'use strict'; -const sum = require('../identical').sum; +const sum = require('../Identical').sum; describe('sum', () => { it('adds numbers', () => { diff --git a/integration-tests/coverage-report/not-required-in-test-suite.js b/integration-tests/coverage-report/notRequiredInTestSuite.js similarity index 100% rename from integration-tests/coverage-report/not-required-in-test-suite.js rename to integration-tests/coverage-report/notRequiredInTestSuite.js diff --git a/integration-tests/custom-reporters/package.json b/integration-tests/custom-reporters/package.json index 3c42adef4a3a..590f11ffe692 100644 --- a/integration-tests/custom-reporters/package.json +++ b/integration-tests/custom-reporters/package.json @@ -1,7 +1,7 @@ { "jest": { "reporters": [ - ["/reporters/test_reporter.js", { + ["/reporters/TestReporter.js", { "hello": "world", "dmitrii": "abramov", "christoph": "pojer" diff --git a/integration-tests/custom-reporters/reporters/incomplete_reporter.js b/integration-tests/custom-reporters/reporters/IncompleteReporter.js similarity index 100% rename from integration-tests/custom-reporters/reporters/incomplete_reporter.js rename to integration-tests/custom-reporters/reporters/IncompleteReporter.js diff --git a/integration-tests/custom-reporters/reporters/test_reporter.js b/integration-tests/custom-reporters/reporters/TestReporter.js similarity index 100% rename from integration-tests/custom-reporters/reporters/test_reporter.js rename to integration-tests/custom-reporters/reporters/TestReporter.js diff --git a/integration-tests/native-async-mock/native.js b/integration-tests/native-async-mock/Native.js similarity index 100% rename from integration-tests/native-async-mock/native.js rename to integration-tests/native-async-mock/Native.js diff --git a/integration-tests/native-async-mock/__tests__/native_async_mock.test.js b/integration-tests/native-async-mock/__tests__/native_async_mock.test.js index 8ba636b0019c..2df4229e7f62 100644 --- a/integration-tests/native-async-mock/__tests__/native_async_mock.test.js +++ b/integration-tests/native-async-mock/__tests__/native_async_mock.test.js @@ -2,9 +2,9 @@ 'use strict'; -jest.mock('../native'); +jest.mock('../Native'); -const native = require('../native'); +const native = require('../Native'); test('mock works with native async', () => { expect(native.asyncMethod).toBeDefined(); diff --git a/integration-tests/runJest.js b/integration-tests/runJest.js index a4d3d569d2e6..fbfb13c4ca51 100644 --- a/integration-tests/runJest.js +++ b/integration-tests/runJest.js @@ -10,7 +10,7 @@ const path = require('path'); const {sync: spawnSync} = require('cross-spawn'); -const {fileExists} = require('./utils'); +const {fileExists} = require('./Utils'); const JEST_PATH = path.resolve(__dirname, '../packages/jest-cli/bin/jest.js'); diff --git a/integration-tests/snapshot-serializers/transformer.js b/integration-tests/snapshot-serializers/Transformer.js similarity index 100% rename from integration-tests/snapshot-serializers/transformer.js rename to integration-tests/snapshot-serializers/Transformer.js diff --git a/integration-tests/snapshot-serializers/utils.js b/integration-tests/snapshot-serializers/Utils.js similarity index 100% rename from integration-tests/snapshot-serializers/utils.js rename to integration-tests/snapshot-serializers/Utils.js diff --git a/integration-tests/snapshot-serializers/package.json b/integration-tests/snapshot-serializers/package.json index 658160fc0f8e..4e1ce54a0258 100644 --- a/integration-tests/snapshot-serializers/package.json +++ b/integration-tests/snapshot-serializers/package.json @@ -2,7 +2,7 @@ "jest": { "testEnvironment": "node", "transform": { - "^.+\\.js$": "/transformer.js" + "^.+\\.js$": "/Transformer.js" }, "snapshotSerializers": [ "./plugins/foo", diff --git a/integration-tests/snapshot-serializers/plugins/bar.js b/integration-tests/snapshot-serializers/plugins/bar.js index bd7324c4c648..389f5a24017a 100644 --- a/integration-tests/snapshot-serializers/plugins/bar.js +++ b/integration-tests/snapshot-serializers/plugins/bar.js @@ -8,6 +8,6 @@ /* eslint-disable no-unused-vars */ -const createPlugin = require('../utils').createPlugin; +const createPlugin = require('../Utils').createPlugin; // We inject the call to "createPlugin('bar') through the transformer" diff --git a/integration-tests/snapshot-serializers/plugins/foo/index.js b/integration-tests/snapshot-serializers/plugins/foo/index.js index d009c86802a1..713fc2ed92e8 100644 --- a/integration-tests/snapshot-serializers/plugins/foo/index.js +++ b/integration-tests/snapshot-serializers/plugins/foo/index.js @@ -6,5 +6,5 @@ * */ -const createPlugin = require('../../utils').createPlugin; +const createPlugin = require('../../Utils').createPlugin; module.exports = createPlugin('foo'); diff --git a/integration-tests/test-environment-async/test-environment.js b/integration-tests/test-environment-async/TestEnvironment.js similarity index 100% rename from integration-tests/test-environment-async/test-environment.js rename to integration-tests/test-environment-async/TestEnvironment.js diff --git a/integration-tests/test-environment-async/package.json b/integration-tests/test-environment-async/package.json index a346d75a230a..013b4d9a9c98 100644 --- a/integration-tests/test-environment-async/package.json +++ b/integration-tests/test-environment-async/package.json @@ -1,5 +1,5 @@ { "jest": { - "testEnvironment": "./test-environment.js" + "testEnvironment": "./TestEnvironment.js" } } diff --git a/integration-tests/transform-linked-modules/preprocessor.js b/integration-tests/transform-linked-modules/Preprocessor.js similarity index 100% rename from integration-tests/transform-linked-modules/preprocessor.js rename to integration-tests/transform-linked-modules/Preprocessor.js diff --git a/integration-tests/transform-linked-modules/package.json b/integration-tests/transform-linked-modules/package.json index 0887a1756750..55214f57d3e8 100644 --- a/integration-tests/transform-linked-modules/package.json +++ b/integration-tests/transform-linked-modules/package.json @@ -7,7 +7,7 @@ "/ignored/" ], "transform": { - "^.+\\.js$": "/preprocessor.js" + "^.+\\.js$": "/Preprocessor.js" } } } diff --git a/integration-tests/transform/babel-jest/not-covered.js b/integration-tests/transform/babel-jest/NotCovered.js similarity index 100% rename from integration-tests/transform/babel-jest/not-covered.js rename to integration-tests/transform/babel-jest/NotCovered.js diff --git a/integration-tests/transform/babel-jest/__tests__/babel_jest.test.js b/integration-tests/transform/babel-jest/__tests__/babel_jest.test.js index 2b76b3bc5841..4c8003abeee9 100644 --- a/integration-tests/transform/babel-jest/__tests__/babel_jest.test.js +++ b/integration-tests/transform/babel-jest/__tests__/babel_jest.test.js @@ -7,7 +7,7 @@ 'use strict'; -require('../this-directory-is-covered/excluded-from-coverage'); +require('../this-directory-is-covered/ExcludedFromCoverage'); it('strips flowtypes using babel-jest and .babelrc', () => { const a: string = 'a'; diff --git a/integration-tests/transform/babel-jest/package.json b/integration-tests/transform/babel-jest/package.json index 5dada2fa515f..31b6b0becd61 100644 --- a/integration-tests/transform/babel-jest/package.json +++ b/integration-tests/transform/babel-jest/package.json @@ -4,10 +4,10 @@ }, "jest": { "collectCoverageOnlyFrom": { - "/this-directory-is-covered/covered.js": true, - "/this-directory-is-covered/excluded-from-coverage.js": true + "/this-directory-is-covered/Covered.js": true, + "/this-directory-is-covered/ExcludedFromCoverage.js": true }, - "coveragePathIgnorePatterns": ["excluded-from-coverage"], + "coveragePathIgnorePatterns": ["ExcludedFromCoverage"], "testEnvironment": "node" } } diff --git a/integration-tests/transform/babel-jest/this-directory-is-covered/covered.js b/integration-tests/transform/babel-jest/this-directory-is-covered/Covered.js similarity index 100% rename from integration-tests/transform/babel-jest/this-directory-is-covered/covered.js rename to integration-tests/transform/babel-jest/this-directory-is-covered/Covered.js diff --git a/integration-tests/transform/babel-jest/this-directory-is-covered/excluded-from-coverage.js b/integration-tests/transform/babel-jest/this-directory-is-covered/ExcludedFromCoverage.js similarity index 87% rename from integration-tests/transform/babel-jest/this-directory-is-covered/excluded-from-coverage.js rename to integration-tests/transform/babel-jest/this-directory-is-covered/ExcludedFromCoverage.js index d3ae4cb6859b..99149eba1bcc 100644 --- a/integration-tests/transform/babel-jest/this-directory-is-covered/excluded-from-coverage.js +++ b/integration-tests/transform/babel-jest/this-directory-is-covered/ExcludedFromCoverage.js @@ -5,8 +5,8 @@ * LICENSE file in the root directory of this source tree. */ -require('./covered'); -require('../not-covered'); +require('./Covered'); +require('../NotCovered'); const thisFunctionIsNeverInstrumented = () => { return null; diff --git a/integration-tests/transform/custom-instrumenting-preprocessor/preprocessor.js b/integration-tests/transform/custom-instrumenting-preprocessor/Preprocessor.js similarity index 100% rename from integration-tests/transform/custom-instrumenting-preprocessor/preprocessor.js rename to integration-tests/transform/custom-instrumenting-preprocessor/Preprocessor.js diff --git a/integration-tests/transform/custom-instrumenting-preprocessor/package.json b/integration-tests/transform/custom-instrumenting-preprocessor/package.json index 088eb25348a4..7e4bce94a8ee 100644 --- a/integration-tests/transform/custom-instrumenting-preprocessor/package.json +++ b/integration-tests/transform/custom-instrumenting-preprocessor/package.json @@ -1,7 +1,7 @@ { "jest": { "transform": { - "^.+\\.js$": "/preprocessor.js" + "^.+\\.js$": "/Preprocessor.js" }, "testEnvironment": "node" } diff --git a/integration-tests/transform/custom-instrumenting-preprocessor/src/index.js b/integration-tests/transform/custom-instrumenting-preprocessor/src/index.js index 63ec38fd5324..a48bf1a0714f 100644 --- a/integration-tests/transform/custom-instrumenting-preprocessor/src/index.js +++ b/integration-tests/transform/custom-instrumenting-preprocessor/src/index.js @@ -5,6 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -require('./some-other-file'); +require('./someOtherFile'); module.exports = {a: 1}; diff --git a/integration-tests/transform/custom-instrumenting-preprocessor/src/some-other-file.js b/integration-tests/transform/custom-instrumenting-preprocessor/src/someOtherFile.js similarity index 100% rename from integration-tests/transform/custom-instrumenting-preprocessor/src/some-other-file.js rename to integration-tests/transform/custom-instrumenting-preprocessor/src/someOtherFile.js diff --git a/integration-tests/transform/multiple-transformers/cssPreprocessor.js b/integration-tests/transform/multiple-transformers/CssPreprocessor.js similarity index 100% rename from integration-tests/transform/multiple-transformers/cssPreprocessor.js rename to integration-tests/transform/multiple-transformers/CssPreprocessor.js diff --git a/integration-tests/transform/multiple-transformers/filePreprocessor.js b/integration-tests/transform/multiple-transformers/FilePreprocessor.js similarity index 100% rename from integration-tests/transform/multiple-transformers/filePreprocessor.js rename to integration-tests/transform/multiple-transformers/FilePreprocessor.js diff --git a/integration-tests/transform/multiple-transformers/jsPreprocessor.js b/integration-tests/transform/multiple-transformers/JsPreprocessor.js similarity index 100% rename from integration-tests/transform/multiple-transformers/jsPreprocessor.js rename to integration-tests/transform/multiple-transformers/JsPreprocessor.js diff --git a/integration-tests/transform/multiple-transformers/package.json b/integration-tests/transform/multiple-transformers/package.json index b48eb2b18f06..b70eb7a0f696 100644 --- a/integration-tests/transform/multiple-transformers/package.json +++ b/integration-tests/transform/multiple-transformers/package.json @@ -1,9 +1,9 @@ { "jest": { "transform": { - "^.+\\.css$": "/cssPreprocessor.js", - "^.+\\.js$": "/jsPreprocessor.js", - "^.+\\.svg$": "/filePreprocessor.js" + "^.+\\.css$": "/CssPreprocessor.js", + "^.+\\.js$": "/JsPreprocessor.js", + "^.+\\.svg$": "/FilePreprocessor.js" }, "testEnvironment": "node" }, diff --git a/integration-tests/transform/no-babel-jest/__tests__/passes-with-no-babel-jest.js b/integration-tests/transform/no-babel-jest/__tests__/passes-with-no-babel-jest.js index 08d86c503878..41760c8de0b0 100644 --- a/integration-tests/transform/no-babel-jest/__tests__/passes-with-no-babel-jest.js +++ b/integration-tests/transform/no-babel-jest/__tests__/passes-with-no-babel-jest.js @@ -7,6 +7,6 @@ 'use strict'; -require('../this-directory-is-covered/excluded-from-coverage'); +require('../this-directory-is-covered/ExcludedFromCoverage'); test('1', () => {}); diff --git a/integration-tests/transform/no-babel-jest/package.json b/integration-tests/transform/no-babel-jest/package.json index 54e43cf0057a..86982fa93b05 100644 --- a/integration-tests/transform/no-babel-jest/package.json +++ b/integration-tests/transform/no-babel-jest/package.json @@ -1,10 +1,10 @@ { "jest": { "collectCoverageOnlyFrom": { - "/this-directory-is-covered/covered.js": true, - "/this-directory-is-covered/excluded-from-coverage.js": true + "/this-directory-is-covered/Covered.js": true, + "/this-directory-is-covered/ExcludedFromCoverage.js": true }, - "coveragePathIgnorePatterns": ["excluded-from-coverage"], + "coveragePathIgnorePatterns": ["ExcludedFromCoverage"], "testEnvironment": "node" } } diff --git a/integration-tests/transform/no-babel-jest/this-directory-is-covered/covered.js b/integration-tests/transform/no-babel-jest/this-directory-is-covered/Covered.js similarity index 100% rename from integration-tests/transform/no-babel-jest/this-directory-is-covered/covered.js rename to integration-tests/transform/no-babel-jest/this-directory-is-covered/Covered.js diff --git a/integration-tests/transform/no-babel-jest/this-directory-is-covered/excluded-from-coverage.js b/integration-tests/transform/no-babel-jest/this-directory-is-covered/ExcludedFromCoverage.js similarity index 93% rename from integration-tests/transform/no-babel-jest/this-directory-is-covered/excluded-from-coverage.js rename to integration-tests/transform/no-babel-jest/this-directory-is-covered/ExcludedFromCoverage.js index 7e3606d8f5b5..fd43949edf38 100644 --- a/integration-tests/transform/no-babel-jest/this-directory-is-covered/excluded-from-coverage.js +++ b/integration-tests/transform/no-babel-jest/this-directory-is-covered/ExcludedFromCoverage.js @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -require('./covered'); +require('./Covered'); const thisFunctionIsNeverInstrumented = () => { return null; diff --git a/integration-tests/typescript-coverage/typescript-preprocessor.js b/integration-tests/typescript-coverage/TypescriptPreprocessor.js similarity index 100% rename from integration-tests/typescript-coverage/typescript-preprocessor.js rename to integration-tests/typescript-coverage/TypescriptPreprocessor.js diff --git a/integration-tests/typescript-coverage/package.json b/integration-tests/typescript-coverage/package.json index 38d2afc377cc..b0987d18c45e 100644 --- a/integration-tests/typescript-coverage/package.json +++ b/integration-tests/typescript-coverage/package.json @@ -2,7 +2,7 @@ "jest": { "rootDir": "./", "transform": { - "^.+\\.(ts|js)$": "/typescript-preprocessor.js" + "^.+\\.(ts|js)$": "/TypescriptPreprocessor.js" }, "testMatch": ["**/__tests__/*.(ts|tsx|js)"], "testEnvironment": "node", diff --git a/packages/jest-config/src/__tests__/resolve_config_path.test.js b/packages/jest-config/src/__tests__/resolve_config_path.test.js index e7a820c39ce7..5eb416b5ac42 100644 --- a/packages/jest-config/src/__tests__/resolve_config_path.test.js +++ b/packages/jest-config/src/__tests__/resolve_config_path.test.js @@ -11,7 +11,7 @@ import os from 'os'; import path from 'path'; import resolveConfigPath from '../resolve_config_path'; -const {cleanup, writeFiles} = require('../../../../integration-tests/utils'); +const {cleanup, writeFiles} = require('../../../../integration-tests/Utils'); const DIR = path.resolve(os.tmpdir(), 'resolve_config_path_test'); const ERROR_PATTERN = /Could not find a config file based on provided values/; diff --git a/packages/jest-config/src/valid_config.js b/packages/jest-config/src/valid_config.js index 4ca0ba8d677d..9c6a60850c53 100644 --- a/packages/jest-config/src/valid_config.js +++ b/packages/jest-config/src/valid_config.js @@ -26,7 +26,7 @@ export default ({ collectCoverage: true, collectCoverageFrom: ['src', '!public'], collectCoverageOnlyFrom: { - '/this-directory-is-covered/covered.js': true, + '/this-directory-is-covered/Covered.js': true, }, coverageDirectory: 'coverage', coveragePathIgnorePatterns: [NODE_MODULES_REGEXP], diff --git a/packages/jest-validate/src/__tests__/fixtures/jest_config.js b/packages/jest-validate/src/__tests__/fixtures/jest_config.js index 1395c62f0203..263ec29aa871 100644 --- a/packages/jest-validate/src/__tests__/fixtures/jest_config.js +++ b/packages/jest-validate/src/__tests__/fixtures/jest_config.js @@ -69,7 +69,7 @@ const validConfig = { collectCoverage: true, collectCoverageFrom: ['src', '!public'], collectCoverageOnlyFrom: { - '/this-directory-is-covered/covered.js': true, + '/this-directory-is-covered/Covered.js': true, }, coverageDirectory: 'coverage', coveragePathIgnorePatterns: [NODE_MODULES_REGEXP], From 4905c97cc75a3366e356e853c3a7dc088efcbdba Mon Sep 17 00:00:00 2001 From: Michael Baldwin Date: Mon, 12 Feb 2018 18:36:59 -0500 Subject: [PATCH 2/3] remove filename lint rule since multiple styles are not supported --- .eslintrc.js | 1 - 1 file changed, 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 1938dbcfd544..ffbae23fee23 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -168,7 +168,6 @@ module.exports = { trailingComma: 'all', }, ], - 'unicorn/filename-case': [1, {case: 'snakeCase'}], }, settings: { 'import/resolver': { From de423c88dd75ca1f7c1c30d88391bd545cbe400d Mon Sep 17 00:00:00 2001 From: Michael Baldwin Date: Tue, 13 Feb 2018 09:16:16 -0500 Subject: [PATCH 3/3] remove unicorn completely --- .eslintrc.js | 29 +--------------------------- package.json | 1 - yarn.lock | 53 ---------------------------------------------------- 3 files changed, 1 insertion(+), 82 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index ffbae23fee23..22803ebc8d3d 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -33,7 +33,6 @@ module.exports = { 'react/jsx-no-undef': 0, 'react/react-in-jsx-scope': 0, 'sort-keys': 0, - 'unicorn/filename-case': 0, }, }, { @@ -42,44 +41,18 @@ module.exports = { 'babel/func-params-comma-dangle': 0, 'import/no-unresolved': [2, {ignore: ['^react-native$']}], 'import/order': 0, - 'unicorn/filename-case': 0, }, }, { files: ['scripts/**/*', 'integration-tests/**/*'], rules: { 'babel/func-params-comma-dangle': 0, - 'unicorn/filename-case': 0, }, }, { files: 'types/**/*', rules: { 'import/no-extraneous-dependencies': 0, - 'unicorn/filename-case': 0, - }, - }, - { - files: [ - '**/__mocks__/**/*', - 'website/**/*', - '**/jest-runtime/**/*', - '**/src/Console*', - 'packages/jest-cli/src/lib/Prompt.js', - 'packages/jest-cli/src/reporters/Status.js', - 'packages/jest-editor-support/src/Process.js', - 'packages/jest-editor-support/src/Runner.js', - 'packages/jest-editor-support/src/Settings.js', - 'packages/jest-editor-support/src/Snapshot.js', - 'packages/jest-editor-support/src/__tests__/Snapshot-test.js', - 'packages/jest-jasmine2/src/jasmine/Env.js', - 'packages/jest-jasmine2/src/jasmine/Spec.js', - 'packages/jest-jasmine2/src/jasmine/Suite.js', - 'packages/jest-jasmine2/src/jasmine/Timer.js', - 'packages/jest-snapshot/src/State.js', - ], - rules: { - 'unicorn/filename-case': 0, }, }, { @@ -136,7 +109,7 @@ module.exports = { }, ], parser: 'babel-eslint', - plugins: ['markdown', 'import', 'unicorn', 'prettier'], + plugins: ['markdown', 'import', 'prettier'], rules: { 'flowtype/boolean-style': 2, 'flowtype/no-primitive-constructor-types': 2, diff --git a/package.json b/package.json index 524333ff50b4..c7d93946d2b0 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,6 @@ "eslint-plugin-prettier": "^2.3.1", "eslint-plugin-react": "^7.1.0", "eslint-plugin-relay": "~0.0.19", - "eslint-plugin-unicorn": "^3.0.0", "flow-bin": "^0.64.0", "glob": "^7.1.1", "graceful-fs": "^4.1.11", diff --git a/yarn.lock b/yarn.lock index 83e4ab38123d..20f7a4c9f9cb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1658,12 +1658,6 @@ classnames@^2.2.5: version "2.2.5" resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d" -clean-regexp@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/clean-regexp/-/clean-regexp-1.0.0.tgz#8df7c7aae51fd36874e8f8d05b9180bc11a3fed7" - dependencies: - escape-string-regexp "^1.0.5" - cli-cursor@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" @@ -2797,13 +2791,6 @@ escodegen@1.x.x, escodegen@^1.9.0: optionalDependencies: source-map "~0.5.6" -eslint-ast-utils@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/eslint-ast-utils/-/eslint-ast-utils-1.1.0.tgz#3d58ba557801cfb1c941d68131ee9f8c34bd1586" - dependencies: - lodash.get "^4.4.2" - lodash.zip "^4.2.0" - eslint-config-fbjs@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/eslint-config-fbjs/-/eslint-config-fbjs-2.0.1.tgz#395896fd740e0e28dc1c2072e3bc982e88247df5" @@ -2899,18 +2886,6 @@ eslint-plugin-relay@~0.0.19: dependencies: graphql "^0.12.3" -eslint-plugin-unicorn@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-3.0.1.tgz#dae02614a53b921541a9318a46e50ab5bdeb5d7c" - dependencies: - clean-regexp "^1.0.0" - eslint-ast-utils "^1.0.0" - import-modules "^1.1.0" - lodash.camelcase "^4.1.1" - lodash.kebabcase "^4.0.1" - lodash.snakecase "^4.0.1" - lodash.upperfirst "^4.2.0" - eslint-scope@^3.7.1: version "3.7.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" @@ -4032,10 +4007,6 @@ import-local@^1.0.0: pkg-dir "^2.0.0" resolve-cwd "^2.0.0" -import-modules@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/import-modules/-/import-modules-1.1.0.tgz#748db79c5cc42bb9701efab424f894e72600e9dc" - imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" @@ -4986,10 +4957,6 @@ lodash.bind@^4.1.4: version "4.2.1" resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35" -lodash.camelcase@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" - lodash.cond@^4.3.0: version "4.5.2" resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5" @@ -5016,10 +4983,6 @@ lodash.foreach@^4.3.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" -lodash.get@^4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" - lodash.isarguments@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" @@ -5028,10 +4991,6 @@ lodash.isarray@^3.0.0: version "3.0.4" resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" -lodash.kebabcase@^4.0.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" - lodash.keys@^3.0.0: version "3.1.2" resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" @@ -5080,10 +5039,6 @@ lodash.restparam@^3.0.0: version "3.6.1" resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" -lodash.snakecase@^4.0.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d" - lodash.some@^4.4.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" @@ -5126,14 +5081,6 @@ lodash.templatesettings@^4.0.0: dependencies: lodash._reinterpolate "~3.0.0" -lodash.upperfirst@^4.2.0: - version "4.3.1" - resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" - -lodash.zip@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.zip/-/lodash.zip-4.2.0.tgz#ec6662e4896408ed4ab6c542a3990b72cc080020" - lodash@^3.10.1, lodash@^3.5.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"