Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 0 additions & 41 deletions template/e2e-tests/ci-start-app-and-db.js

This file was deleted.

64 changes: 58 additions & 6 deletions template/e2e-tests/package-lock.json

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

8 changes: 1 addition & 7 deletions template/e2e-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
"test": "tests"
},
"scripts": {
"ci:e2e:start": "npm run ci:e2e:cleanup-db && node ci-start-app-and-db.js",
"ci:e2e:start-db": "cd ../app && wasp start db",
"ci:e2e:start-app": "npm run ci:e2e:wait-for-db && cd ../app && wasp db migrate-dev && cd ../e2e-tests && cd ../app && wasp start",
"ci:e2e:wait-for-db": "npx wait-port 5432",
"_comment-on-ci:e2e:cleanup-db": "NOTE: the name of the DB container, e.g. name=^wasp-dev-db-OpenSaaS-, is generated by wasp and will match the name of the app definition in your `main.wasp` file, e.g. `app OpenSaaS { }`",
"ci:e2e:cleanup-db": "(docker container rm $(docker container ls -f name=^wasp-dev-db-OpenSaaS- -q) -f || true) && docker volume rm $(docker volume ls -f name=^wasp-dev-db-OpenSaaS- -q) -f || true",
"e2e:playwright": "DEBUG=pw:webserver npx playwright test",
"_comment-on-local:e2e:cleanup-stripe": "NOTE: because we are running the stripe webhook listener in the background, we want to make sure we kill the previous processes before starting a new one.",
"local:e2e:cleanup-stripe": "PID=$(ps -ef | grep 'stripe listen' | grep -v grep | awk '{print $2}') || true && kill -9 $PID || true",
Expand All @@ -25,7 +19,7 @@
"dependencies": {
"@playwright/test": "^1.42.1",
"@prisma/client": "5.19.1",
"linebyline": "^1.3.0",
"@wasp.sh/wasp-app-runner": "0.0.7",
"prisma": "5.19.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion template/e2e-tests/playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default defineConfig({
* For local development, where this does pose a nuisance, we start the app / web server manually with `wasp db start` and `wasp start` and then start tests with `npm run local:e2e:start`.
*/
webServer: {
command: 'npm run ci:e2e:start',
command: 'run-wasp-app dev --path-to-app=../app --wasp-cli-cmd=wasp',
// Wait for the backend to start
url: 'http://localhost:3001',
reuseExistingServer: !process.env.CI,
Expand Down