From 6f1b274531d3168ce34297391f5f827531b22fcb Mon Sep 17 00:00:00 2001 From: Zsolt Dollenstein Date: Sun, 26 Feb 2017 11:18:39 +0000 Subject: [PATCH 1/2] testMatch should find tests in .folders --- packages/jest-cli/src/SearchSource.js | 2 +- packages/jest-cli/src/__tests__/SearchSource-test.js | 2 ++ .../__tests__/test_root/.hiddenFolder/not-really-a-test.txt | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 packages/jest-cli/src/__tests__/test_root/.hiddenFolder/not-really-a-test.txt diff --git a/packages/jest-cli/src/SearchSource.js b/packages/jest-cli/src/SearchSource.js index 26942da347ee..5afb4940c178 100644 --- a/packages/jest-cli/src/SearchSource.js +++ b/packages/jest-cli/src/SearchSource.js @@ -77,7 +77,7 @@ const globsToMatcher = (globs: ?Array) => { return () => true; } - const matchers = globs.map(each => micromatch.matcher(each)); + const matchers = globs.map(each => micromatch.matcher(each, {dot: true})); return (path: Path) => matchers.some(each => each(path)); }; diff --git a/packages/jest-cli/src/__tests__/SearchSource-test.js b/packages/jest-cli/src/__tests__/SearchSource-test.js index f74afb1ddd8b..9cb2cc491e76 100644 --- a/packages/jest-cli/src/__tests__/SearchSource-test.js +++ b/packages/jest-cli/src/__tests__/SearchSource-test.js @@ -110,6 +110,7 @@ describe('SearchSource', () => { path.relative(rootDir, absPath) )); expect(relPaths).toEqual([ + path.normalize('.hiddenFolder/not-really-a-test.txt'), path.normalize('__testtests__/not-really-a-test.txt'), ]); }); @@ -128,6 +129,7 @@ describe('SearchSource', () => { path.relative(rootDir, absPath) )); expect(relPaths).toEqual([ + path.normalize('.hiddenFolder/not-really-a-test.txt'), path.normalize('__testtests__/not-really-a-test.txt'), ]); }); diff --git a/packages/jest-cli/src/__tests__/test_root/.hiddenFolder/not-really-a-test.txt b/packages/jest-cli/src/__tests__/test_root/.hiddenFolder/not-really-a-test.txt new file mode 100644 index 000000000000..6d2dba7f4d4a --- /dev/null +++ b/packages/jest-cli/src/__tests__/test_root/.hiddenFolder/not-really-a-test.txt @@ -0,0 +1,3 @@ +// not-really-a-test.txt + +require('../module.txt'); From b2bef2feb701dc7894c780e330eb259f9745cebc Mon Sep 17 00:00:00 2001 From: Zsolt Dollenstein Date: Sun, 26 Feb 2017 19:43:03 +0000 Subject: [PATCH 2/2] dont depend on order of paths in tests --- packages/jest-cli/src/__tests__/SearchSource-test.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/jest-cli/src/__tests__/SearchSource-test.js b/packages/jest-cli/src/__tests__/SearchSource-test.js index 9cb2cc491e76..8a7a3f349202 100644 --- a/packages/jest-cli/src/__tests__/SearchSource-test.js +++ b/packages/jest-cli/src/__tests__/SearchSource-test.js @@ -108,11 +108,11 @@ describe('SearchSource', () => { return findMatchingTests(config).then(data => { const relPaths = data.paths.map(absPath => ( path.relative(rootDir, absPath) - )); + )).sort(); expect(relPaths).toEqual([ path.normalize('.hiddenFolder/not-really-a-test.txt'), path.normalize('__testtests__/not-really-a-test.txt'), - ]); + ].sort()); }); }); @@ -127,11 +127,11 @@ describe('SearchSource', () => { return findMatchingTests(config).then(data => { const relPaths = data.paths.map(absPath => ( path.relative(rootDir, absPath) - )); + )).sort(); expect(relPaths).toEqual([ path.normalize('.hiddenFolder/not-really-a-test.txt'), path.normalize('__testtests__/not-really-a-test.txt'), - ]); + ].sort()); }); });