Skip to content

Commit 493ea5a

Browse files
committed
merge pull
2 parents d1d42b8 + cc0d240 commit 493ea5a

5 files changed

Lines changed: 45 additions & 5 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,4 @@ typings/
6565
.vscode/
6666
dist/
6767
cypress/screenshots
68+
cypress/videos

circle.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# https://docs.cypress.io/guides/guides/continuous-integration.html#CircleCI
2+
version: 2
3+
jobs:
4+
build:
5+
docker:
6+
- image: cypress/base:10
7+
environment:
8+
## this enables colors in the output
9+
TERM: xterm
10+
working_directory: ~/app
11+
steps:
12+
- checkout
13+
- restore_cache:
14+
key: v1-app
15+
- run: yarn install
16+
- save_cache:
17+
key: v1-app
18+
paths:
19+
# since we use Yarn it caches NPM modules in ~/.cache
20+
# and Cypress caches its binary there!
21+
# to confirm:
22+
# yarn cache dir
23+
# npx print-cachedir Cypress
24+
- ~/.cache
25+
- run: yarn build
26+
# run e2e tests with video recorded by Cypress
27+
- run: yarn e2e:video
28+
# store videos and screenshots (if any) as CI artifacts
29+
- store_artifacts:
30+
path: cypress/videos
31+
- store_artifacts:
32+
path: cypress/screenshots

cypress.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"projectId": "ar6axg"
3-
}
2+
"projectId": "ar6axg",
3+
"video": false
4+
}

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@
1919
"examples": "run-p examples:*",
2020
"examples:client": "cd examples && poi --port 4321",
2121
"examples:server": "cd cypress/fixtures && json-server --port 4322 db.js",
22-
"cypress:run": "cypress run --config videoRecording=false",
22+
"cypress:run": "cypress run",
23+
"cypress:run:video": "cypress run --config video=true",
2324
"cypress:open": "cypress open",
2425
"e2e": "concurrently -k --success first 'npm run examples' 'npm run cypress:run'",
26+
"e2e:video": "concurrently -k --success first 'npm run examples' 'npm run cypress:run:video'",
2527
"e2e:open": "run-p examples cypress:open",
2628
"docs": "poi --config docs/poi.config.js",
27-
"prepublish": "run-p e2e"
29+
"disable-prepublish-stop-running-on-install-before-build": "run-p e2e"
2830
},
2931
"keywords": [
3032
"react",
@@ -81,4 +83,4 @@
8183
"^.+\\.tsx?$": "ts-jest"
8284
}
8385
}
84-
}
86+
}

yarn.lock

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3328,7 +3328,11 @@ cyclist@~0.2.2:
33283328
version "0.2.2"
33293329
resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
33303330

3331+
<<<<<<< HEAD
33313332
cypress@^3.0.1:
3333+
=======
3334+
cypress@3.0.1:
3335+
>>>>>>> cc0d2402e3af35d4a2dc95864f46c761b24ce5b9
33323336
version "3.0.1"
33333337
resolved "https://registry.yarnpkg.com/cypress/-/cypress-3.0.1.tgz#6a8938ce8a551e4ae1bd5fb2ceab038d4ad39c4d"
33343338
dependencies:

0 commit comments

Comments
 (0)