Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: run e2e tests after release please actions on cypress cloud #1498

Merged
merged 7 commits into from
Mar 4, 2024
Merged

chore: run e2e tests after release please actions on cypress cloud #1498

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4dd733d
feat: add cypress cloud
derschnee68 Feb 13, 2024
e08838b
Merge remote-tracking branch 'origin/main' into julien/cypress-cloud
derschnee68 Mar 4, 2024
14ae088
feat: cypress cloud run in CI
derschnee68 Mar 4, 2024
4286609
fix
derschnee68 Mar 4, 2024
52b2a64
fix: revert main.yaml change
derschnee68 Mar 4, 2024
5b49dc6
fix
derschnee68 Mar 4, 2024
e06e9d3
Merge branch 'main' into julien/cypress-cloud
derschnee68 Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 14 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
echo "registry=https://npm.pkg.github.com/dasch-swiss" >> ~/.npmrc
- run: npm install
- run: npx nx run dsp-app:lint
# - run: npx nx run dsp-app:test:ci
# - run: npx nx run dsp-app:test:ci
env:
TZ: Europe/Zurich

Expand Down Expand Up @@ -78,10 +78,21 @@ jobs:
make init-db-test
docker compose -f docker-compose.yml up -d sipi ingest api
./webapi/scripts/wait-for-api.sh
- name: run e2e tests
- name: run e2e tests in ci
if: github.event_name != 'push'
run: |
cd ../dsp-das
npm run e2e-ci
- name: run e2e tests on cypress cloud on push
if: github.event_name == 'push'
run: |
cd ../dsp-das
export CYPRESS_RECORD_KEY=$CYPRESS_RECORD_KEY_SECRET
npm run e2e-cloud
env:
CYPRESS_RECORD_KEY_SECRET: ${{ secrets.CYPRESS_RECORD_KEY }}



jdnconvertiblecalendar-tests:
name: JDNConvertibleCalendar
Expand Down Expand Up @@ -206,7 +217,7 @@ jobs:
{"type": "docs", "section": "Documentation", "hidden": false }
]'

# build documentation
# build documentation
docs-build-test:
name: Docs Build Test
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions apps/dsp-app/cypress.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import { defineConfig } from 'cypress';

export default defineConfig({
projectId: 'n5b5id',
e2e: {
specPattern: 'cypress/**/**/**/*.cy.ts',
excludeSpecPattern: ['*.spec.js', '*.spec.ts'],
Expand Down
9 changes: 8 additions & 1 deletion apps/dsp-app/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,15 @@
"env": {
"API_URL": "http://0.0.0.0:3333/api"
}
},
"cypress-cloud": {
"devServerTarget": "dsp-app:serve:development",
"record": true,
"env": {
"API_URL": "http://0.0.0.0:3333/api"
}
}
}
}
}
}
}
9 changes: 0 additions & 9 deletions cypress.config.ts
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"e2e-local": "cd apps/dsp-app && npx cypress open",
"e2e-ci-dev": "nx run dsp-app:e2e:development",
"e2e-ci": "nx run dsp-app:e2e:production",
"e2e-cloud": "nx run dsp-app:e2e:cypress-cloud",
"build": "nx run dsp-app:build",
"build-prod": "nx run dsp-app:build:production",
"test-ci": "nx run dsp-app:test:ci",
Expand Down