From e740de246b3a5ef4a7692f2f58bf8223323e4daf Mon Sep 17 00:00:00 2001 From: Mark Pedrotti Date: Tue, 6 Aug 2019 04:59:16 -0400 Subject: [PATCH 1/5] chore: Make sure copyright header comment includes license (#8783) * chore: Make sure copyright header comment includes license * Add period at end of copyright line in checkCopyrightHeaders.js :) * Update CHANGELOG.md --- CHANGELOG.md | 2 +- babel.config.js | 7 +- .../__snapshots__/beforeAllFiltered.ts.snap | 10 +- .../__snapshots__/beforeEachQueue.ts.snap | 10 +- .../coverageRemapping.test.ts.snap | 108 +++++++++--------- .../__snapshots__/detectOpenHandles.ts.snap | 28 ++--- .../__snapshots__/failures.test.ts.snap | 108 +++++++++--------- .../__snapshots__/processExit.test.ts.snap | 16 +-- .../resolveNoFileExtensions.test.ts.snap | 10 +- e2e/async-regenerator/__tests__/test.js | 7 +- e2e/async-regenerator/babel.config.js | 7 +- e2e/babel-plugin-jest-hoist/babel.config.js | 7 +- .../__tests__/beforeAllFiltered.test.js | 7 +- .../__tests__/beforeEachQueue.test.js | 7 +- .../__tests__/failedAssertion.js | 7 +- .../__tests__/coveredTest.ts | 8 +- e2e/coverage-remapping/covered.ts | 7 +- e2e/coverage-report/babel.config.js | 7 +- e2e/custom-resolver/__mocks__/manualMock.js | 7 +- e2e/custom-resolver/bar.js | 7 +- e2e/custom-resolver/foo.js | 7 +- e2e/custom-resolver/manualMock.js | 7 +- e2e/custom-resolver/resolver.js | 7 +- e2e/deprecated-cli-options/__tests__/dummy.js | 7 +- e2e/detect-open-handles/__tests__/inside.js | 7 +- e2e/detect-open-handles/__tests__/outside.js | 7 +- e2e/detect-open-handles/__tests__/promise.js | 7 +- e2e/detect-open-handles/babel.config.js | 7 +- e2e/detect-open-handles/server.js | 7 +- e2e/expect-async-matcher/babel.config.js | 7 +- e2e/failures/__tests__/duringTests.test.js | 7 +- e2e/failures/babel.config.js | 7 +- e2e/filter/my-broken-filter.js | 7 +- e2e/filter/my-broken-setup-filter.js | 7 +- e2e/filter/my-clowny-filter.js | 7 +- e2e/filter/my-filter.js | 7 +- e2e/filter/my-secondary-filter.js | 7 +- e2e/filter/my-setup-filter.js | 7 +- e2e/global-setup-custom-transform/index.js | 7 +- .../transformer.js | 7 +- e2e/global-setup/babel.config.js | 7 +- .../custom-tests-dir/pass.test.js | 7 +- e2e/global-setup/invalidSetup.js | 7 +- e2e/global-teardown/babel.config.js | 7 +- .../custom-tests-dir/pass.test.js | 7 +- e2e/global-teardown/invalidTeardown.js | 7 +- .../__tests__/pendingInPromise.test.js | 7 +- .../bar/__tests__/boggusBar.test.js | 7 +- .../foo/__tests__/boggusFoo.test.js | 7 +- e2e/native-async-mock/Native.js | 7 +- .../__tests__/nativeAsyncMock.test.js | 7 +- e2e/override-globals/babel.config.js | 7 +- .../jest-preset-js/jest-preset.js | 7 +- .../js/node_modules/jest-preset-js/mapper.js | 7 +- .../node_modules/jest-preset-json/mapper.js | 7 +- e2e/process-exit/__tests__/test.js | 7 +- e2e/process-exit/babel.config.js | 7 +- e2e/require-main/babel.config.js | 7 +- e2e/resolve-get-paths/babel.config.js | 7 +- e2e/resolve-no-extensions/__tests__/test.js | 7 +- e2e/resolve-no-extensions/babel.config.js | 7 +- e2e/resolve-no-extensions/index.js | 7 +- e2e/resolve-with-paths/babel.config.js | 7 +- e2e/run-programmatically/babel.config.js | 7 +- .../__tests__/snapshot.test.js | 7 +- .../customSnapshotResolver.js | 7 +- e2e/test-environment-async/TestEnvironment.js | 7 +- .../CircusHandleTestEventEnvironment.js | 7 +- .../__tests__/circusHandleTestEvent.test.js | 3 + .../DocblockPragmasEnvironment.js | 7 +- .../__tests__/docblockPragmas.test.js | 3 + .../timerAndMock.test.js | 7 +- .../with-reset-mocks/timerWithMock.test.js | 7 +- .../__tests__/useRealTimers.test.js | 7 +- e2e/to-match-inline-snapshot/babel.config.js | 7 +- .../babel.config.js | 7 +- .../__tests__/linkedModules.test.js | 7 +- .../ignored/normal.js | 7 +- e2e/transform-linked-modules/package/index.js | 7 +- e2e/transform-linked-modules/preprocessor.js | 7 +- .../babel-jest-ignored/babel.config.js | 7 +- e2e/transform/babel-jest/babel.config.js | 7 +- .../babel.config.js | 7 +- .../ecmascript-modules-support/src/index.mjs | 7 +- .../ecmascript-modules-support/src/module.mjs | 7 +- .../multiple-transformers/babel.config.js | 7 +- .../__tests__/coveredTest.ts | 7 +- e2e/typescript-coverage/covered.ts | 7 +- .../typescriptPreprocessor.js | 7 +- jest.config.ci.js | 7 +- jest.config.js | 7 +- packages/jest-circus/runner.js | 5 +- .../src/__mocks__/testEventHandler.ts | 5 +- .../jest-circus/src/__mocks__/testUtils.ts | 5 +- .../src/__tests__/afterAll.test.ts | 5 +- .../src/__tests__/baseTest.test.ts | 5 +- .../jest-circus/src/__tests__/hooks.test.ts | 5 +- .../has_jest_config_file/jest.config.js | 7 +- .../src/__tests__/Defaults.test.ts | 7 +- .../src/__tests__/readConfig.test.ts | 7 +- .../src/__tests__/readConfigs.test.ts | 7 +- .../jest-core/src/SnapshotInteractiveMode.ts | 5 +- .../src/__tests__/FailedTestsCache.test.js | 7 +- .../__fixtures__/watch_plugin_throws.js | 7 +- .../__snapshots__/watch.test.js.snap | 2 +- .../__tests__/getNoTestsFoundMessage.test.js | 7 +- .../jest-core/src/__tests__/run_jest.test.js | 7 +- .../test_root/__testtests__/test.foobar | 7 +- .../__tests__/test_root/__testtests__/test.js | 7 +- .../test_root/__testtests__/test.jsx | 7 +- .../src/__tests__/test_root/module.foobar | 7 +- .../src/__tests__/test_root/module.jsx | 7 +- .../src/__tests__/test_root/no_tests.js | 7 +- .../__testtests__/test.js | 7 +- .../test_root_with_(parentheses)/module.jsx | 7 +- .../jest-core/src/getNoTestFoundFailed.ts | 7 +- .../src/getNoTestFoundPassWithNoTests.ts | 7 +- .../getNoTestFoundRelatedToChangedFiles.ts | 7 +- .../jest-core/src/getNoTestFoundVerbose.ts | 7 +- packages/jest-core/src/pluralize.ts | 7 +- .../jest-docblock/src/__tests__/index.test.ts | 1 - .../src/lib/__tests__/fast_path.test.js | 2 - .../__tests__/getPlatformExtension.test.js | 2 - .../lib/__tests__/normalizePathSep.test.js | 2 - .../src/__tests__/index.test.ts | 7 +- .../src/__tests__/index.test.ts | 7 +- packages/jest-repl/src/cli/repl.ts | 2 - .../src/__tests__/isBuiltinModule.test.ts | 7 +- .../src/__tests__/defaultResolver.js | 7 +- .../__mocks__/nested1/nested2/nested3.js | 7 +- .../test_root/dep_on_mapped_module.js | 7 +- .../test_root/mapped_dir/moduleInMapped.js | 7 +- .../test_root/nested1/nested2/nested3.js | 7 +- .../node_modules/jest-resolve-test/browser.js | 7 +- .../node_modules/jest-resolve-test/node.js | 7 +- .../sourcemaps/out/throwing-mapped-fn.js | 12 +- .../sourcemaps/throwing-mapped-fn.js | 5 +- packages/jest-runtime/src/helpers.ts | 7 +- .../jest-snapshot/src/__mocks__/prettier.js | 7 +- ...customSnapshotResolver-inconsistent-fns.js | 7 +- ...hotResolver-missing-resolveSnapshotPath.js | 7 +- ...napshotResolver-missing-resolveTestPath.js | 7 +- ...missing-test-path-for-consistency-check.js | 7 +- .../fixtures/customSnapshotResolver.js | 7 +- .../src/__tests__/snapshot_resolver.test.ts | 7 +- .../src/__tests__/getCallsite.test.ts | 7 +- .../src/enhanceUnexpectedTokenMessage.ts | 7 +- .../src/__tests__/isInteractive.test.ts | 7 +- packages/jest-util/src/isInteractive.ts | 7 +- .../src/lib/__tests__/scroll.test.ts | 7 +- scripts/checkCopyrightHeaders.js | 16 ++- scripts/remove-postinstall.js | 7 +- website/fetchSupporters.js | 7 +- website/languages.js | 3 + website/pages/en/videos.js | 7 +- website/siteConfig.js | 3 +- website/static/css/custom.css | 7 +- website/static/css/hljs-jest.css | 7 +- website/static/css/jest.css | 7 +- website/static/landing.js | 7 +- 160 files changed, 985 insertions(+), 323 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 696eeb23d138..6283466826be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,7 +46,7 @@ - `[docs]` Updated react tutorial to refer to new package of react-testing-library (@testing-library/react) ([#8753](https://github.com/facebook/jest/pull/8753)) - `[docs]` Updated imports of react-testing-library to @testing-library/react in website ([#8757](https://github.com/facebook/jest/pull/8757)) - `[jest-core]` Add `getVersion` (moved from `jest-cli`) ([#8706](https://github.com/facebook/jest/pull/8706)) -- `[docs]` Fix MockFunctions example that was using toContain instead of toContainEqual ([#8765](https://github.com/facebook/jest/pull/8765)) +- `[docs]` Fix MockFunctions example that was using toContain instead of toContainEqual ([#8765](https://github.com/facebook/jest/pull/8765)) `[*]` Make sure copyright header comment includes license ([#8783](https://github.com/facebook/jest/pull/8783)) ### Performance diff --git a/babel.config.js b/babel.config.js index 1b7ec83a43ec..7e1e2aeaf94d 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = { babelrcRoots: ['examples/*'], diff --git a/e2e/__tests__/__snapshots__/beforeAllFiltered.ts.snap b/e2e/__tests__/__snapshots__/beforeAllFiltered.ts.snap index 45020a37634b..247de33015d5 100644 --- a/e2e/__tests__/__snapshots__/beforeAllFiltered.ts.snap +++ b/e2e/__tests__/__snapshots__/beforeAllFiltered.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Correct BeforeAll run ensures the BeforeAll of ignored suite is not run 1`] = ` - console.log __tests__/beforeAllFiltered.test.js:5 + console.log __tests__/beforeAllFiltered.test.js:10 beforeAll 1 - console.log __tests__/beforeAllFiltered.test.js:8 + console.log __tests__/beforeAllFiltered.test.js:13 beforeEach 1 - console.log __tests__/beforeAllFiltered.test.js:17 + console.log __tests__/beforeAllFiltered.test.js:22 It Foo - console.log __tests__/beforeAllFiltered.test.js:11 + console.log __tests__/beforeAllFiltered.test.js:16 afterEach 1 - console.log __tests__/beforeAllFiltered.test.js:14 + console.log __tests__/beforeAllFiltered.test.js:19 afterAll 1 `; diff --git a/e2e/__tests__/__snapshots__/beforeEachQueue.ts.snap b/e2e/__tests__/__snapshots__/beforeEachQueue.ts.snap index 98ede3375283..a665905a9f06 100644 --- a/e2e/__tests__/__snapshots__/beforeEachQueue.ts.snap +++ b/e2e/__tests__/__snapshots__/beforeEachQueue.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Correct beforeEach order ensures the correct order for beforeEach 1`] = ` - console.log __tests__/beforeEachQueue.test.js:5 + console.log __tests__/beforeEachQueue.test.js:10 BeforeEach - console.log __tests__/beforeEachQueue.test.js:9 + console.log __tests__/beforeEachQueue.test.js:14 It Foo - console.log __tests__/beforeEachQueue.test.js:12 + console.log __tests__/beforeEachQueue.test.js:17 BeforeEach Inline Foo - console.log __tests__/beforeEachQueue.test.js:5 + console.log __tests__/beforeEachQueue.test.js:10 BeforeEach - console.log __tests__/beforeEachQueue.test.js:17 + console.log __tests__/beforeEachQueue.test.js:22 It Bar `; diff --git a/e2e/__tests__/__snapshots__/coverageRemapping.test.ts.snap b/e2e/__tests__/__snapshots__/coverageRemapping.test.ts.snap index ee84a8e4d887..924acea07ce9 100644 --- a/e2e/__tests__/__snapshots__/coverageRemapping.test.ts.snap +++ b/e2e/__tests__/__snapshots__/coverageRemapping.test.ts.snap @@ -27,32 +27,32 @@ Object { "loc": Object { "end": Object { "column": 35, - "line": 6, + "line": 11, }, "start": Object { "column": 34, - "line": 6, + "line": 11, }, }, "locations": Array [ Object { "end": Object { "column": 35, - "line": 6, + "line": 11, }, "start": Object { "column": 34, - "line": 6, + "line": 11, }, }, Object { "end": Object { "column": 39, - "line": 6, + "line": 11, }, "start": Object { "column": 38, - "line": 6, + "line": 11, }, }, ], @@ -62,32 +62,32 @@ Object { "loc": Object { "end": Object { "column": 35, - "line": 7, + "line": 12, }, "start": Object { "column": 34, - "line": 7, + "line": 12, }, }, "locations": Array [ Object { "end": Object { "column": 35, - "line": 7, + "line": 12, }, "start": Object { "column": 34, - "line": 7, + "line": 12, }, }, Object { "end": Object { "column": 39, - "line": 7, + "line": 12, }, "start": Object { "column": 38, - "line": 7, + "line": 12, }, }, ], @@ -97,42 +97,42 @@ Object { "loc": Object { "end": Object { "column": 31, - "line": 8, + "line": 13, }, "start": Object { "column": 27, - "line": 8, + "line": 13, }, }, "locations": Array [ Object { "end": Object { "column": 31, - "line": 8, + "line": 13, }, "start": Object { "column": 27, - "line": 8, + "line": 13, }, }, Object { "end": Object { "column": 39, - "line": 8, + "line": 13, }, "start": Object { "column": 35, - "line": 8, + "line": 13, }, }, Object { "end": Object { "column": 48, - "line": 8, + "line": 13, }, "start": Object { "column": 43, - "line": 8, + "line": 13, }, }, ], @@ -142,32 +142,32 @@ Object { "loc": Object { "end": Object { "column": 40, - "line": 9, + "line": 14, }, "start": Object { "column": 30, - "line": 9, + "line": 14, }, }, "locations": Array [ Object { "end": Object { "column": 40, - "line": 9, + "line": 14, }, "start": Object { "column": 30, - "line": 9, + "line": 14, }, }, Object { "end": Object { "column": 53, - "line": 9, + "line": 14, }, "start": Object { "column": 43, - "line": 9, + "line": 14, }, }, ], @@ -184,21 +184,21 @@ Object { "decl": Object { "end": Object { "column": 29, - "line": 5, + "line": 10, }, "start": Object { "column": 9, - "line": 5, + "line": 10, }, }, "loc": Object { "end": Object { "column": 1, - "line": 12, + "line": 17, }, "start": Object { "column": 49, - "line": 5, + "line": 10, }, }, "name": "difference", @@ -207,21 +207,21 @@ Object { "decl": Object { "end": Object { "column": 36, - "line": 9, + "line": 14, }, "start": Object { "column": 30, - "line": 9, + "line": 14, }, }, "loc": Object { "end": Object { "column": 40, - "line": 9, + "line": 14, }, "start": Object { "column": 30, - "line": 9, + "line": 14, }, }, "name": "(anonymous_1)", @@ -230,21 +230,21 @@ Object { "decl": Object { "end": Object { "column": 49, - "line": 9, + "line": 14, }, "start": Object { "column": 43, - "line": 9, + "line": 14, }, }, "loc": Object { "end": Object { "column": 53, - "line": 9, + "line": 14, }, "start": Object { "column": 43, - "line": 9, + "line": 14, }, }, "name": "(anonymous_2)", @@ -265,81 +265,81 @@ Object { "0": Object { "end": Object { "column": 2, - "line": 12, + "line": 17, }, "start": Object { "column": 0, - "line": 5, + "line": 10, }, }, "1": Object { "end": Object { "column": 39, - "line": 6, + "line": 11, }, "start": Object { "column": 27, - "line": 6, + "line": 11, }, }, "2": Object { "end": Object { "column": 39, - "line": 7, + "line": 12, }, "start": Object { "column": 27, - "line": 7, + "line": 12, }, }, "3": Object { "end": Object { "column": 48, - "line": 8, + "line": 13, }, "start": Object { "column": 27, - "line": 8, + "line": 13, }, }, "4": Object { "end": Object { "column": 53, - "line": 9, + "line": 14, }, "start": Object { "column": 23, - "line": 9, + "line": 14, }, }, "5": Object { "end": Object { "column": 43, - "line": 9, + "line": 14, }, "start": Object { "column": 36, - "line": 9, + "line": 14, }, }, "6": Object { "end": Object { "column": 54, - "line": 9, + "line": 14, }, "start": Object { "column": 49, - "line": 9, + "line": 14, }, }, "7": Object { "end": Object { "column": 15, - "line": 11, + "line": 16, }, "start": Object { "column": 2, - "line": 11, + "line": 16, }, }, }, diff --git a/e2e/__tests__/__snapshots__/detectOpenHandles.ts.snap b/e2e/__tests__/__snapshots__/detectOpenHandles.ts.snap index eb668ee97c2f..adde74db4e47 100644 --- a/e2e/__tests__/__snapshots__/detectOpenHandles.ts.snap +++ b/e2e/__tests__/__snapshots__/detectOpenHandles.ts.snap @@ -13,14 +13,14 @@ Jest has detected the following 1 open handle potentially keeping Jest from exit ● GETADDRINFOREQWRAP - 7 | const app = new Server(); - 8 | - > 9 | app.listen({host: 'localhost', port: 0}); + 12 | const app = new Server(); + 13 | + > 14 | app.listen({host: 'localhost', port: 0}); | ^ - 10 | + 15 | - at Object.listen (server.js:9:5) - at Object.require (__tests__/outside.js:3:1) + at Object.listen (server.js:14:5) + at Object.require (__tests__/outside.js:8:1) `; exports[`prints out info about open handlers from inside tests 1`] = ` @@ -28,13 +28,13 @@ Jest has detected the following 1 open handle potentially keeping Jest from exit ● Timeout - 2 | - 3 | test('something', () => { - > 4 | setTimeout(() => {}, 30000); - | ^ - 5 | expect(true).toBe(true); - 6 | }); - 7 | + 7 | + 8 | test('something', () => { + > 9 | setTimeout(() => {}, 30000); + | ^ + 10 | expect(true).toBe(true); + 11 | }); + 12 | - at Object.setTimeout (__tests__/inside.js:4:3) + at Object.setTimeout (__tests__/inside.js:9:3) `; diff --git a/e2e/__tests__/__snapshots__/failures.test.ts.snap b/e2e/__tests__/__snapshots__/failures.test.ts.snap index 6e2ea6c5dafd..a9ad9ea74cf2 100644 --- a/e2e/__tests__/__snapshots__/failures.test.ts.snap +++ b/e2e/__tests__/__snapshots__/failures.test.ts.snap @@ -126,43 +126,43 @@ FAIL __tests__/duringTests.test.js thrown: Promise {} - 7 | }; - 8 | - > 9 | test('Promise thrown during test', () => { + 12 | }; + 13 | + > 14 | test('Promise thrown during test', () => { | ^ - 10 | throw Promise.resolve(5); - 11 | }); - 12 | + 15 | throw Promise.resolve(5); + 16 | }); + 17 | - at Object.test (__tests__/duringTests.test.js:9:1) + at Object.test (__tests__/duringTests.test.js:14:1) ● Boolean thrown during test thrown: false - 11 | }); - 12 | - > 13 | test('Boolean thrown during test', () => { - | ^ - 14 | // eslint-disable-next-line no-throw-literal - 15 | throw false; 16 | }); + 17 | + > 18 | test('Boolean thrown during test', () => { + | ^ + 19 | // eslint-disable-next-line no-throw-literal + 20 | throw false; + 21 | }); - at Object.test (__tests__/duringTests.test.js:13:1) + at Object.test (__tests__/duringTests.test.js:18:1) ● undefined thrown during test thrown: undefined - 16 | }); - 17 | - > 18 | test('undefined thrown during test', () => { - | ^ - 19 | // eslint-disable-next-line no-throw-literal - 20 | throw undefined; 21 | }); + 22 | + > 23 | test('undefined thrown during test', () => { + | ^ + 24 | // eslint-disable-next-line no-throw-literal + 25 | throw undefined; + 26 | }); - at Object.test (__tests__/duringTests.test.js:18:1) + at Object.test (__tests__/duringTests.test.js:23:1) ● Object thrown during test @@ -175,43 +175,43 @@ FAIL __tests__/duringTests.test.js ], } - 21 | }); - 22 | - > 23 | test('Object thrown during test', () => { + 26 | }); + 27 | + > 28 | test('Object thrown during test', () => { | ^ - 24 | throw deepObject; - 25 | }); - 26 | + 29 | throw deepObject; + 30 | }); + 31 | - at Object.test (__tests__/duringTests.test.js:23:1) + at Object.test (__tests__/duringTests.test.js:28:1) ● Error during test ReferenceError: doesNotExist is not defined - 27 | test('Error during test', () => { - 28 | // eslint-disable-next-line no-undef - > 29 | doesNotExist.alsoThisNot; + 32 | test('Error during test', () => { + 33 | // eslint-disable-next-line no-undef + > 34 | doesNotExist.alsoThisNot; | ^ - 30 | }); - 31 | - 32 | test('done(Error)', done => { + 35 | }); + 36 | + 37 | test('done(Error)', done => { - at Object.doesNotExist (__tests__/duringTests.test.js:29:3) + at Object.doesNotExist (__tests__/duringTests.test.js:34:3) ● done(Error) this is an error - 31 | - 32 | test('done(Error)', done => { - > 33 | done(new Error('this is an error')); + 36 | + 37 | test('done(Error)', done => { + > 38 | done(new Error('this is an error')); | ^ - 34 | }); - 35 | - 36 | test('done(non-error)', done => { + 39 | }); + 40 | + 41 | test('done(non-error)', done => { - at Object..done (__tests__/duringTests.test.js:33:8) + at Object..done (__tests__/duringTests.test.js:38:8) ● done(non-error) @@ -224,15 +224,15 @@ FAIL __tests__/duringTests.test.js ], } - 35 | - 36 | test('done(non-error)', done => { - > 37 | done(deepObject); + 40 | + 41 | test('done(non-error)', done => { + > 42 | done(deepObject); | ^ - 38 | }); - 39 | - 40 | test('returned promise rejection', () => Promise.reject(deepObject)); + 43 | }); + 44 | + 45 | test('returned promise rejection', () => Promise.reject(deepObject)); - at Object.done (__tests__/duringTests.test.js:37:3) + at Object.done (__tests__/duringTests.test.js:42:3) ● returned promise rejection @@ -245,13 +245,13 @@ FAIL __tests__/duringTests.test.js ], } - 38 | }); - 39 | - > 40 | test('returned promise rejection', () => Promise.reject(deepObject)); + 43 | }); + 44 | + > 45 | test('returned promise rejection', () => Promise.reject(deepObject)); | ^ - 41 | + 46 | - at Object.test (__tests__/duringTests.test.js:40:1) + at Object.test (__tests__/duringTests.test.js:45:1) `; exports[`works with assertions in separate files 1`] = ` diff --git a/e2e/__tests__/__snapshots__/processExit.test.ts.snap b/e2e/__tests__/__snapshots__/processExit.test.ts.snap index 13915892b8dc..bebf5dc22ee6 100644 --- a/e2e/__tests__/__snapshots__/processExit.test.ts.snap +++ b/e2e/__tests__/__snapshots__/processExit.test.ts.snap @@ -3,14 +3,14 @@ exports[`prints stack trace pointing to process.exit call 1`] = ` ● process.exit called with "1" - 1 | // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. - 2 | - > 3 | process.exit(1); - | ^ - 4 | - 5 | test('something', () => { - 6 | expect(true).toBe(true); + 6 | */ + 7 | + > 8 | process.exit(1); + | ^ + 9 | + 10 | test('something', () => { + 11 | expect(true).toBe(true); - at Object.exit (__tests__/test.js:3:9) + at Object.exit (__tests__/test.js:8:9) `; diff --git a/e2e/__tests__/__snapshots__/resolveNoFileExtensions.test.ts.snap b/e2e/__tests__/__snapshots__/resolveNoFileExtensions.test.ts.snap index 7a66f6098b01..bdde57ca78a5 100644 --- a/e2e/__tests__/__snapshots__/resolveNoFileExtensions.test.ts.snap +++ b/e2e/__tests__/__snapshots__/resolveNoFileExtensions.test.ts.snap @@ -27,12 +27,12 @@ FAIL __tests__/test.js See https://jestjs.io/docs/en/configuration#modulefileextensions-array-string - 1 | // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. - 2 | - > 3 | module.exports = require('./some-json-file'); + 6 | */ + 7 | + > 8 | module.exports = require('./some-json-file'); | ^ - 4 | + 9 | at Resolver.resolveModule (../../packages/jest-resolve/build/index.js:259:17) - at Object.require (index.js:3:18) + at Object.require (index.js:8:18) `; diff --git a/e2e/async-regenerator/__tests__/test.js b/e2e/async-regenerator/__tests__/test.js index 16444c6fc0b5..84928a477e29 100644 --- a/e2e/async-regenerator/__tests__/test.js +++ b/e2e/async-regenerator/__tests__/test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ test('dummy test', async () => { const value = await Promise.resolve(1); diff --git a/e2e/async-regenerator/babel.config.js b/e2e/async-regenerator/babel.config.js index 756b4d62f681..0ac60b8feb3f 100644 --- a/e2e/async-regenerator/babel.config.js +++ b/e2e/async-regenerator/babel.config.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = { plugins: [ diff --git a/e2e/babel-plugin-jest-hoist/babel.config.js b/e2e/babel-plugin-jest-hoist/babel.config.js index 5650b39d7303..eb10f8afde70 100644 --- a/e2e/babel-plugin-jest-hoist/babel.config.js +++ b/e2e/babel-plugin-jest-hoist/babel.config.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = { overrides: [ diff --git a/e2e/before-all-filtered/__tests__/beforeAllFiltered.test.js b/e2e/before-all-filtered/__tests__/beforeAllFiltered.test.js index 5534a95a213c..a37ae43a74c2 100644 --- a/e2e/before-all-filtered/__tests__/beforeAllFiltered.test.js +++ b/e2e/before-all-filtered/__tests__/beforeAllFiltered.test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ describe('test_1', () => { beforeAll(() => { diff --git a/e2e/before-each-queue/__tests__/beforeEachQueue.test.js b/e2e/before-each-queue/__tests__/beforeEachQueue.test.js index 017c6095ddf4..84016d82d6b1 100644 --- a/e2e/before-each-queue/__tests__/beforeEachQueue.test.js +++ b/e2e/before-each-queue/__tests__/beforeEachQueue.test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ describe('test', () => { beforeEach(() => { diff --git a/e2e/compare-dom-nodes/__tests__/failedAssertion.js b/e2e/compare-dom-nodes/__tests__/failedAssertion.js index 1399fd78965d..01d4476728b7 100644 --- a/e2e/compare-dom-nodes/__tests__/failedAssertion.js +++ b/e2e/compare-dom-nodes/__tests__/failedAssertion.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ /* global document */ diff --git a/e2e/coverage-remapping/__tests__/coveredTest.ts b/e2e/coverage-remapping/__tests__/coveredTest.ts index b430bb59db14..a0c3843d9f91 100644 --- a/e2e/coverage-remapping/__tests__/coveredTest.ts +++ b/e2e/coverage-remapping/__tests__/coveredTest.ts @@ -1,4 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + const difference = require('../covered.ts'); it('subtracts correctly', () => { diff --git a/e2e/coverage-remapping/covered.ts b/e2e/coverage-remapping/covered.ts index 84b8f7ab9c2e..36ba129fd3b2 100644 --- a/e2e/coverage-remapping/covered.ts +++ b/e2e/coverage-remapping/covered.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ /* eslint-disable @typescript-eslint/no-unused-vars */ diff --git a/e2e/coverage-report/babel.config.js b/e2e/coverage-report/babel.config.js index 245aa3fd79db..186d686670e3 100644 --- a/e2e/coverage-report/babel.config.js +++ b/e2e/coverage-report/babel.config.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = { presets: ['@babel/preset-flow'], diff --git a/e2e/custom-resolver/__mocks__/manualMock.js b/e2e/custom-resolver/__mocks__/manualMock.js index 296873363119..86c07dcd7260 100644 --- a/e2e/custom-resolver/__mocks__/manualMock.js +++ b/e2e/custom-resolver/__mocks__/manualMock.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = require('bar'); diff --git a/e2e/custom-resolver/bar.js b/e2e/custom-resolver/bar.js index 026703fbe530..39f347478b2a 100644 --- a/e2e/custom-resolver/bar.js +++ b/e2e/custom-resolver/bar.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = 'bar'; diff --git a/e2e/custom-resolver/foo.js b/e2e/custom-resolver/foo.js index 08cb1c0206ab..3f40dc0d6bd1 100644 --- a/e2e/custom-resolver/foo.js +++ b/e2e/custom-resolver/foo.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = () => {}; diff --git a/e2e/custom-resolver/manualMock.js b/e2e/custom-resolver/manualMock.js index a67507b66494..a94d175d3b59 100644 --- a/e2e/custom-resolver/manualMock.js +++ b/e2e/custom-resolver/manualMock.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ throw new Error('Must be mocked'); diff --git a/e2e/custom-resolver/resolver.js b/e2e/custom-resolver/resolver.js index 4db6cbf41c39..99a078297896 100644 --- a/e2e/custom-resolver/resolver.js +++ b/e2e/custom-resolver/resolver.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ const { default: defaultResolver, diff --git a/e2e/deprecated-cli-options/__tests__/dummy.js b/e2e/deprecated-cli-options/__tests__/dummy.js index af73fbfafd1b..1925b3756db7 100644 --- a/e2e/deprecated-cli-options/__tests__/dummy.js +++ b/e2e/deprecated-cli-options/__tests__/dummy.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ test('Dummy', () => { expect(2).toBe(2); diff --git a/e2e/detect-open-handles/__tests__/inside.js b/e2e/detect-open-handles/__tests__/inside.js index d8f499a5e71a..477db0e30e7c 100644 --- a/e2e/detect-open-handles/__tests__/inside.js +++ b/e2e/detect-open-handles/__tests__/inside.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ test('something', () => { setTimeout(() => {}, 30000); diff --git a/e2e/detect-open-handles/__tests__/outside.js b/e2e/detect-open-handles/__tests__/outside.js index 586e5252202b..6a332cca6005 100644 --- a/e2e/detect-open-handles/__tests__/outside.js +++ b/e2e/detect-open-handles/__tests__/outside.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ require('../server'); diff --git a/e2e/detect-open-handles/__tests__/promise.js b/e2e/detect-open-handles/__tests__/promise.js index 38c56b37d218..615f6017d91c 100644 --- a/e2e/detect-open-handles/__tests__/promise.js +++ b/e2e/detect-open-handles/__tests__/promise.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ test('something', () => { // eslint-disable-next-line no-new diff --git a/e2e/detect-open-handles/babel.config.js b/e2e/detect-open-handles/babel.config.js index 7ec52588d4a4..9be036106918 100644 --- a/e2e/detect-open-handles/babel.config.js +++ b/e2e/detect-open-handles/babel.config.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = require('../../babel.config'); diff --git a/e2e/detect-open-handles/server.js b/e2e/detect-open-handles/server.js index 624352c5fe9e..29bcd69ed5fb 100644 --- a/e2e/detect-open-handles/server.js +++ b/e2e/detect-open-handles/server.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/e2e/expect-async-matcher/babel.config.js b/e2e/expect-async-matcher/babel.config.js index bf18fc5ce74e..9f54b3667a03 100644 --- a/e2e/expect-async-matcher/babel.config.js +++ b/e2e/expect-async-matcher/babel.config.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ const baseConfig = require('../../babel.config'); diff --git a/e2e/failures/__tests__/duringTests.test.js b/e2e/failures/__tests__/duringTests.test.js index c315f5aa7cdc..679fefada8d5 100644 --- a/e2e/failures/__tests__/duringTests.test.js +++ b/e2e/failures/__tests__/duringTests.test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/e2e/failures/babel.config.js b/e2e/failures/babel.config.js index bf18fc5ce74e..9f54b3667a03 100644 --- a/e2e/failures/babel.config.js +++ b/e2e/failures/babel.config.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ const baseConfig = require('../../babel.config'); diff --git a/e2e/filter/my-broken-filter.js b/e2e/filter/my-broken-filter.js index a1faac8150a9..42d16cfc4fbe 100644 --- a/e2e/filter/my-broken-filter.js +++ b/e2e/filter/my-broken-filter.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/e2e/filter/my-broken-setup-filter.js b/e2e/filter/my-broken-setup-filter.js index 3a7651c0ccb9..887cc8b63e5a 100644 --- a/e2e/filter/my-broken-setup-filter.js +++ b/e2e/filter/my-broken-setup-filter.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/e2e/filter/my-clowny-filter.js b/e2e/filter/my-clowny-filter.js index aa59e1556f32..f716b38d690d 100644 --- a/e2e/filter/my-clowny-filter.js +++ b/e2e/filter/my-clowny-filter.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/e2e/filter/my-filter.js b/e2e/filter/my-filter.js index dc30f54e3d51..33db34218a63 100644 --- a/e2e/filter/my-filter.js +++ b/e2e/filter/my-filter.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/e2e/filter/my-secondary-filter.js b/e2e/filter/my-secondary-filter.js index 34ce10d06bfb..70b3fb8c352f 100644 --- a/e2e/filter/my-secondary-filter.js +++ b/e2e/filter/my-secondary-filter.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/e2e/filter/my-setup-filter.js b/e2e/filter/my-setup-filter.js index 62861b832114..d9ce620f0405 100644 --- a/e2e/filter/my-setup-filter.js +++ b/e2e/filter/my-setup-filter.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/e2e/global-setup-custom-transform/index.js b/e2e/global-setup-custom-transform/index.js index f45215d7460d..4454b7f7bf58 100644 --- a/e2e/global-setup-custom-transform/index.js +++ b/e2e/global-setup-custom-transform/index.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = 'hello!'; diff --git a/e2e/global-setup-custom-transform/transformer.js b/e2e/global-setup-custom-transform/transformer.js index ba92f92952f0..178565a491e2 100644 --- a/e2e/global-setup-custom-transform/transformer.js +++ b/e2e/global-setup-custom-transform/transformer.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/e2e/global-setup/babel.config.js b/e2e/global-setup/babel.config.js index 443b08450adb..8b285c15ba0b 100644 --- a/e2e/global-setup/babel.config.js +++ b/e2e/global-setup/babel.config.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = { presets: ['@babel/preset-env', '@babel/preset-flow'], diff --git a/e2e/global-setup/custom-tests-dir/pass.test.js b/e2e/global-setup/custom-tests-dir/pass.test.js index 9b0c9ebdfaa1..0bc632c00f3a 100644 --- a/e2e/global-setup/custom-tests-dir/pass.test.js +++ b/e2e/global-setup/custom-tests-dir/pass.test.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ test('should pass', () => {}); diff --git a/e2e/global-setup/invalidSetup.js b/e2e/global-setup/invalidSetup.js index 064a0512c573..3b8006bd8afc 100644 --- a/e2e/global-setup/invalidSetup.js +++ b/e2e/global-setup/invalidSetup.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ console.log('there is no exported function'); diff --git a/e2e/global-teardown/babel.config.js b/e2e/global-teardown/babel.config.js index 443b08450adb..8b285c15ba0b 100644 --- a/e2e/global-teardown/babel.config.js +++ b/e2e/global-teardown/babel.config.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = { presets: ['@babel/preset-env', '@babel/preset-flow'], diff --git a/e2e/global-teardown/custom-tests-dir/pass.test.js b/e2e/global-teardown/custom-tests-dir/pass.test.js index 9b0c9ebdfaa1..0bc632c00f3a 100644 --- a/e2e/global-teardown/custom-tests-dir/pass.test.js +++ b/e2e/global-teardown/custom-tests-dir/pass.test.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ test('should pass', () => {}); diff --git a/e2e/global-teardown/invalidTeardown.js b/e2e/global-teardown/invalidTeardown.js index 064a0512c573..3b8006bd8afc 100644 --- a/e2e/global-teardown/invalidTeardown.js +++ b/e2e/global-teardown/invalidTeardown.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ console.log('there is no exported function'); diff --git a/e2e/jasmine-async/__tests__/pendingInPromise.test.js b/e2e/jasmine-async/__tests__/pendingInPromise.test.js index 23f523cf1b28..b88200bef52b 100644 --- a/e2e/jasmine-async/__tests__/pendingInPromise.test.js +++ b/e2e/jasmine-async/__tests__/pendingInPromise.test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/e2e/multi-project-config-root/bar/__tests__/boggusBar.test.js b/e2e/multi-project-config-root/bar/__tests__/boggusBar.test.js index 9e036fd7b5ef..153a6a45192f 100644 --- a/e2e/multi-project-config-root/bar/__tests__/boggusBar.test.js +++ b/e2e/multi-project-config-root/bar/__tests__/boggusBar.test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ describe('Bar', () => { it('fail', () => { diff --git a/e2e/multi-project-config-root/foo/__tests__/boggusFoo.test.js b/e2e/multi-project-config-root/foo/__tests__/boggusFoo.test.js index 4e5f416981e1..6d4f3095a3c6 100644 --- a/e2e/multi-project-config-root/foo/__tests__/boggusFoo.test.js +++ b/e2e/multi-project-config-root/foo/__tests__/boggusFoo.test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ describe('Foo', () => { it('fail', () => { diff --git a/e2e/native-async-mock/Native.js b/e2e/native-async-mock/Native.js index dbf8a192f850..40600a495a2e 100644 --- a/e2e/native-async-mock/Native.js +++ b/e2e/native-async-mock/Native.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/e2e/native-async-mock/__tests__/nativeAsyncMock.test.js b/e2e/native-async-mock/__tests__/nativeAsyncMock.test.js index f6b00f38947b..c61b94f420f9 100644 --- a/e2e/native-async-mock/__tests__/nativeAsyncMock.test.js +++ b/e2e/native-async-mock/__tests__/nativeAsyncMock.test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/e2e/override-globals/babel.config.js b/e2e/override-globals/babel.config.js index 7ec52588d4a4..9be036106918 100644 --- a/e2e/override-globals/babel.config.js +++ b/e2e/override-globals/babel.config.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = require('../../babel.config'); diff --git a/e2e/presets/js/node_modules/jest-preset-js/jest-preset.js b/e2e/presets/js/node_modules/jest-preset-js/jest-preset.js index 2d040723a3e1..6bc332577a33 100644 --- a/e2e/presets/js/node_modules/jest-preset-js/jest-preset.js +++ b/e2e/presets/js/node_modules/jest-preset-js/jest-preset.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = { moduleNameMapper: { diff --git a/e2e/presets/js/node_modules/jest-preset-js/mapper.js b/e2e/presets/js/node_modules/jest-preset-js/mapper.js index da42adcd7cc0..ddedd1efe52c 100644 --- a/e2e/presets/js/node_modules/jest-preset-js/mapper.js +++ b/e2e/presets/js/node_modules/jest-preset-js/mapper.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = 42; diff --git a/e2e/presets/json/node_modules/jest-preset-json/mapper.js b/e2e/presets/json/node_modules/jest-preset-json/mapper.js index da42adcd7cc0..ddedd1efe52c 100644 --- a/e2e/presets/json/node_modules/jest-preset-json/mapper.js +++ b/e2e/presets/json/node_modules/jest-preset-json/mapper.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = 42; diff --git a/e2e/process-exit/__tests__/test.js b/e2e/process-exit/__tests__/test.js index 7e550feb2c82..8b6ba35f4658 100644 --- a/e2e/process-exit/__tests__/test.js +++ b/e2e/process-exit/__tests__/test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ process.exit(1); diff --git a/e2e/process-exit/babel.config.js b/e2e/process-exit/babel.config.js index 7ec52588d4a4..9be036106918 100644 --- a/e2e/process-exit/babel.config.js +++ b/e2e/process-exit/babel.config.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = require('../../babel.config'); diff --git a/e2e/require-main/babel.config.js b/e2e/require-main/babel.config.js index 7ec52588d4a4..9be036106918 100644 --- a/e2e/require-main/babel.config.js +++ b/e2e/require-main/babel.config.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = require('../../babel.config'); diff --git a/e2e/resolve-get-paths/babel.config.js b/e2e/resolve-get-paths/babel.config.js index 7ec52588d4a4..9be036106918 100644 --- a/e2e/resolve-get-paths/babel.config.js +++ b/e2e/resolve-get-paths/babel.config.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = require('../../babel.config'); diff --git a/e2e/resolve-no-extensions/__tests__/test.js b/e2e/resolve-no-extensions/__tests__/test.js index 9d92296a25e0..6e48707f45ef 100644 --- a/e2e/resolve-no-extensions/__tests__/test.js +++ b/e2e/resolve-no-extensions/__tests__/test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ const m = require('../'); diff --git a/e2e/resolve-no-extensions/babel.config.js b/e2e/resolve-no-extensions/babel.config.js index 7ec52588d4a4..9be036106918 100644 --- a/e2e/resolve-no-extensions/babel.config.js +++ b/e2e/resolve-no-extensions/babel.config.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = require('../../babel.config'); diff --git a/e2e/resolve-no-extensions/index.js b/e2e/resolve-no-extensions/index.js index 8296759e00c0..e25f4c0e8f08 100644 --- a/e2e/resolve-no-extensions/index.js +++ b/e2e/resolve-no-extensions/index.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = require('./some-json-file'); diff --git a/e2e/resolve-with-paths/babel.config.js b/e2e/resolve-with-paths/babel.config.js index 7ec52588d4a4..9be036106918 100644 --- a/e2e/resolve-with-paths/babel.config.js +++ b/e2e/resolve-with-paths/babel.config.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = require('../../babel.config'); diff --git a/e2e/run-programmatically/babel.config.js b/e2e/run-programmatically/babel.config.js index 60a2a5c5a434..ba4e1529c3d4 100644 --- a/e2e/run-programmatically/babel.config.js +++ b/e2e/run-programmatically/babel.config.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = { presets: ['@babel/preset-env'], diff --git a/e2e/snapshot-resolver/__tests__/snapshot.test.js b/e2e/snapshot-resolver/__tests__/snapshot.test.js index a37cdafb6f5d..d1bc86b0996d 100644 --- a/e2e/snapshot-resolver/__tests__/snapshot.test.js +++ b/e2e/snapshot-resolver/__tests__/snapshot.test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ test('snapshots are written to custom location', () => { expect('foobar').toMatchSnapshot(); diff --git a/e2e/snapshot-resolver/customSnapshotResolver.js b/e2e/snapshot-resolver/customSnapshotResolver.js index c55bdd7f45c1..6b2dfc60c11e 100644 --- a/e2e/snapshot-resolver/customSnapshotResolver.js +++ b/e2e/snapshot-resolver/customSnapshotResolver.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = { resolveSnapshotPath: (testPath, snapshotExtension) => diff --git a/e2e/test-environment-async/TestEnvironment.js b/e2e/test-environment-async/TestEnvironment.js index c33865fe673d..550bb3f4eb79 100644 --- a/e2e/test-environment-async/TestEnvironment.js +++ b/e2e/test-environment-async/TestEnvironment.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/e2e/test-environment-circus/CircusHandleTestEventEnvironment.js b/e2e/test-environment-circus/CircusHandleTestEventEnvironment.js index f06dc57e368a..6bd6f2191adf 100644 --- a/e2e/test-environment-circus/CircusHandleTestEventEnvironment.js +++ b/e2e/test-environment-circus/CircusHandleTestEventEnvironment.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/e2e/test-environment-circus/__tests__/circusHandleTestEvent.test.js b/e2e/test-environment-circus/__tests__/circusHandleTestEvent.test.js index 6f90232e4c55..0ac805527147 100644 --- a/e2e/test-environment-circus/__tests__/circusHandleTestEvent.test.js +++ b/e2e/test-environment-circus/__tests__/circusHandleTestEvent.test.js @@ -1,6 +1,9 @@ /** * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * * @jest-environment ./CircusHandleTestEventEnvironment.js */ diff --git a/e2e/test-environment/DocblockPragmasEnvironment.js b/e2e/test-environment/DocblockPragmasEnvironment.js index 6868bc3d4093..d32bbacba041 100644 --- a/e2e/test-environment/DocblockPragmasEnvironment.js +++ b/e2e/test-environment/DocblockPragmasEnvironment.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/e2e/test-environment/__tests__/docblockPragmas.test.js b/e2e/test-environment/__tests__/docblockPragmas.test.js index 213e5c22a273..262a754606a2 100644 --- a/e2e/test-environment/__tests__/docblockPragmas.test.js +++ b/e2e/test-environment/__tests__/docblockPragmas.test.js @@ -1,6 +1,9 @@ /** * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * * @jest-environment ./DocblockPragmasEnvironment.js * @my-custom-pragma pragma-value */ diff --git a/e2e/timer-reset-mocks/after-reset-all-mocks/timerAndMock.test.js b/e2e/timer-reset-mocks/after-reset-all-mocks/timerAndMock.test.js index c87e267c8e2e..ab26793f5589 100644 --- a/e2e/timer-reset-mocks/after-reset-all-mocks/timerAndMock.test.js +++ b/e2e/timer-reset-mocks/after-reset-all-mocks/timerAndMock.test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ describe('timers', () => { it('should work before calling resetAllMocks', () => { diff --git a/e2e/timer-reset-mocks/with-reset-mocks/timerWithMock.test.js b/e2e/timer-reset-mocks/with-reset-mocks/timerWithMock.test.js index e2f349869304..7d7cc8b75a58 100644 --- a/e2e/timer-reset-mocks/with-reset-mocks/timerWithMock.test.js +++ b/e2e/timer-reset-mocks/with-reset-mocks/timerWithMock.test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ describe('timers', () => { it('should work before calling resetAllMocks', () => { diff --git a/e2e/timer-use-real-timers/__tests__/useRealTimers.test.js b/e2e/timer-use-real-timers/__tests__/useRealTimers.test.js index 0e845f325f6a..a50c55be2f31 100644 --- a/e2e/timer-use-real-timers/__tests__/useRealTimers.test.js +++ b/e2e/timer-use-real-timers/__tests__/useRealTimers.test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ jest.useRealTimers(); diff --git a/e2e/to-match-inline-snapshot/babel.config.js b/e2e/to-match-inline-snapshot/babel.config.js index 7ec52588d4a4..9be036106918 100644 --- a/e2e/to-match-inline-snapshot/babel.config.js +++ b/e2e/to-match-inline-snapshot/babel.config.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = require('../../babel.config'); diff --git a/e2e/to-throw-error-matching-inline-snapshot/babel.config.js b/e2e/to-throw-error-matching-inline-snapshot/babel.config.js index 7ec52588d4a4..9be036106918 100644 --- a/e2e/to-throw-error-matching-inline-snapshot/babel.config.js +++ b/e2e/to-throw-error-matching-inline-snapshot/babel.config.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = require('../../babel.config'); diff --git a/e2e/transform-linked-modules/__tests__/linkedModules.test.js b/e2e/transform-linked-modules/__tests__/linkedModules.test.js index f770785bd7c0..12de8bbfffe0 100644 --- a/e2e/transform-linked-modules/__tests__/linkedModules.test.js +++ b/e2e/transform-linked-modules/__tests__/linkedModules.test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ test('normal file', () => { const normal = require('../ignored/normal'); diff --git a/e2e/transform-linked-modules/ignored/normal.js b/e2e/transform-linked-modules/ignored/normal.js index 3ab48a8a759f..a2aea770ad9e 100644 --- a/e2e/transform-linked-modules/ignored/normal.js +++ b/e2e/transform-linked-modules/ignored/normal.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = 'ignored/normal'; diff --git a/e2e/transform-linked-modules/package/index.js b/e2e/transform-linked-modules/package/index.js index 1dc611b6d180..17dd5c4e430e 100644 --- a/e2e/transform-linked-modules/package/index.js +++ b/e2e/transform-linked-modules/package/index.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = 'package/index'; diff --git a/e2e/transform-linked-modules/preprocessor.js b/e2e/transform-linked-modules/preprocessor.js index 0538a0fe943d..acf4723313d1 100644 --- a/e2e/transform-linked-modules/preprocessor.js +++ b/e2e/transform-linked-modules/preprocessor.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = { process() { diff --git a/e2e/transform/babel-jest-ignored/babel.config.js b/e2e/transform/babel-jest-ignored/babel.config.js index ef0850effc4a..7178989f46c0 100644 --- a/e2e/transform/babel-jest-ignored/babel.config.js +++ b/e2e/transform/babel-jest-ignored/babel.config.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = {only: ['blablabla']}; diff --git a/e2e/transform/babel-jest/babel.config.js b/e2e/transform/babel-jest/babel.config.js index 245aa3fd79db..186d686670e3 100644 --- a/e2e/transform/babel-jest/babel.config.js +++ b/e2e/transform/babel-jest/babel.config.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = { presets: ['@babel/preset-flow'], diff --git a/e2e/transform/ecmascript-modules-support/babel.config.js b/e2e/transform/ecmascript-modules-support/babel.config.js index a602a8e053dd..b8ec7376a9b2 100644 --- a/e2e/transform/ecmascript-modules-support/babel.config.js +++ b/e2e/transform/ecmascript-modules-support/babel.config.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = { presets: [ diff --git a/e2e/transform/ecmascript-modules-support/src/index.mjs b/e2e/transform/ecmascript-modules-support/src/index.mjs index 92c7b3ac79f5..bc5d38f2d152 100644 --- a/e2e/transform/ecmascript-modules-support/src/index.mjs +++ b/e2e/transform/ecmascript-modules-support/src/index.mjs @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ import {foo} from './module'; diff --git a/e2e/transform/ecmascript-modules-support/src/module.mjs b/e2e/transform/ecmascript-modules-support/src/module.mjs index aa42904a031a..3734db4222cb 100644 --- a/e2e/transform/ecmascript-modules-support/src/module.mjs +++ b/e2e/transform/ecmascript-modules-support/src/module.mjs @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ export const foo = () => 'a'; diff --git a/e2e/transform/multiple-transformers/babel.config.js b/e2e/transform/multiple-transformers/babel.config.js index a77cf94fd9c7..e52b556ea6c5 100644 --- a/e2e/transform/multiple-transformers/babel.config.js +++ b/e2e/transform/multiple-transformers/babel.config.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = { presets: ['@babel/preset-env', '@babel/preset-react'], diff --git a/e2e/typescript-coverage/__tests__/coveredTest.ts b/e2e/typescript-coverage/__tests__/coveredTest.ts index 46a4b2f9227f..35e342140437 100644 --- a/e2e/typescript-coverage/__tests__/coveredTest.ts +++ b/e2e/typescript-coverage/__tests__/coveredTest.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ it('adds 1 + 2 to equal 3 in TScript', () => { const sum = require('../covered.ts'); diff --git a/e2e/typescript-coverage/covered.ts b/e2e/typescript-coverage/covered.ts index 342a123d1a7f..fca70ba8c3f6 100644 --- a/e2e/typescript-coverage/covered.ts +++ b/e2e/typescript-coverage/covered.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ export = function sum(a: number, b: number): number { return a + b; diff --git a/e2e/typescript-coverage/typescriptPreprocessor.js b/e2e/typescript-coverage/typescriptPreprocessor.js index c6ee5ebed469..f70981612673 100644 --- a/e2e/typescript-coverage/typescriptPreprocessor.js +++ b/e2e/typescript-coverage/typescriptPreprocessor.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ const tsc = require('typescript'); diff --git a/jest.config.ci.js b/jest.config.ci.js index 9c4d3a3e706a..ecf98bc0bb54 100644 --- a/jest.config.ci.js +++ b/jest.config.ci.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/jest.config.js b/jest.config.js index fb70f4d04d3b..a39a9f4789f5 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/packages/jest-circus/runner.js b/packages/jest-circus/runner.js index 9dd2221862f9..cb1360dae2d9 100644 --- a/packages/jest-circus/runner.js +++ b/packages/jest-circus/runner.js @@ -1,9 +1,8 @@ /** * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. */ // Allow people to use `jest-circus/runner` as a runner. diff --git a/packages/jest-circus/src/__mocks__/testEventHandler.ts b/packages/jest-circus/src/__mocks__/testEventHandler.ts index 6ae7ab7fa2be..23dfe2bed22f 100644 --- a/packages/jest-circus/src/__mocks__/testEventHandler.ts +++ b/packages/jest-circus/src/__mocks__/testEventHandler.ts @@ -1,9 +1,8 @@ /** * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. */ import {Circus} from '@jest/types'; diff --git a/packages/jest-circus/src/__mocks__/testUtils.ts b/packages/jest-circus/src/__mocks__/testUtils.ts index 1353fcd09fda..0c53412e25b9 100644 --- a/packages/jest-circus/src/__mocks__/testUtils.ts +++ b/packages/jest-circus/src/__mocks__/testUtils.ts @@ -1,9 +1,8 @@ /** * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. */ import fs from 'fs'; diff --git a/packages/jest-circus/src/__tests__/afterAll.test.ts b/packages/jest-circus/src/__tests__/afterAll.test.ts index 386e6263e3ed..c96d93ff289c 100644 --- a/packages/jest-circus/src/__tests__/afterAll.test.ts +++ b/packages/jest-circus/src/__tests__/afterAll.test.ts @@ -1,9 +1,8 @@ /** * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. */ import {runTest} from '../__mocks__/testUtils'; diff --git a/packages/jest-circus/src/__tests__/baseTest.test.ts b/packages/jest-circus/src/__tests__/baseTest.test.ts index 66d743f5c434..429edbb39d43 100644 --- a/packages/jest-circus/src/__tests__/baseTest.test.ts +++ b/packages/jest-circus/src/__tests__/baseTest.test.ts @@ -1,9 +1,8 @@ /** * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. */ import {runTest} from '../__mocks__/testUtils'; diff --git a/packages/jest-circus/src/__tests__/hooks.test.ts b/packages/jest-circus/src/__tests__/hooks.test.ts index 02b54ae8e515..3d5f7f1af59e 100644 --- a/packages/jest-circus/src/__tests__/hooks.test.ts +++ b/packages/jest-circus/src/__tests__/hooks.test.ts @@ -1,9 +1,8 @@ /** * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. */ import {runTest} from '../__mocks__/testUtils'; diff --git a/packages/jest-cli/src/init/__tests__/fixtures/has_jest_config_file/jest.config.js b/packages/jest-cli/src/init/__tests__/fixtures/has_jest_config_file/jest.config.js index 8b2cfad40edb..54e6c946a5f7 100644 --- a/packages/jest-cli/src/init/__tests__/fixtures/has_jest_config_file/jest.config.js +++ b/packages/jest-cli/src/init/__tests__/fixtures/has_jest_config_file/jest.config.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = {}; diff --git a/packages/jest-config/src/__tests__/Defaults.test.ts b/packages/jest-config/src/__tests__/Defaults.test.ts index 2036e74e1085..31eda54e2efe 100644 --- a/packages/jest-config/src/__tests__/Defaults.test.ts +++ b/packages/jest-config/src/__tests__/Defaults.test.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ import {defaults} from '../index'; diff --git a/packages/jest-config/src/__tests__/readConfig.test.ts b/packages/jest-config/src/__tests__/readConfig.test.ts index 58ff3551430b..63d81ce7e751 100644 --- a/packages/jest-config/src/__tests__/readConfig.test.ts +++ b/packages/jest-config/src/__tests__/readConfig.test.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ import {readConfig} from '../index'; diff --git a/packages/jest-config/src/__tests__/readConfigs.test.ts b/packages/jest-config/src/__tests__/readConfigs.test.ts index e08204487c07..298f0f29625a 100644 --- a/packages/jest-config/src/__tests__/readConfigs.test.ts +++ b/packages/jest-config/src/__tests__/readConfigs.test.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ import {readConfigs} from '../index'; diff --git a/packages/jest-core/src/SnapshotInteractiveMode.ts b/packages/jest-core/src/SnapshotInteractiveMode.ts index f1a662f99525..03aaf6ac9866 100644 --- a/packages/jest-core/src/SnapshotInteractiveMode.ts +++ b/packages/jest-core/src/SnapshotInteractiveMode.ts @@ -1,9 +1,8 @@ /** * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. */ import chalk from 'chalk'; diff --git a/packages/jest-core/src/__tests__/FailedTestsCache.test.js b/packages/jest-core/src/__tests__/FailedTestsCache.test.js index a94cd4150913..da58776da4bd 100644 --- a/packages/jest-core/src/__tests__/FailedTestsCache.test.js +++ b/packages/jest-core/src/__tests__/FailedTestsCache.test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ import FailedTestsCache from '../FailedTestsCache'; diff --git a/packages/jest-core/src/__tests__/__fixtures__/watch_plugin_throws.js b/packages/jest-core/src/__tests__/__fixtures__/watch_plugin_throws.js index 076596c2837d..5d723c5c522a 100644 --- a/packages/jest-core/src/__tests__/__fixtures__/watch_plugin_throws.js +++ b/packages/jest-core/src/__tests__/__fixtures__/watch_plugin_throws.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ throw new Error('initialization error'); diff --git a/packages/jest-core/src/__tests__/__snapshots__/watch.test.js.snap b/packages/jest-core/src/__tests__/__snapshots__/watch.test.js.snap index be0c72787eaa..18af264cdf5f 100644 --- a/packages/jest-core/src/__tests__/__snapshots__/watch.test.js.snap +++ b/packages/jest-core/src/__tests__/__snapshots__/watch.test.js.snap @@ -57,7 +57,7 @@ exports[`Watch mode flows makes watch plugin initialization errors look nice 1`] initialization error - at Object. (__fixtures__/watch_plugin_throws.js:3:7) + at Object. (__fixtures__/watch_plugin_throws.js:8:7) ] `; diff --git a/packages/jest-core/src/__tests__/getNoTestsFoundMessage.test.js b/packages/jest-core/src/__tests__/getNoTestsFoundMessage.test.js index cb726cf292ee..217e6196bcea 100644 --- a/packages/jest-core/src/__tests__/getNoTestsFoundMessage.test.js +++ b/packages/jest-core/src/__tests__/getNoTestsFoundMessage.test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ import getNoTestsFoundMessage from '../getNoTestsFoundMessage'; diff --git a/packages/jest-core/src/__tests__/run_jest.test.js b/packages/jest-core/src/__tests__/run_jest.test.js index 3293dd4fbcbc..842407438f0c 100644 --- a/packages/jest-core/src/__tests__/run_jest.test.js +++ b/packages/jest-core/src/__tests__/run_jest.test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ import runJest from '../runJest'; diff --git a/packages/jest-core/src/__tests__/test_root/__testtests__/test.foobar b/packages/jest-core/src/__tests__/test_root/__testtests__/test.foobar index e064b16a86ac..d89ff1cc33a9 100644 --- a/packages/jest-core/src/__tests__/test_root/__testtests__/test.foobar +++ b/packages/jest-core/src/__tests__/test_root/__testtests__/test.foobar @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ // test.foobar diff --git a/packages/jest-core/src/__tests__/test_root/__testtests__/test.js b/packages/jest-core/src/__tests__/test_root/__testtests__/test.js index 2c6a37c44995..4c43c5b1b051 100644 --- a/packages/jest-core/src/__tests__/test_root/__testtests__/test.js +++ b/packages/jest-core/src/__tests__/test_root/__testtests__/test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ // test.js diff --git a/packages/jest-core/src/__tests__/test_root/__testtests__/test.jsx b/packages/jest-core/src/__tests__/test_root/__testtests__/test.jsx index 45157b447533..d529f0d553fa 100644 --- a/packages/jest-core/src/__tests__/test_root/__testtests__/test.jsx +++ b/packages/jest-core/src/__tests__/test_root/__testtests__/test.jsx @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ // test.jsx diff --git a/packages/jest-core/src/__tests__/test_root/module.foobar b/packages/jest-core/src/__tests__/test_root/module.foobar index e8aeaf03a0db..ccd3fe919e1c 100644 --- a/packages/jest-core/src/__tests__/test_root/module.foobar +++ b/packages/jest-core/src/__tests__/test_root/module.foobar @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ // module.foobar diff --git a/packages/jest-core/src/__tests__/test_root/module.jsx b/packages/jest-core/src/__tests__/test_root/module.jsx index 156cd35bec71..d9d2a3f4bca3 100644 --- a/packages/jest-core/src/__tests__/test_root/module.jsx +++ b/packages/jest-core/src/__tests__/test_root/module.jsx @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ // module.jsx diff --git a/packages/jest-core/src/__tests__/test_root/no_tests.js b/packages/jest-core/src/__tests__/test_root/no_tests.js index 6813d94ff8fa..26299e28a9be 100644 --- a/packages/jest-core/src/__tests__/test_root/no_tests.js +++ b/packages/jest-core/src/__tests__/test_root/no_tests.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ // no tests for this one diff --git a/packages/jest-core/src/__tests__/test_root_with_(parentheses)/__testtests__/test.js b/packages/jest-core/src/__tests__/test_root_with_(parentheses)/__testtests__/test.js index 2c6a37c44995..4c43c5b1b051 100644 --- a/packages/jest-core/src/__tests__/test_root_with_(parentheses)/__testtests__/test.js +++ b/packages/jest-core/src/__tests__/test_root_with_(parentheses)/__testtests__/test.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ // test.js diff --git a/packages/jest-core/src/__tests__/test_root_with_(parentheses)/module.jsx b/packages/jest-core/src/__tests__/test_root_with_(parentheses)/module.jsx index 156cd35bec71..d9d2a3f4bca3 100644 --- a/packages/jest-core/src/__tests__/test_root_with_(parentheses)/module.jsx +++ b/packages/jest-core/src/__tests__/test_root_with_(parentheses)/module.jsx @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ // module.jsx diff --git a/packages/jest-core/src/getNoTestFoundFailed.ts b/packages/jest-core/src/getNoTestFoundFailed.ts index 3b0b6d9cc70c..b36bb8ea659a 100644 --- a/packages/jest-core/src/getNoTestFoundFailed.ts +++ b/packages/jest-core/src/getNoTestFoundFailed.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ import chalk from 'chalk'; diff --git a/packages/jest-core/src/getNoTestFoundPassWithNoTests.ts b/packages/jest-core/src/getNoTestFoundPassWithNoTests.ts index f05c16ff78c3..fc404021d624 100644 --- a/packages/jest-core/src/getNoTestFoundPassWithNoTests.ts +++ b/packages/jest-core/src/getNoTestFoundPassWithNoTests.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ import chalk from 'chalk'; diff --git a/packages/jest-core/src/getNoTestFoundRelatedToChangedFiles.ts b/packages/jest-core/src/getNoTestFoundRelatedToChangedFiles.ts index 4c3ecb74a56b..6efd4a40adaf 100644 --- a/packages/jest-core/src/getNoTestFoundRelatedToChangedFiles.ts +++ b/packages/jest-core/src/getNoTestFoundRelatedToChangedFiles.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ import chalk from 'chalk'; import {Config} from '@jest/types'; diff --git a/packages/jest-core/src/getNoTestFoundVerbose.ts b/packages/jest-core/src/getNoTestFoundVerbose.ts index 80c8db9a6994..0b26e8927985 100644 --- a/packages/jest-core/src/getNoTestFoundVerbose.ts +++ b/packages/jest-core/src/getNoTestFoundVerbose.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ import chalk from 'chalk'; import {Config} from '@jest/types'; diff --git a/packages/jest-core/src/pluralize.ts b/packages/jest-core/src/pluralize.ts index 029884669aed..bda5b9a328bc 100644 --- a/packages/jest-core/src/pluralize.ts +++ b/packages/jest-core/src/pluralize.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ export default function pluralize(word: string, count: number, ending: string) { return `${count} ${word}${count === 1 ? '' : ending}`; diff --git a/packages/jest-docblock/src/__tests__/index.test.ts b/packages/jest-docblock/src/__tests__/index.test.ts index 5df6ce09c552..db1dc61bc4c5 100644 --- a/packages/jest-docblock/src/__tests__/index.test.ts +++ b/packages/jest-docblock/src/__tests__/index.test.ts @@ -1,6 +1,5 @@ /** * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. - * All rights reserved. * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. diff --git a/packages/jest-haste-map/src/lib/__tests__/fast_path.test.js b/packages/jest-haste-map/src/lib/__tests__/fast_path.test.js index fd76610eca4a..454500a823df 100644 --- a/packages/jest-haste-map/src/lib/__tests__/fast_path.test.js +++ b/packages/jest-haste-map/src/lib/__tests__/fast_path.test.js @@ -1,10 +1,8 @@ /** * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. - * All rights reserved. * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * */ import path from 'path'; diff --git a/packages/jest-haste-map/src/lib/__tests__/getPlatformExtension.test.js b/packages/jest-haste-map/src/lib/__tests__/getPlatformExtension.test.js index 6541ac0e16a2..916b2387ad08 100644 --- a/packages/jest-haste-map/src/lib/__tests__/getPlatformExtension.test.js +++ b/packages/jest-haste-map/src/lib/__tests__/getPlatformExtension.test.js @@ -1,10 +1,8 @@ /** * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. - * All rights reserved. * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * */ import getPlatformExtension from '../getPlatformExtension'; diff --git a/packages/jest-haste-map/src/lib/__tests__/normalizePathSep.test.js b/packages/jest-haste-map/src/lib/__tests__/normalizePathSep.test.js index d7e6ff64e490..8c89f63ee392 100644 --- a/packages/jest-haste-map/src/lib/__tests__/normalizePathSep.test.js +++ b/packages/jest-haste-map/src/lib/__tests__/normalizePathSep.test.js @@ -1,10 +1,8 @@ /** * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. - * All rights reserved. * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * */ 'use strict'; diff --git a/packages/jest-leak-detector/src/__tests__/index.test.ts b/packages/jest-leak-detector/src/__tests__/index.test.ts index a135b1637ad8..6a017162021e 100644 --- a/packages/jest-leak-detector/src/__tests__/index.test.ts +++ b/packages/jest-leak-detector/src/__tests__/index.test.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/packages/jest-regex-util/src/__tests__/index.test.ts b/packages/jest-regex-util/src/__tests__/index.test.ts index 828d6601c194..48d9af12f133 100644 --- a/packages/jest-regex-util/src/__tests__/index.test.ts +++ b/packages/jest-regex-util/src/__tests__/index.test.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ jest.mock('path'); diff --git a/packages/jest-repl/src/cli/repl.ts b/packages/jest-repl/src/cli/repl.ts index 66f5725ecbed..583cb0f5ff2e 100644 --- a/packages/jest-repl/src/cli/repl.ts +++ b/packages/jest-repl/src/cli/repl.ts @@ -1,10 +1,8 @@ /** * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. - * All rights reserved. * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * */ declare const jestGlobalConfig: Config.GlobalConfig; diff --git a/packages/jest-resolve/src/__tests__/isBuiltinModule.test.ts b/packages/jest-resolve/src/__tests__/isBuiltinModule.test.ts index 0bbbb84d732b..7ddbd2d390f5 100644 --- a/packages/jest-resolve/src/__tests__/isBuiltinModule.test.ts +++ b/packages/jest-resolve/src/__tests__/isBuiltinModule.test.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ import isBuiltinModule from '../isBuiltinModule'; diff --git a/packages/jest-runtime/src/__tests__/defaultResolver.js b/packages/jest-runtime/src/__tests__/defaultResolver.js index cbcdd6cf4cf3..7e75ee1606be 100644 --- a/packages/jest-runtime/src/__tests__/defaultResolver.js +++ b/packages/jest-runtime/src/__tests__/defaultResolver.js @@ -1,10 +1,9 @@ /** * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. - * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. */ + import resolver from 'jest-resolve/build/defaultResolver.js'; module.exports = resolver; diff --git a/packages/jest-runtime/src/__tests__/test_root/__mocks__/nested1/nested2/nested3.js b/packages/jest-runtime/src/__tests__/test_root/__mocks__/nested1/nested2/nested3.js index 65f811c6911d..bb13c0a6e08c 100644 --- a/packages/jest-runtime/src/__tests__/test_root/__mocks__/nested1/nested2/nested3.js +++ b/packages/jest-runtime/src/__tests__/test_root/__mocks__/nested1/nested2/nested3.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/packages/jest-runtime/src/__tests__/test_root/dep_on_mapped_module.js b/packages/jest-runtime/src/__tests__/test_root/dep_on_mapped_module.js index 4f6720933c54..f5a1d4e3f693 100644 --- a/packages/jest-runtime/src/__tests__/test_root/dep_on_mapped_module.js +++ b/packages/jest-runtime/src/__tests__/test_root/dep_on_mapped_module.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/packages/jest-runtime/src/__tests__/test_root/mapped_dir/moduleInMapped.js b/packages/jest-runtime/src/__tests__/test_root/mapped_dir/moduleInMapped.js index dfeab362a879..53ddc44eb095 100644 --- a/packages/jest-runtime/src/__tests__/test_root/mapped_dir/moduleInMapped.js +++ b/packages/jest-runtime/src/__tests__/test_root/mapped_dir/moduleInMapped.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/packages/jest-runtime/src/__tests__/test_root/nested1/nested2/nested3.js b/packages/jest-runtime/src/__tests__/test_root/nested1/nested2/nested3.js index faa5d0519a4b..df9e61efb4d8 100644 --- a/packages/jest-runtime/src/__tests__/test_root/nested1/nested2/nested3.js +++ b/packages/jest-runtime/src/__tests__/test_root/nested1/nested2/nested3.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/packages/jest-runtime/src/__tests__/test_root/node_modules/jest-resolve-test/browser.js b/packages/jest-runtime/src/__tests__/test_root/node_modules/jest-resolve-test/browser.js index 769c88956e3c..4f06a53fd70c 100644 --- a/packages/jest-runtime/src/__tests__/test_root/node_modules/jest-resolve-test/browser.js +++ b/packages/jest-runtime/src/__tests__/test_root/node_modules/jest-resolve-test/browser.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports.isBrowser = true; diff --git a/packages/jest-runtime/src/__tests__/test_root/node_modules/jest-resolve-test/node.js b/packages/jest-runtime/src/__tests__/test_root/node_modules/jest-resolve-test/node.js index ea7308992019..793651797e0a 100644 --- a/packages/jest-runtime/src/__tests__/test_root/node_modules/jest-resolve-test/node.js +++ b/packages/jest-runtime/src/__tests__/test_root/node_modules/jest-resolve-test/node.js @@ -1,3 +1,8 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports.isBrowser = false; diff --git a/packages/jest-runtime/src/__tests__/test_root/sourcemaps/out/throwing-mapped-fn.js b/packages/jest-runtime/src/__tests__/test_root/sourcemaps/out/throwing-mapped-fn.js index 9fcffa4995ba..811ef31e587b 100644 --- a/packages/jest-runtime/src/__tests__/test_root/sourcemaps/out/throwing-mapped-fn.js +++ b/packages/jest-runtime/src/__tests__/test_root/sourcemaps/out/throwing-mapped-fn.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; @@ -9,9 +14,8 @@ exports.sum = sum; /** * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. */ function sum() { diff --git a/packages/jest-runtime/src/__tests__/test_root/sourcemaps/throwing-mapped-fn.js b/packages/jest-runtime/src/__tests__/test_root/sourcemaps/throwing-mapped-fn.js index 314356572fd5..a8796aa19072 100644 --- a/packages/jest-runtime/src/__tests__/test_root/sourcemaps/throwing-mapped-fn.js +++ b/packages/jest-runtime/src/__tests__/test_root/sourcemaps/throwing-mapped-fn.js @@ -1,9 +1,8 @@ /** * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. */ export function sum() { diff --git a/packages/jest-runtime/src/helpers.ts b/packages/jest-runtime/src/helpers.ts index 5b12d3aeb3aa..395b271a3939 100644 --- a/packages/jest-runtime/src/helpers.ts +++ b/packages/jest-runtime/src/helpers.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ import path from 'path'; import slash from 'slash'; diff --git a/packages/jest-snapshot/src/__mocks__/prettier.js b/packages/jest-snapshot/src/__mocks__/prettier.js index 717891860829..38a398821537 100644 --- a/packages/jest-snapshot/src/__mocks__/prettier.js +++ b/packages/jest-snapshot/src/__mocks__/prettier.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ const prettier = jest.requireActual('prettier'); diff --git a/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver-inconsistent-fns.js b/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver-inconsistent-fns.js index 6734678afaec..538cf1cb6b23 100644 --- a/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver-inconsistent-fns.js +++ b/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver-inconsistent-fns.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = { resolveSnapshotPath: (testPath, snapshotExtension) => diff --git a/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver-missing-resolveSnapshotPath.js b/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver-missing-resolveSnapshotPath.js index 20db98c2b1a6..e9d2d80c8a5f 100644 --- a/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver-missing-resolveSnapshotPath.js +++ b/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver-missing-resolveSnapshotPath.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = { resolveTestPath: () => {}, diff --git a/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver-missing-resolveTestPath.js b/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver-missing-resolveTestPath.js index 46db466ec5b0..cb50b9dc5c2a 100644 --- a/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver-missing-resolveTestPath.js +++ b/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver-missing-resolveTestPath.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = { resolveSnapshotPath: () => {}, diff --git a/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver-missing-test-path-for-consistency-check.js b/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver-missing-test-path-for-consistency-check.js index 4e58ae8c5697..9ebe61479c70 100644 --- a/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver-missing-test-path-for-consistency-check.js +++ b/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver-missing-test-path-for-consistency-check.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = { resolveSnapshotPath: (testPath, snapshotExtension) => {}, diff --git a/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver.js b/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver.js index c55bdd7f45c1..6b2dfc60c11e 100644 --- a/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver.js +++ b/packages/jest-snapshot/src/__tests__/fixtures/customSnapshotResolver.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ module.exports = { resolveSnapshotPath: (testPath, snapshotExtension) => diff --git a/packages/jest-snapshot/src/__tests__/snapshot_resolver.test.ts b/packages/jest-snapshot/src/__tests__/snapshot_resolver.test.ts index 5afee9699182..0ff74858b8f5 100644 --- a/packages/jest-snapshot/src/__tests__/snapshot_resolver.test.ts +++ b/packages/jest-snapshot/src/__tests__/snapshot_resolver.test.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ import path from 'path'; import {Config} from '@jest/types'; diff --git a/packages/jest-source-map/src/__tests__/getCallsite.test.ts b/packages/jest-source-map/src/__tests__/getCallsite.test.ts index ecd017476e47..3a96bc2e57e9 100644 --- a/packages/jest-source-map/src/__tests__/getCallsite.test.ts +++ b/packages/jest-source-map/src/__tests__/getCallsite.test.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ import fs from 'fs'; import SourceMap from 'source-map'; diff --git a/packages/jest-transform/src/enhanceUnexpectedTokenMessage.ts b/packages/jest-transform/src/enhanceUnexpectedTokenMessage.ts index e16129fe7c95..0b5e3661d1c5 100644 --- a/packages/jest-transform/src/enhanceUnexpectedTokenMessage.ts +++ b/packages/jest-transform/src/enhanceUnexpectedTokenMessage.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ import chalk from 'chalk'; diff --git a/packages/jest-util/src/__tests__/isInteractive.test.ts b/packages/jest-util/src/__tests__/isInteractive.test.ts index 79201ed801b6..a86c4e9575c9 100644 --- a/packages/jest-util/src/__tests__/isInteractive.test.ts +++ b/packages/jest-util/src/__tests__/isInteractive.test.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ let oldIsTTY: typeof process.stdout.isTTY; let oldTERM: string | undefined; diff --git a/packages/jest-util/src/isInteractive.ts b/packages/jest-util/src/isInteractive.ts index 0dca9ee48f88..c81d5a8a98a1 100644 --- a/packages/jest-util/src/isInteractive.ts +++ b/packages/jest-util/src/isInteractive.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ import isCI from 'is-ci'; diff --git a/packages/jest-watcher/src/lib/__tests__/scroll.test.ts b/packages/jest-watcher/src/lib/__tests__/scroll.test.ts index e500b371a95d..b18b6a2d6e08 100644 --- a/packages/jest-watcher/src/lib/__tests__/scroll.test.ts +++ b/packages/jest-watcher/src/lib/__tests__/scroll.test.ts @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ import scroll from '../scroll'; diff --git a/scripts/checkCopyrightHeaders.js b/scripts/checkCopyrightHeaders.js index fe9682e93324..4d1b7e09962f 100755 --- a/scripts/checkCopyrightHeaders.js +++ b/scripts/checkCopyrightHeaders.js @@ -1,5 +1,5 @@ /** - * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. @@ -117,10 +117,22 @@ const INCLUDED_PATTERNS = [ const COPYRIGHT_HEADER = 'Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.'; +const LICENSE1 = + 'This source code is licensed under the MIT license found in the'; +const LICENSE2 = 'LICENSE file in the root directory of this source tree.'; function needsCopyrightHeader(file) { const contents = getFileContents(file); - return contents.trim().length > 0 && !contents.includes(COPYRIGHT_HEADER); + + // Match lines individually to avoid false positive for: + // comment block versus lines + // line ending LF versus CRLF + return ( + contents.trim().length > 0 && + (!contents.includes(COPYRIGHT_HEADER) || + !contents.includes(LICENSE1) || + !contents.includes(LICENSE2)) + ); } function check() { diff --git a/scripts/remove-postinstall.js b/scripts/remove-postinstall.js index a4b10c50f6b5..f85bbafda5c3 100644 --- a/scripts/remove-postinstall.js +++ b/scripts/remove-postinstall.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ 'use strict'; diff --git a/website/fetchSupporters.js b/website/fetchSupporters.js index 35dfeddcf0ac..83b2e254a31b 100644 --- a/website/fetchSupporters.js +++ b/website/fetchSupporters.js @@ -1,6 +1,11 @@ #!/usr/bin/env node -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ const fs = require('fs'); const request = require('request'); diff --git a/website/languages.js b/website/languages.js index dfe4d38e63d9..821e370929d8 100644 --- a/website/languages.js +++ b/website/languages.js @@ -1,7 +1,10 @@ /** * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. */ + const languages = [ { enabled: true, diff --git a/website/pages/en/videos.js b/website/pages/en/videos.js index d5a465a0b70e..04d5401ca03f 100644 --- a/website/pages/en/videos.js +++ b/website/pages/en/videos.js @@ -1,4 +1,9 @@ -// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ const React = require('react'); diff --git a/website/siteConfig.js b/website/siteConfig.js index 42ca63906008..0fa4fb20c98f 100644 --- a/website/siteConfig.js +++ b/website/siteConfig.js @@ -1,11 +1,10 @@ -/*eslint sort-keys: 0*/ /** * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. - * All rights reserved. * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ +/*eslint sort-keys: 0*/ /* List of talks & videos */ diff --git a/website/static/css/custom.css b/website/static/css/custom.css index 6716435b6495..6faed714f994 100644 --- a/website/static/css/custom.css +++ b/website/static/css/custom.css @@ -1,4 +1,9 @@ -/* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. */ +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ .mainContainer a { text-decoration: underline; diff --git a/website/static/css/hljs-jest.css b/website/static/css/hljs-jest.css index bc43a2bda27a..5b176aec2c22 100644 --- a/website/static/css/hljs-jest.css +++ b/website/static/css/hljs-jest.css @@ -1,4 +1,9 @@ -/* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. */ +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ /* Jest's Color Scheme for Highlight JS diff --git a/website/static/css/jest.css b/website/static/css/jest.css index b49c6e5c26c2..351f114ca1f1 100644 --- a/website/static/css/jest.css +++ b/website/static/css/jest.css @@ -1,4 +1,9 @@ -/* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. */ +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ :root { --yellow: #c2a813; diff --git a/website/static/landing.js b/website/static/landing.js index 33a1a60c44f5..4cfdc9e62593 100644 --- a/website/static/landing.js +++ b/website/static/landing.js @@ -1,4 +1,9 @@ -/* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. */ +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ /* global document, window, localStorage */ From 53e964ca27f26c03138a5973b1fdca2aa4efef94 Mon Sep 17 00:00:00 2001 From: Mark Pedrotti Date: Fri, 9 Aug 2019 10:43:45 -0400 Subject: [PATCH 2/5] jest-matcher-utils: Add color options to matcherHint (#8795) * jest-matcher-utils: Add color options to matcherHint * Correct substringNegative in secondArgumentColor test * Add comment about Color type * Export type MatcherHintColor * Update CHANGELOG.md --- CHANGELOG.md | 1 + .../src/__tests__/index.test.ts | 48 +++++++++++++++++++ packages/jest-matcher-utils/src/index.ts | 14 ++++-- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6283466826be..e60cf5d47945 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - `[@jest/core, @jest/test-sequencer]` Support async sort in custom `testSequencer` ([#8642](https://github.com/facebook/jest/pull/8642)) - `[jest-runtime, @jest/fake-timers]` Add `jest.advanceTimersToNextTimer` ([#8713](https://github.com/facebook/jest/pull/8713)) - `[@jest-transform]` Extract transforming require logic within `jest-core` into `@jest-transform` ([#8756](https://github.com/facebook/jest/pull/8756)) +- `[jest-matcher-utils]` Add color options to `matcherHint` ([#8795](https://github.com/facebook/jest/pull/8795)) ### Fixes diff --git a/packages/jest-matcher-utils/src/__tests__/index.test.ts b/packages/jest-matcher-utils/src/__tests__/index.test.ts index e5f0ad94cca1..22e8d24fb749 100644 --- a/packages/jest-matcher-utils/src/__tests__/index.test.ts +++ b/packages/jest-matcher-utils/src/__tests__/index.test.ts @@ -6,11 +6,13 @@ * */ +import chalk from 'chalk'; import { diff, ensureNumbers, ensureNoExpected, getLabelPrinter, + matcherHint, pluralize, stringify, MatcherHintOptions, @@ -286,3 +288,49 @@ describe('getLabelPrinter', () => { }).toThrow(); }); }); + +describe('matcherHint', () => { + test('expectedColor', () => { + const expectedColor = (arg: string): string => arg; // default (black) color + const expectedArgument = 'n'; + const received = matcherHint( + 'toHaveBeenNthCalledWith', + 'jest.fn()', + expectedArgument, + {expectedColor, secondArgument: '...expected'}, + ); + + const substringNegative = chalk.green(expectedArgument); + + expect(received).not.toMatch(substringNegative); + }); + + test('receivedColor', () => { + const receivedColor = chalk.cyan.bgAnsi256(158); + const receivedArgument = 'received'; + const received = matcherHint('toMatchSnapshot', receivedArgument, '', { + receivedColor, + }); + + const substringNegative = chalk.red(receivedArgument); + const substringPositive = receivedColor(receivedArgument); + + expect(received).not.toMatch(substringNegative); + expect(received).toMatch(substringPositive); + }); + + test('secondArgumentColor', () => { + const secondArgumentColor = chalk.bold; + const secondArgument = 'hint'; + const received = matcherHint('toMatchSnapshot', undefined, 'properties', { + secondArgument, + secondArgumentColor, + }); + + const substringNegative = chalk.green(secondArgument); + const substringPositive = secondArgumentColor(secondArgument); + + expect(received).not.toMatch(substringNegative); + expect(received).toMatch(substringPositive); + }); +}); diff --git a/packages/jest-matcher-utils/src/index.ts b/packages/jest-matcher-utils/src/index.ts index 682614aa31d8..984f031c871a 100644 --- a/packages/jest-matcher-utils/src/index.ts +++ b/packages/jest-matcher-utils/src/index.ts @@ -28,12 +28,17 @@ const PLUGINS = [ AsymmetricMatcher, ]; +type MatcherHintColor = (arg: string) => string; // subset of Chalk type + export type MatcherHintOptions = { comment?: string; + expectedColor?: MatcherHintColor; isDirectExpectCall?: boolean; isNot?: boolean; promise?: string; + receivedColor?: MatcherHintColor; secondArgument?: string; + secondArgumentColor?: MatcherHintColor; }; export {DiffOptions}; @@ -362,16 +367,19 @@ export const matcherHint = ( ) => { const { comment = '', + expectedColor = EXPECTED_COLOR, isDirectExpectCall = false, // seems redundant with received === '' isNot = false, promise = '', + receivedColor = RECEIVED_COLOR, secondArgument = '', + secondArgumentColor = EXPECTED_COLOR, } = options; let hint = ''; let dimString = 'expect'; // concatenate adjacent dim substrings if (!isDirectExpectCall && received !== '') { - hint += DIM_COLOR(dimString + '(') + RECEIVED_COLOR(received); + hint += DIM_COLOR(dimString + '(') + receivedColor(received); dimString = ')'; } @@ -398,9 +406,9 @@ export const matcherHint = ( if (expected === '') { dimString += '()'; } else { - hint += DIM_COLOR(dimString + '(') + EXPECTED_COLOR(expected); + hint += DIM_COLOR(dimString + '(') + expectedColor(expected); if (secondArgument) { - hint += DIM_COLOR(', ') + EXPECTED_COLOR(secondArgument); + hint += DIM_COLOR(', ') + secondArgumentColor(secondArgument); } dimString = ')'; } From fafaf893575000ca423dc77aa8aa44554cdb3f57 Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Sun, 11 Aug 2019 09:01:59 +1200 Subject: [PATCH 3/5] use babel-plugin-replace-ts-export-assignment package (#8805) --- babel.config.js | 4 +-- package.json | 1 + ...lugin-jest-replace-ts-export-assignment.js | 26 ------------------- yarn.lock | 5 ++++ 4 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 scripts/babel-plugin-jest-replace-ts-export-assignment.js diff --git a/babel.config.js b/babel.config.js index 7e1e2aeaf94d..d536e25277bc 100644 --- a/babel.config.js +++ b/babel.config.js @@ -11,9 +11,7 @@ module.exports = { { plugins: [ 'babel-plugin-typescript-strip-namespaces', - require.resolve( - './scripts/babel-plugin-jest-replace-ts-export-assignment.js' - ), + 'babel-plugin-replace-ts-export-assignment', ], presets: ['@babel/preset-typescript'], test: /\.tsx?$/, diff --git a/package.json b/package.json index 0a01255e6978..1d5fa1644a6f 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "ansi-styles": "^3.2.0", "babel-eslint": "^10.0.2", "babel-loader": "^8.0.5", + "babel-plugin-replace-ts-export-assignment": "^0.0.2", "babel-plugin-typescript-strip-namespaces": "^1.1.1", "camelcase": "^5.0.0", "chalk": "^2.0.1", diff --git a/scripts/babel-plugin-jest-replace-ts-export-assignment.js b/scripts/babel-plugin-jest-replace-ts-export-assignment.js deleted file mode 100644 index 65722500d5cc..000000000000 --- a/scripts/babel-plugin-jest-replace-ts-export-assignment.js +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -'use strict'; - -// Replace `export =` with `module.exports` which allows us to keep CJS semantics - -module.exports = ({template}) => { - const moduleExportsDeclaration = template(` - module.exports = ASSIGNMENT; - `); - return { - name: 'jest-replace-ts-export-assignment', - visitor: { - TSExportAssignment(path) { - path.replaceWith( - moduleExportsDeclaration({ASSIGNMENT: path.node.expression}) - ); - }, - }, - }; -}; diff --git a/yarn.lock b/yarn.lock index 18612e815ce4..e074adce1da1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3378,6 +3378,11 @@ babel-plugin-istanbul@^5.1.0: istanbul-lib-instrument "^3.0.0" test-exclude "^5.0.0" +babel-plugin-replace-ts-export-assignment@^0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/babel-plugin-replace-ts-export-assignment/-/babel-plugin-replace-ts-export-assignment-0.0.2.tgz#927a30ba303fcf271108980a8d4f80a693e1d53f" + integrity sha512-BiTEG2Ro+O1spuheL5nB289y37FFmz0ISE6GjpNCG2JuA/WNcuEHSYw01+vN8quGf208sID3FnZFDwVyqX18YQ== + babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0: version "7.0.0-beta.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz#aa213c1435e2bffeb6fca842287ef534ad05d5cf" From 384fe4a57e6d923d6a940d6cbaeca35e4eef0fde Mon Sep 17 00:00:00 2001 From: Stuart Cook Date: Sun, 11 Aug 2019 07:31:18 +1000 Subject: [PATCH 4/5] Clearer messages for Node assert errors (#8792) --- CHANGELOG.md | 1 + .../__snapshots__/failures.test.ts.snap | 12 ++++----- .../jest-circus/src/formatNodeAssertErrors.ts | 20 +++++++-------- .../src/assertionErrorMessage.ts | 25 ++++++++++--------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e60cf5d47945..849150ef222b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ - `[jest-runtime, @jest/fake-timers]` Add `jest.advanceTimersToNextTimer` ([#8713](https://github.com/facebook/jest/pull/8713)) - `[@jest-transform]` Extract transforming require logic within `jest-core` into `@jest-transform` ([#8756](https://github.com/facebook/jest/pull/8756)) - `[jest-matcher-utils]` Add color options to `matcherHint` ([#8795](https://github.com/facebook/jest/pull/8795)) +- `[jest-circus/jest-jasmine2]` Give clearer output for Node assert errors ([#8792](https://github.com/facebook/jest/pull/8792)) ### Fixes diff --git a/e2e/__tests__/__snapshots__/failures.test.ts.snap b/e2e/__tests__/__snapshots__/failures.test.ts.snap index a9ad9ea74cf2..058132cbe250 100644 --- a/e2e/__tests__/__snapshots__/failures.test.ts.snap +++ b/e2e/__tests__/__snapshots__/failures.test.ts.snap @@ -399,7 +399,7 @@ FAIL __tests__/assertionError.test.js ● assert - assert.equal(received, expected) or assert(received) + assert(received) Expected value to be equal to: true @@ -418,7 +418,7 @@ FAIL __tests__/assertionError.test.js ● assert with a message - assert.equal(received, expected) or assert(received) + assert(received) Expected value to be equal to: true @@ -440,7 +440,7 @@ FAIL __tests__/assertionError.test.js ● assert.ok - assert.equal(received, expected) or assert(received) + assert(received) Expected value to be equal to: true @@ -459,7 +459,7 @@ FAIL __tests__/assertionError.test.js ● assert.ok with a message - assert.equal(received, expected) or assert(received) + assert(received) Expected value to be equal to: true @@ -481,7 +481,7 @@ FAIL __tests__/assertionError.test.js ● assert.equal - assert.equal(received, expected) or assert(received) + assert.equal(received, expected) Expected value to be equal to: 2 @@ -747,7 +747,7 @@ FAIL __tests__/assertionError.test.js ● async - assert.equal(received, expected) or assert(received) + assert.equal(received, expected) Expected value to be equal to: "hello" diff --git a/packages/jest-circus/src/formatNodeAssertErrors.ts b/packages/jest-circus/src/formatNodeAssertErrors.ts index 2d086e7a2558..498688538195 100644 --- a/packages/jest-circus/src/formatNodeAssertErrors.ts +++ b/packages/jest-circus/src/formatNodeAssertErrors.ts @@ -101,10 +101,17 @@ const assertThrowingMatcherHint = (operatorName: string) => const assertMatcherHint = ( operator: string | undefined | null, operatorName: string, + expected: unknown, ) => { let message = ''; - if (operatorName) { + if (operator === '==' && expected === true) { + message = + chalk.dim('assert') + + chalk.dim('(') + + chalk.red('received') + + chalk.dim(')'); + } else if (operatorName) { message = chalk.dim('assert') + chalk.dim('.' + operatorName + '(') + @@ -114,15 +121,6 @@ const assertMatcherHint = ( chalk.dim(')'); } - if (operator === '==') { - message += - ' or ' + - chalk.dim('assert') + - chalk.dim('(') + - chalk.red('received') + - chalk.dim(') '); - } - return message; }; @@ -160,7 +158,7 @@ function assertionErrorMessage( } return ( - buildHintString(assertMatcherHint(operator, operatorName)) + + buildHintString(assertMatcherHint(operator, operatorName, expected)) + chalk.reset(`Expected value ${operatorMessage(operator)}`) + ` ${printExpected(expected)}\n` + chalk.reset(`Received:\n`) + diff --git a/packages/jest-jasmine2/src/assertionErrorMessage.ts b/packages/jest-jasmine2/src/assertionErrorMessage.ts index 1cb63a9ecb20..6dbb8959654f 100644 --- a/packages/jest-jasmine2/src/assertionErrorMessage.ts +++ b/packages/jest-jasmine2/src/assertionErrorMessage.ts @@ -62,10 +62,20 @@ const assertThrowingMatcherHint = (operatorName: string) => chalk.dim(')') : ''; -const assertMatcherHint = (operator: string | null, operatorName: string) => { +const assertMatcherHint = ( + operator: string | null, + operatorName: string, + expected: unknown, +) => { let message = ''; - if (operatorName) { + if (operator === '==' && expected === true) { + message = + chalk.dim('assert') + + chalk.dim('(') + + chalk.red('received') + + chalk.dim(')'); + } else if (operatorName) { message = chalk.dim('assert') + chalk.dim('.' + operatorName + '(') + @@ -75,15 +85,6 @@ const assertMatcherHint = (operator: string | null, operatorName: string) => { chalk.dim(')'); } - if (operator === '==') { - message += - ' or ' + - chalk.dim('assert') + - chalk.dim('(') + - chalk.red('received') + - chalk.dim(') '); - } - return message; }; @@ -121,7 +122,7 @@ function assertionErrorMessage( } return ( - buildHintString(assertMatcherHint(operator, operatorName)) + + buildHintString(assertMatcherHint(operator, operatorName, expected)) + chalk.reset(`Expected value ${operatorMessage(operator)}`) + ` ${printExpected(expected)}\n` + chalk.reset(`Received:\n`) + From 9a15d46823bb612786aee9d3d09970a99836ad6d Mon Sep 17 00:00:00 2001 From: Mark Pedrotti Date: Sat, 10 Aug 2019 18:49:31 -0400 Subject: [PATCH 5/5] expect: Display equal values for ReturnedWith similar to CalledWith (#8791) * expect: Display equal values for ReturnedWith similar to CalledWith * Update CHANGELOG.md --- CHANGELOG.md | 1 + .../__snapshots__/spyMatchers.test.js.snap | 24 +++++++++---------- packages/expect/src/spyMatchers.ts | 20 +++++++++++----- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 849150ef222b..119fa802697d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - `[expect]` Throw matcher error when received cannot be jasmine spy ([#8747](https://github.com/facebook/jest/pull/8747)) - `[expect]` Improve report when negative CalledWith assertion fails ([#8755](https://github.com/facebook/jest/pull/8755)) - `[expect]` Improve report when positive CalledWith assertion fails ([#8771](https://github.com/facebook/jest/pull/8771)) +- `[expect]` Display equal values for ReturnedWith similar to CalledWith ([#8791](https://github.com/facebook/jest/pull/8791)) - `[jest-snapshot]` Highlight substring differences when matcher fails, part 3 ([#8569](https://github.com/facebook/jest/pull/8569)) - `[jest-core]` Improve report when snapshots are obsolete ([#8448](https://github.com/facebook/jest/pull/8665)) - `[jest-cli]` Improve chai support (with detailed output, to match jest exceptions) ([#8454](https://github.com/facebook/jest/pull/8454)) diff --git a/packages/expect/src/__tests__/__snapshots__/spyMatchers.test.js.snap b/packages/expect/src/__tests__/__snapshots__/spyMatchers.test.js.snap index c22e8bdf327e..1fa46b12f5ea 100644 --- a/packages/expect/src/__tests__/__snapshots__/spyMatchers.test.js.snap +++ b/packages/expect/src/__tests__/__snapshots__/spyMatchers.test.js.snap @@ -175,7 +175,7 @@ exports[`lastReturnedWith lastReturnedWith works with three calls 1`] = ` Expected: not \\"foo3\\" Received 2: \\"foo2\\" --> 3: \\"foo3\\" +-> 3: \\"foo3\\" Number of returns: 3" `; @@ -493,7 +493,7 @@ n: 3 Expected: not 1 Received 2: function call has not returned yet --> 3: 1 +-> 3: 1 4: 0 Number of returns: 2 @@ -507,7 +507,7 @@ n: 4 Expected: not 0 Received 3: 1 --> 4: 0 +-> 4: 0 Number of returns: 2 Number of calls: 4" @@ -545,7 +545,7 @@ exports[`nthReturnedWith nthReturnedWith should reject nth value greater than nu n: 4 Expected: \\"foo\\" Received - 3: \\"foo\\" + 3: \\"foo\\" Number of returns: 3" `; @@ -568,7 +568,7 @@ exports[`nthReturnedWith nthReturnedWith should replace 1st, 2nd, 3rd with first n: 1 Expected: not \\"foo1\\" Received --> 1: \\"foo1\\" +-> 1: \\"foo1\\" 2: \\"foo2\\" Number of returns: 3" @@ -580,7 +580,7 @@ exports[`nthReturnedWith nthReturnedWith works with three calls 1`] = ` n: 1 Expected: not \\"foo1\\" Received --> 1: \\"foo1\\" +-> 1: \\"foo1\\" 2: \\"foo2\\" Number of returns: 3" @@ -1669,7 +1669,7 @@ exports[`toHaveLastReturnedWith lastReturnedWith works with three calls 1`] = ` Expected: not \\"foo3\\" Received 2: \\"foo2\\" --> 3: \\"foo3\\" +-> 3: \\"foo3\\" Number of returns: 3" `; @@ -1831,7 +1831,7 @@ n: 3 Expected: not 1 Received 2: function call has not returned yet --> 3: 1 +-> 3: 1 4: 0 Number of returns: 2 @@ -1845,7 +1845,7 @@ n: 4 Expected: not 0 Received 3: 1 --> 4: 0 +-> 4: 0 Number of returns: 2 Number of calls: 4" @@ -1883,7 +1883,7 @@ exports[`toHaveNthReturnedWith nthReturnedWith should reject nth value greater t n: 4 Expected: \\"foo\\" Received - 3: \\"foo\\" + 3: \\"foo\\" Number of returns: 3" `; @@ -1906,7 +1906,7 @@ exports[`toHaveNthReturnedWith nthReturnedWith should replace 1st, 2nd, 3rd with n: 1 Expected: not \\"foo1\\" Received --> 1: \\"foo1\\" +-> 1: \\"foo1\\" 2: \\"foo2\\" Number of returns: 3" @@ -1918,7 +1918,7 @@ exports[`toHaveNthReturnedWith nthReturnedWith works with three calls 1`] = ` n: 1 Expected: not \\"foo1\\" Received --> 1: \\"foo1\\" +-> 1: \\"foo1\\" 2: \\"foo2\\" Number of returns: 3" diff --git a/packages/expect/src/spyMatchers.ts b/packages/expect/src/spyMatchers.ts index 890dfce1f18b..0a37636fc64a 100644 --- a/packages/expect/src/spyMatchers.ts +++ b/packages/expect/src/spyMatchers.ts @@ -61,11 +61,10 @@ const isEqualValue = (expected: unknown, received: unknown): boolean => const isEqualCall = ( expected: Array, received: Array, -): boolean => equals(expected, received, [iterableEquality]); +): boolean => isEqualValue(expected, received); const isEqualReturn = (expected: unknown, result: any): boolean => - result.type === 'return' && - equals(expected, result.value, [iterableEquality]); + result.type === 'return' && isEqualValue(expected, result.value); const countReturns = (results: Array): number => results.reduce( @@ -313,11 +312,13 @@ const isLineDiffableArg = (expected: unknown, received: unknown): boolean => { return true; }; -const printResult = (result: any) => +const printResult = (result: any, expected: unknown) => result.type === 'throw' ? 'function call threw an error' : result.type === 'incomplete' ? 'function call has not returned yet' + : isEqualValue(expected, result.value) + ? printCommon(result.value) : printReceived(result.value); type IndexedResult = [number, any]; @@ -326,6 +327,7 @@ type IndexedResult = [number, any]; // so additional empty line can separate from `Number of returns` which follows. const printReceivedResults = ( label: string, + expected: unknown, indexedResults: Array, isOnlyCall: boolean, iExpectedCall?: number, @@ -335,7 +337,7 @@ const printReceivedResults = ( } if (isOnlyCall && (iExpectedCall === 0 || iExpectedCall === undefined)) { - return label + printResult(indexedResults[0][1]) + '\n'; + return label + printResult(indexedResults[0][1], expected) + '\n'; } const printAligned = getRightAlignedPrinter(label); @@ -347,7 +349,7 @@ const printReceivedResults = ( (printed: string, [i, result]: IndexedResult) => printed + printAligned(String(i + 1), i === iExpectedCall) + - printResult(result) + + printResult(result, expected) + '\n', '', ) @@ -656,6 +658,7 @@ const createToReturnWithMatcher = (matcherName: string) => ? '' : printReceivedResults( 'Received: ', + expected, indexedResults, results.length === 1, )) + @@ -677,6 +680,7 @@ const createToReturnWithMatcher = (matcherName: string) => `Expected: ${printExpected(expected)}\n` + printReceivedResults( 'Received: ', + expected, indexedResults, results.length === 1, ) + @@ -809,6 +813,7 @@ const createLastReturnedMatcher = (matcherName: string) => ? '' : printReceivedResults( 'Received: ', + expected, indexedResults, results.length === 1, iLast, @@ -841,6 +846,7 @@ const createLastReturnedMatcher = (matcherName: string) => `Expected: ${printExpected(expected)}\n` + printReceivedResults( 'Received: ', + expected, indexedResults, results.length === 1, iLast, @@ -1037,6 +1043,7 @@ const createNthReturnedWithMatcher = (matcherName: string) => ? '' : printReceivedResults( 'Received: ', + expected, indexedResults, results.length === 1, iNth, @@ -1097,6 +1104,7 @@ const createNthReturnedWithMatcher = (matcherName: string) => `Expected: ${printExpected(expected)}\n` + printReceivedResults( 'Received: ', + expected, indexedResults, results.length === 1, iNth,