diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile index 3e2c42250d1972c8da035506c48b64a13adf0776..28d6da6d162e84a43c15cce18e269ce897981a02 100644 --- a/alfa-client/apps/alfa-e2e/Jenkinsfile +++ b/alfa-client/apps/alfa-e2e/Jenkinsfile @@ -740,14 +740,18 @@ Map readUsersFixtures(String fixturesPath, String userFolder) { return usersFixturesFiles.split("\\n") .collect { userFixtureFile -> def userFixture = readJSON file: "${fixturesPath}/${userFolder}/${userFixtureFile}" - return ["name" : userFixture.name, - "password" : userFixture.password, - "first_name": userFixture.get("firstName", ""), - "last_name" : userFixture.get("lastName", ""), - "email" : userFixture.get("email", "")] + return createUserFromFixture(userFixture) }.collectEntries { [it.name, it] } } +Map createUserFromFixture(Map userFixture) { + return ["name" : userFixture.name, + "password" : userFixture.password, + "first_name": userFixture.get("firstName", ""), + "last_name" : userFixture.get("lastName", ""), + "email" : userFixture.get("email", "")] +} + String getKeycloakAccessToken(String realm) { def userManagerApiUserCredentials = getUserManagerApiUserCredentials(realm) diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile-static b/alfa-client/apps/alfa-e2e/Jenkinsfile-static index 3182e1110f15268a1f66b8ae91ed1117d3c64558..cc5617a58014519a33ac763fcc75fa56ea622260 100644 --- a/alfa-client/apps/alfa-e2e/Jenkinsfile-static +++ b/alfa-client/apps/alfa-e2e/Jenkinsfile-static @@ -452,14 +452,18 @@ Map readUsersFixtures(String fixturesPath, String userFolder) { return usersFixturesFiles.split("\\n") .collect { userFixtureFile -> def userFixture = readJSON file: "${fixturesPath}/${userFolder}/${userFixtureFile}" - return ["name" : userFixture.name, - "password" : userFixture.password, - "first_name": userFixture.get("firstName", ""), - "last_name" : userFixture.get("lastName", ""), - "email" : userFixture.get("email", "")] + return createUserFromFixture(userFixture) }.collectEntries { [it.name, it] } } +Map createUserFromFixture(Map userFixture) { + return ["name" : userFixture.name, + "password" : userFixture.password, + "first_name": userFixture.get("firstName", ""), + "last_name" : userFixture.get("lastName", ""), + "email" : userFixture.get("email", "")] +} + String getKeycloakAccessToken(String realm) { def userManagerApiUserCredentials = getUserManagerApiUserCredentials(realm)