Skip to content

Commit

Permalink
More fixes to wp-scripts test-e2e
Browse files Browse the repository at this point in the history
  • Loading branch information
gziolo committed Dec 7, 2018
1 parent a9b29c1 commit cad71f1
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 28 deletions.
63 changes: 39 additions & 24 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
"cross-spawn": "^5.1.0",
"eslint": "^4.19.1",
"jest": "^23.6.0",
"jest-puppeteer": "^3.2.1",
"jest-puppeteer": "3.2.1",
"npm-package-json-lint": "^3.3.1",
"puppeteer": "^1.6.1",
"puppeteer": "1.6.1",
"read-pkg-up": "^1.0.1",
"resolve-bin": "^0.4.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/scripts/scripts/test-e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if ( ! hasProjectFile( 'jest-puppeteer.config.js' ) && ! process.env.JEST_PUPPET
}

const config = ! hasJestConfig() ?
[ '--config', JSON.stringify( fromConfigRoot( 'jest-e2e.config.js' ) ) ] :
[ '--config', JSON.stringify( require( fromConfigRoot( 'jest-e2e.config.js' ) ) ) ] :
[];

const hasRunInBand = hasCliArg( '--runInBand' ) ||
Expand Down
2 changes: 1 addition & 1 deletion packages/scripts/scripts/test-unit-jest.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const {
} = require( '../utils' );

const config = ! hasJestConfig() ?
[ '--config', JSON.stringify( fromConfigRoot( 'jest-unit.config.js' ) ) ] :
[ '--config', JSON.stringify( require( fromConfigRoot( 'jest-unit.config.js' ) ) ) ] :
[];

jest.run( [ ...config, ...getCliArgs() ] );

0 comments on commit cad71f1

Please sign in to comment.