Skip to content

Commit

Permalink
chore(deps): Allow Cypress 3 within peerDep. Updated Cypress and serv…
Browse files Browse the repository at this point in the history
…e deps, changed configs and scripts accordingly. (#9)
  • Loading branch information
npeterkamps authored and Kent C. Dodds committed Jun 2, 2018
1 parent ec3b712 commit 7d14b89
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
3 changes: 1 addition & 2 deletions cypress.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"baseUrl": "http://localhost:13370",
"videoRecording": false,
"screenshotOnHeadlessFailure": false
"video": false
}
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"test": "npm-run-all --parallel test:unit test:cypress",
"test:unit": "kcd-scripts test --no-watch",
"test:unit:watch": "kcd-scripts test",
"test:cypress:serve": "serve --clipless --local --port 13370 ./cypress/fixtures/test-app",
"test:cypress:serve": "serve -l 13370 ./cypress/fixtures/test-app",
"test:cypress:run": "cypress run",
"test:cypress:open": "cypress open",
"test:cypress": "npm-run-all --silent --parallel --race test:cypress:serve test:cypress:run",
Expand Down Expand Up @@ -42,13 +42,13 @@
"dom-testing-library": "^2.0.0"
},
"devDependencies": {
"cypress": "^2.1.0",
"cypress": "^3.0.1",
"kcd-scripts": "^0.37.0",
"npm-run-all": "^4.1.2",
"serve": "^6.5.6"
"serve": "^7.2.0"
},
"peerDependencies": {
"cypress": "^2.1.0"
"cypress": "^2.1.0 || ^3.0.0"
},
"eslintConfig": {
"extends": "./node_modules/kcd-scripts/eslint.js",
Expand Down

0 comments on commit 7d14b89

Please sign in to comment.