Skip to content

Commit

Permalink
fix(testing): skip e2e by default
Browse files Browse the repository at this point in the history
  • Loading branch information
manucorporat committed Aug 19, 2019
1 parent 691b8ad commit 110d5e4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/packages/testing/jest-preset.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module.exports = {
'/www'
],
maxConcurrency: 1,
testRegex: '(/__tests__/.*|\\.?(test|spec|e2e))\\.(tsx?|ts?|jsx?|js?)$',
testRegex: '(/__tests__/.*|\\.?(test|spec))\\.(tsx?|ts?|jsx?|js?)$',
transform: {
'^.+\\.(ts|tsx|jsx)$': path.join(testingDir, 'jest-preprocessor.js')
}
Expand Down
4 changes: 4 additions & 0 deletions src/compiler/config/validate-testing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ export function validateTesting(config: d.Config, diagnostics: d.Diagnostic[]) {
testing.pixelmatchThreshold = DEFAULT_PIXEL_MATCH_THRESHOLD;
}

if (testing.testRegex === undefined) {
testing.testRegex = '(/__tests__/.*|\\.?(test|spec|e2e))\\.(tsx?|ts?|jsx?|js?)$';
}

if (Array.isArray(testing.testMatch)) {
delete testing.testRegex;

Expand Down

0 comments on commit 110d5e4

Please sign in to comment.