Skip to content

Commit

Permalink
Replace entrypoint and remove unneeded packags in package.json
Browse files Browse the repository at this point in the history
  • Loading branch information
henrixapp committed Apr 11, 2023
1 parent dab7706 commit 71fc084
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 549 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/test-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ jobs:
working-directory: docker/run_cypress_tests
env:
# pass the Dashboard record key as an environment variable
CYPRESS_baseUrl: http://mampf:3000
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
# pass GitHub token to allow accurately detecting a build vs a re-run build
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: docker compose run -e GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} cypress_runner cypress run --record --key ${{ secrets.CYPRESS_RECORD_KEY }}
run: docker compose run -e GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} --entrypoint "" cypress_runner sh -c "while ! curl -s http://mampf:3000 > /dev/null; do echo waiting for MaMpf to come online at http://mampf:3000; sleep 1; done; cypress run --record --key ${{ secrets.CYPRESS_RECORD_KEY }}"
1 change: 0 additions & 1 deletion docker/run_cypress_tests/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ services:
dockerfile: docker/run_cypress_tests/Dockerfile_cypress
environment:
CYPRESS_baseUrl: http://mampf:3000
entrypoint: bash -c "while ! curl -s $$CYPRESS_baseUrl > /dev/null; do echo waiting for MaMpf to come online at $$CYPRESS_baseUrl; sleep 1; done; npx cypress run $$@"
volumes:
- ../../spec/cypress/e2e:/cypress/e2e:ro
- ../../spec/cypress/fixtures:/cypress/fixtures:ro
Expand Down
4 changes: 0 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,5 @@
},
"scripts": {
"lint": "eslint ."
},
"devDependencies": {
"cypress": "9.5.1",
"@rails/webpacker": "5.4.3"
}
}
Loading

0 comments on commit 71fc084

Please sign in to comment.