From acff700290f0e9f2b66641dee28fabd30a47f946 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sun, 8 Oct 2017 21:36:11 +0200 Subject: [PATCH 1/4] Remove testMatch from package.json --- package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/package.json b/package.json index 3967567b6667..76cf9292dfc6 100644 --- a/package.json +++ b/package.json @@ -139,9 +139,6 @@ "\\.snap$", "/packages/.*/build", "/packages/.*/build-es5" - ], - "testMatch": [ - "**/*.test.js" ] }, "prettier": { From 9bba3eebcdf226e5d0939e20bba3c5a432513752 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sun, 8 Oct 2017 21:47:29 +0200 Subject: [PATCH 2/4] Update ignores to ignore files in __tests__ that are not tests --- package.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 76cf9292dfc6..3073d1657ca3 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,19 @@ "/integration_tests/.*/__tests__", "\\.snap$", "/packages/.*/build", - "/packages/.*/build-es5" + "/packages/.*/build-es5", + "/packages/.*/src/__tests__/expect_util.js", + "/packages/jest-cli/src/__tests__/test_root", + "/packages/jest-cli/src/__tests__/__fixtures__/", + "/packages/jest-haste-map/src/__tests__/haste_impl.js", + "/packages/jest-resolve-dependencies/src/__tests__/__fixtures__/", + "/packages/jest-runtime/src/__tests__/defaultResolver.js", + "/packages/jest-runtime/src/__tests__/module_dir/", + "/packages/jest-runtime/src/__tests__/NODE_PATH_dir", + "/packages/jest-snapshot/src/__tests__/plugins", + "/packages/jest-validate/src/__tests__/fixtures/", + "/packages/jest-worker/src/__performance_tests__", + "/packages/pretty-format/perf/test.js" ] }, "prettier": { From 1c8c2c7570aec2901523c73820ce4c2d18955c26 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 6 Dec 2017 15:29:04 +0100 Subject: [PATCH 3/4] skip failing test --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 3073d1657ca3..4e8a297c49b1 100644 --- a/package.json +++ b/package.json @@ -150,7 +150,8 @@ "/packages/jest-snapshot/src/__tests__/plugins", "/packages/jest-validate/src/__tests__/fixtures/", "/packages/jest-worker/src/__performance_tests__", - "/packages/pretty-format/perf/test.js" + "/packages/pretty-format/perf/test.js", + "/integration_tests/__tests__/iterator-to-null-test.js" ] }, "prettier": { From aaeb0f887820a4560e8107d959d922bd11958cc7 Mon Sep 17 00:00:00 2001 From: Miguel Jimenez Esun Date: Wed, 6 Dec 2017 17:55:48 +0000 Subject: [PATCH 4/4] Use proper mock creation instance --- packages/jest-runtime/src/__tests__/runtime_jest_fn.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jest-runtime/src/__tests__/runtime_jest_fn.js b/packages/jest-runtime/src/__tests__/runtime_jest_fn.js index 8d9555d7d2d0..efd01ed9f6e4 100644 --- a/packages/jest-runtime/src/__tests__/runtime_jest_fn.js +++ b/packages/jest-runtime/src/__tests__/runtime_jest_fn.js @@ -60,7 +60,7 @@ describe('Runtime', () => { expect(mock1).toBeCalled(); expect(mock2).toBeCalled(); - jest.clearAllMocks(); + runtime.clearAllMocks(); expect(mock1).not.toBeCalled(); expect(mock2).not.toBeCalled();