Skip to content

Commit 5a17eb7

Browse files
ViczeiViczei
committed
feat(keycloak): add e2e test SIRENs to Keycloak test user
- Add all 17 SIRENs used in Cypress e2e tests to the test@fia1.fr user - Rename user to Test Egapro to match Cypress assertions - Default e2e credentials to test@fia1.fr/test for dev branches - Use GitHub secrets only on master for preprod Keycloak - Relax Keycloak origin check in Cypress for dynamic hostnames
1 parent 6bd92ee commit 5a17eb7

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎.github/workflows/e2e.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ jobs:
4343
working-directory: ./packages/app
4444
config: "pageLoadTimeout=100000,baseUrl=${{ env.SITE_URL }}"
4545
TEST_BASEURL: ${{ env.SITE_URL }}
46-
E2E_USERNAME: ${{ secrets.E2E_USERNAME }}
47-
E2E_PASSWORD: ${{ secrets.E2E_PASSWORD }}
46+
E2E_USERNAME: ${{ github.ref == 'refs/heads/master' && secrets.E2E_USERNAME || 'test@fia1.fr' }}
47+
E2E_PASSWORD: ${{ github.ref == 'refs/heads/master' && secrets.E2E_PASSWORD || 'test' }}

‎.kontinuous/env/dev/templates/keycloak.configmap.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,8 @@ data:
280280
"email": "test@fia1.fr",
281281
"emailVerified": true,
282282
"enabled": true,
283-
"firstName": "Jean",
284-
"lastName": "Dupont",
283+
"firstName": "Test",
284+
"lastName": "Egapro",
285285
"credentials": [
286286
{
287287
"type": "password",
@@ -297,7 +297,7 @@ data:
297297
"Responsable RH"
298298
],
299299
"organizations": [
300-
"[{\"id\":1,\"siren\":\"123456789\",\"siret\":\"12345678900001\",\"label\":\"Entreprise Test A\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":2,\"siren\":\"987654321\",\"siret\":\"98765432100001\",\"label\":\"Entreprise Test B\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":true}]"
300+
"[{\"id\":1,\"siren\":\"491753364\",\"siret\":\"49175336400001\",\"label\":\"SOCIETE DE NETTOYAGE INDUSTRIEL DU MIDI\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":2,\"siren\":\"384964508\",\"siret\":\"38496450800001\",\"label\":\"LUCIE\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":3,\"siren\":\"440137818\",\"siret\":\"44013781800001\",\"label\":\"MAISON MUSIC\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":4,\"siren\":\"440137982\",\"siret\":\"44013798200001\",\"label\":\"ELIOR RESTAURATION FRANCE\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":5,\"siren\":\"441388311\",\"siret\":\"44138831100001\",\"label\":\"MAISONS DU MONDE\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":6,\"siren\":\"804450377\",\"siret\":\"80445037700001\",\"label\":\"VESTIAIRE COLLECTIVE\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":7,\"siren\":\"817989791\",\"siret\":\"81798979100001\",\"label\":\"FREE NOW FRANCE\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":8,\"siren\":\"820709046\",\"siret\":\"82070904600001\",\"label\":\"SOCOTEC SMART SOLUTIONS\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":9,\"siren\":\"834547168\",\"siret\":\"83454716800001\",\"label\":\"JUMP TECHNOLOGY\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":10,\"siren\":\"351630371\",\"siret\":\"35163037100001\",\"label\":\"SECURITAS FRANCE\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":11,\"siren\":\"983923384\",\"siret\":\"98392338400001\",\"label\":\"ENTREPRISE TEST UES\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":12,\"siren\":\"442424560\",\"siret\":\"44242456000001\",\"label\":\"GROUPE BPCE\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":13,\"siren\":\"821832219\",\"siret\":\"82183221900001\",\"label\":\"BANQUE PALATINE\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":14,\"siren\":\"982446213\",\"siret\":\"98244621300001\",\"label\":\"UES MEMBRE 1\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":15,\"siren\":\"982446122\",\"siret\":\"98244612200001\",\"label\":\"UES MEMBRE 2\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":16,\"siren\":\"981216658\",\"siret\":\"98121665800001\",\"label\":\"UES MEMBRE 3\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":17,\"siren\":\"980276067\",\"siret\":\"98027606700001\",\"label\":\"UES MEMBRE 4\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false}]"
301301
]
302302
},
303303
"realmRoles": [

‎keycloak/realm-egapro.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@
264264
"email": "test@fia1.fr",
265265
"emailVerified": true,
266266
"enabled": true,
267-
"firstName": "Jean",
268-
"lastName": "Dupont",
267+
"firstName": "Test",
268+
"lastName": "Egapro",
269269
"credentials": [
270270
{
271271
"type": "password",
@@ -276,7 +276,7 @@
276276
"attributes": {
277277
"phoneNumber": ["0612345678"],
278278
"job": ["Responsable RH"],
279-
"organizations": ["[{\"id\":1,\"siren\":\"123456789\",\"siret\":\"12345678900001\",\"label\":\"Entreprise Test A\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":2,\"siren\":\"987654321\",\"siret\":\"98765432100001\",\"label\":\"Entreprise Test B\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":true}]"]
279+
"organizations": ["[{\"id\":1,\"siren\":\"491753364\",\"siret\":\"49175336400001\",\"label\":\"SOCIETE DE NETTOYAGE INDUSTRIEL DU MIDI\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":2,\"siren\":\"384964508\",\"siret\":\"38496450800001\",\"label\":\"LUCIE\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":3,\"siren\":\"440137818\",\"siret\":\"44013781800001\",\"label\":\"MAISON MUSIC\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":4,\"siren\":\"440137982\",\"siret\":\"44013798200001\",\"label\":\"ELIOR RESTAURATION FRANCE\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":5,\"siren\":\"441388311\",\"siret\":\"44138831100001\",\"label\":\"MAISONS DU MONDE\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":6,\"siren\":\"804450377\",\"siret\":\"80445037700001\",\"label\":\"VESTIAIRE COLLECTIVE\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":7,\"siren\":\"817989791\",\"siret\":\"81798979100001\",\"label\":\"FREE NOW FRANCE\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":8,\"siren\":\"820709046\",\"siret\":\"82070904600001\",\"label\":\"SOCOTEC SMART SOLUTIONS\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":9,\"siren\":\"834547168\",\"siret\":\"83454716800001\",\"label\":\"JUMP TECHNOLOGY\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":10,\"siren\":\"351630371\",\"siret\":\"35163037100001\",\"label\":\"SECURITAS FRANCE\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":11,\"siren\":\"983923384\",\"siret\":\"98392338400001\",\"label\":\"ENTREPRISE TEST UES\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":12,\"siren\":\"442424560\",\"siret\":\"44242456000001\",\"label\":\"GROUPE BPCE\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":13,\"siren\":\"821832219\",\"siret\":\"82183221900001\",\"label\":\"BANQUE PALATINE\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":14,\"siren\":\"982446213\",\"siret\":\"98244621300001\",\"label\":\"UES MEMBRE 1\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":15,\"siren\":\"982446122\",\"siret\":\"98244612200001\",\"label\":\"UES MEMBRE 2\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":16,\"siren\":\"981216658\",\"siret\":\"98121665800001\",\"label\":\"UES MEMBRE 3\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false},{\"id\":17,\"siren\":\"980276067\",\"siret\":\"98027606700001\",\"label\":\"UES MEMBRE 4\",\"is_collectivite_territoriale\":false,\"is_external\":false,\"is_service_public\":false}]"]
280280
},
281281
"realmRoles": ["user"]
282282
},

‎packages/app/cypress.config.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ export default defineConfig({
1313
e2e: {
1414
baseUrl: process.env.TEST_BASEURL ?? "http://localhost:3000",
1515
env: {
16-
E2E_USERNAME: process.env.E2E_USERNAME,
17-
E2E_PASSWORD: process.env.E2E_PASSWORD,
16+
E2E_USERNAME: process.env.E2E_USERNAME || "test@fia1.fr",
17+
E2E_PASSWORD: process.env.E2E_PASSWORD || "test",
1818
},
1919
experimentalRunAllSpecs: true,
2020
experimentalWebKitSupport: true,

‎packages/app/cypress/support/commands.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Cypress.Commands.add("loginWithKeycloak", () => {
6262
cy.checkUrl("/login");
6363
cy.get(".fr-connect").click();
6464

65-
cy.location("origin").should("eq", "https://keycloak.undercloud.fabrique.social.gouv.fr");
65+
cy.location("origin").should("match", /keycloak/);
6666
const username = Cypress.env("E2E_USERNAME");
6767
const password = Cypress.env("E2E_PASSWORD");
6868

0 commit comments

Comments
 (0)