Skip to content

Commit 88c5668

Browse files
Merge branch 'master' into fix/data-export
2 parents 1c63c1b + 0ca5b35 commit 88c5668

41 files changed

Lines changed: 1517 additions & 1426 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/e2e.yaml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,32 @@ jobs:
3030
- name: Set env
3131
run: |
3232
echo "SITE_URL=https://${{ steps.env.outputs.subdomain }}.ovh.fabrique.social.gouv.fr" >> $GITHUB_ENV
33+
echo "KEYCLOAK_URL=https://keycloak-${{ steps.env.outputs.subdomain }}.ovh.fabrique.social.gouv.fr" >> $GITHUB_ENV
3334
3435
- name: Override subdomain for master branch
3536
if: ${{ github.ref == 'refs/heads/master' }}
3637
run: |
3738
echo "SITE_URL=https://egapro-preprod.ovh.fabrique.social.gouv.fr" >> $GITHUB_ENV
39+
echo "KEYCLOAK_URL=https://keycloak.undercloud.fabrique.social.gouv.fr" >> $GITHUB_ENV
3840
3941
- name: Run test e2e
4042
run: |
41-
pnpm test:e2e:app
43+
pnpm test:e2e:app -- --browser chrome
4244
env:
45+
CI: "true"
4346
working-directory: ./packages/app
4447
config: "pageLoadTimeout=100000,baseUrl=${{ env.SITE_URL }}"
4548
TEST_BASEURL: ${{ env.SITE_URL }}
46-
E2E_USERNAME: ${{ secrets.E2E_USERNAME }}
47-
E2E_PASSWORD: ${{ secrets.E2E_PASSWORD }}
49+
E2E_USERNAME: ${{ github.ref == 'refs/heads/master' && secrets.E2E_USERNAME || 'test@fia1.fr' }}
50+
E2E_PASSWORD: ${{ github.ref == 'refs/heads/master' && secrets.E2E_PASSWORD || 'test' }}
51+
KEYCLOAK_URL: ${{ env.KEYCLOAK_URL }}
52+
53+
- name: Upload Cypress artifacts
54+
if: failure()
55+
uses: actions/upload-artifact@v4
56+
with:
57+
name: cypress-artifacts
58+
path: |
59+
packages/app/cypress/screenshots
60+
packages/app/cypress/videos
61+
retention-days: 7

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,7 @@ venv/
5353
/packages/api/settings.json
5454

5555
mnt/dgt.xlsx
56+
57+
# claude / playwright
58+
.claude/
59+
.playwright-mcp/

.kontinuous/env/dev/templates/egapro.configmap.yaml

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
kind: ConfigMap
2+
apiVersion: v1
3+
metadata:
4+
name: egapro
5+
data:
6+
EGAPRO_PROCONNECT_SCOPE: "openid email profile organizations phone"
7+
EGAPRO_PROCONNECT_DISCOVERY_URL: "http://keycloak:8080/realms/egapro"
8+
EGAPRO_PROCONNECT_SIGN_IN_URL: ""
9+
EGAPRO_PROCONNECT_MANAGE_ORGANISATIONS_URL: "http://keycloak:8080/realms/egapro/account"
10+
EGAPRO_PROCONNECT_PERSONAL_INFORMATION_URL: "http://keycloak:8080/realms/egapro/account"
11+
SECURITY_CHARON_URL: ""
12+
SECURITY_MONCOMPTEPRO_CLIENT_ID: "egapro-local"
13+
SECURITY_MONCOMPTEPRO_CLIENT_SECRET: "egapro-local-secret"
14+
SECURITY_MONCOMPTEPRO_TEST: "true"

0 commit comments

Comments
 (0)