Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-01-25 00:07:47 +01:00
Code Issues Projects Releases Wiki Activity

test: specify custom config in dbm (#5550)

Browse Source 
Was having some trouble running these migration tests locally due to
`dbm` not correctly picking up the passed in config. This fixes it by
setting the custom config property after it has been initialized, always
overriding any wrong values.

PS: I think I found the issue. `dbm` was prioritizing my `DATABASE_URL`
for some reason, as I started having issues when it was set, and stopped
having issues when I unset it.

I still think this is a good change, as it prevents similar
hard-to-debug issues in the future.

To help clarify this, running this locally:
- `export
DATABASE_URL=postgres://unleash_user:passord@localhost:5432/unleash`
 - `yarn test dedupe-permissions`

Fails on `main`, but passes on this branch. For some reason the `dbm`
instance prioritizes whatever is set in `DATABASE_URL` instead of the
options that are passed in `getInstance`.
This commit is contained in:
Nuno Góis 2024-01-02 10:47:59 +00:00 committed by GitHub
parent 1fd233abc2
commit cda7d2070c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/e2e/dedupe-permissions.e2e.test.ts
View File

@ -28,7 +28,7 @@ test('Dedupe permissions migration correctly dedupes permissions', async () => {
await initSchema(config.db); await initSchema(config.db);
const e2e = { const custom = {
...config.db, ...config.db,
connectionTimeoutMillis: 2000, connectionTimeoutMillis: 2000,
}; };
@ -37,10 +37,12 @@ test('Dedupe permissions migration correctly dedupes permissions', async () => {
process.argv = process.argv.filter((it) => !it.includes('--verbose')); process.argv = process.argv.filter((it) => !it.includes('--verbose'));
const dbm = getInstance(true, { const dbm = getInstance(true, {
cwd: `${__dirname}/../../`, // relative to src/test/e2e cwd: `${__dirname}/../../`, // relative to src/test/e2e
config: { e2e }, config: { custom },
env: 'e2e', env: 'custom',
}); });
dbm.config.custom = custom;
// Run all migrations up to, and including, this one, the last one before the dedupe migration // Run all migrations up to, and including, this one, the last one before the dedupe migration
await dbm.up('20231121153304-add-permission-create-tag-type.js'); await dbm.up('20231121153304-add-permission-create-tag-type.js');

8
src/test/e2e/favor-permission-name-over-id.e2e.test.ts
View File

@ -28,7 +28,7 @@ test('Favor permission name over id migration correctly assigns permissions by n
await initSchema(config.db); await initSchema(config.db);
const e2e = { const custom = {
...config.db, ...config.db,
connectionTimeoutMillis: 2000, connectionTimeoutMillis: 2000,
}; };
@ -37,10 +37,12 @@ test('Favor permission name over id migration correctly assigns permissions by n
process.argv = process.argv.filter((it) => !it.includes('--verbose')); process.argv = process.argv.filter((it) => !it.includes('--verbose'));
const dbm = getInstance(true, { const dbm = getInstance(true, {
cwd: `${__dirname}/../../`, // relative to src/test/e2e cwd: `${__dirname}/../../`, // relative to src/test/e2e
config: { e2e }, config: { custom },
env: 'e2e', env: 'custom',
}); });
dbm.config.custom = custom;
// Run all migrations up to, and including, this one, the last one before the favor permission name over id migration // Run all migrations up to, and including, this one, the last one before the favor permission name over id migration
await dbm.up('20231123100052-drop-last-seen-foreign-key.js'); await dbm.up('20231123100052-drop-last-seen-foreign-key.js');