Skip to content

Commit

Permalink
update to frodo-lib 2.0.1-1 and fix failing classic tests
Browse files Browse the repository at this point in the history
  • Loading branch information
vscheuber committed Jul 27, 2024
1 parent dca5ddf commit 4f9ac2f
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 15 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
]
},
"devDependencies": {
"@rockcarver/frodo-lib": "2.0.0",
"@rockcarver/frodo-lib": "2.0.1-1",
"@types/colors": "^1.2.1",
"@types/fs-extra": "^11.0.1",
"@types/jest": "^29.2.3",
Expand Down
2 changes: 0 additions & 2 deletions test/e2e/config-import.e2e.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ import { connection as c, classic_connection as cc } from './utils/TestConfig';
const exec = promisify(cp.exec);

process.env['FRODO_MOCK'] = '1';
process.env['FRODO_CONNECTION_PROFILES_PATH'] =
'./test/e2e/env/Connections.json';
const env = getEnv(c);
const classicEnv = getEnv(cc);

Expand Down
5 changes: 0 additions & 5 deletions test/e2e/env/Connections.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,5 @@
"svcacctId": "b672336b-41ef-428d-ae4a-e0c082875377",
"svcacctName": "Frodo-SA-1687293271764",
"username": "volker.scheuber@forgerock.com"
},
"http://openam-frodo-dev.classic.com:8080/am": {
"deploymentType": "classic",
"encodedPassword": "3FUzDQKhXKtKK76X4EKlfojXMq128gsLJhcS9Vuz8akl3GfKGDJEtdLIJoHX5fv2vh+58uS5YeWroIf/eeSrT2EGsJ+04j6mdXMR6PUx3j8bmhtggDp7Zkz8vqS+BM6dQhM4KuWFXqfjl/jY4s0=",
"username": "amAdmin"
}
}
9 changes: 6 additions & 3 deletions test/e2e/utils/TestUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,12 @@ export function getEnv(connection = undefined) {
return {
env: {
...process.env,
FRODO_HOST: connection?.host,
FRODO_SA_ID: connection?.saId,
FRODO_SA_JWK: connection?.saJwk,
// only add property if we have it
...(connection?.host && { FRODO_HOST: connection.host }),
...(connection?.saId && { FRODO_SA_ID: connection.saId }),
...(connection?.saJwk && { FRODO_SA_JWK: connection.saJwk }),
...(connection?.user && { FRODO_USERNAME: connection.user }),
...(connection?.pass && { FRODO_PASSWORD: connection.pass }),
},
};
}

0 comments on commit 4f9ac2f

Please sign in to comment.