Skip to content

Commit

Permalink
revert wait-on changes
Browse files Browse the repository at this point in the history
  • Loading branch information
kuceb committed Jun 10, 2020
1 parent ca20729 commit 6de684c
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
20 changes: 20 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,12 @@ commands:
steps:
- attach_workspace:
at: ~/
- run:
command: yarn start
background: true
working_directory: packages/driver
- run:
command: yarn wait-on http://localhost:3500
- run:
environment:
CYPRESS_KONFIG_ENV: production
Expand Down Expand Up @@ -194,6 +200,10 @@ commands:
description: Test command to run to start Cypress tests
type: string
default: "npm run e2e"
wait-on:
description: Url to wait-on before starting tests
type: string
default: ""
# if the repo to clone and test is a monorepo, you can
# run tests inside a specific subfolder
folder:
Expand Down Expand Up @@ -246,6 +256,12 @@ commands:
working_directory: /tmp/<<parameters.repo>>
command: npm start --if-present
background: true
- when:
condition: <<parameters.wait-on>>
steps:
- run:
name: Wait-on <<parameters.wait-on>>
command: npx wait-on <<parameters.wait-on>> --timeout 120000
- when:
condition: << parameters.folder >>
steps:
Expand Down Expand Up @@ -1302,6 +1318,7 @@ jobs:
repo: cypress-documentation
browser: firefox
command: "npm run cypress:run"
wait-on: "http://localhost:2222"

"test-binary-against-realworld-firefox":
<<: *defaults
Expand All @@ -1310,6 +1327,7 @@ jobs:
repo: cypress-example-realworld
browser: firefox
command: "npm run cypress:run"
wait-on: "http://localhost:4100"

"test-binary-against-api-testing-firefox":
<<: *defaults
Expand All @@ -1318,6 +1336,7 @@ jobs:
repo: cypress-example-api-testing
browser: firefox
command: "npm run cy:run"
wait-on: "http://localhost:3000"

"test-binary-against-piechopper-firefox":
<<: *defaults
Expand All @@ -1326,6 +1345,7 @@ jobs:
repo: cypress-example-piechopper
browser: firefox
command: "npm run cypress:run"
wait-on: "http://localhost:8080"

test-binary-as-specific-user:
<<: *defaults
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@
"terminal-banner": "1.1.0",
"through": "2.3.8",
"ts-node": "8.3.0",
"typescript": "3.7.4"
"typescript": "3.7.4",
"wait-on": "3.3.0"
},
"engines": {
"node": ">=12.8.1",
Expand Down

0 comments on commit 6de684c

Please sign in to comment.