Skip to content

Commit

Permalink
Remove testMatch from package.json (#4630)
Browse files Browse the repository at this point in the history
* Remove testMatch from package.json

* Update ignores to ignore files in __tests__ that are not tests

* skip failing test

* Use proper mock creation instance
  • Loading branch information
SimenB authored and cpojer committed Dec 6, 2017
1 parent 12f3681 commit 158ecd3
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
18 changes: 14 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,20 @@
"/integration_tests/.*/__tests__",
"\\.snap$",
"/packages/.*/build",
"/packages/.*/build-es5"
],
"testMatch": [
"**/*.test.js"
"/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",
"/integration_tests/__tests__/iterator-to-null-test.js"
]
},
"prettier": {
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-runtime/src/__tests__/runtime_jest_fn.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ describe('Runtime', () => {
expect(mock1).toBeCalled();
expect(mock2).toBeCalled();

jest.clearAllMocks();
runtime.clearAllMocks();

expect(mock1).not.toBeCalled();
expect(mock2).not.toBeCalled();
Expand Down

0 comments on commit 158ecd3

Please sign in to comment.