Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2024-12-22 19:07:54 +01:00
Code Issues Projects Releases Wiki Activity

fix: playground parent deps check (#7384)

Browse Source
This commit is contained in:
Mateusz Kwasniewski 2024-06-13 10:36:44 +02:00 committed by GitHub
parent 50316a2f23
commit 3cc0dfe35a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/lib/features/playground/advanced-playground.test.ts
View File

@ -95,7 +95,7 @@ test('advanced playground evaluation with no toggles', async () => {
});
});
test('advanced playground evaluation with parent dependency', async () => {
test('advanced playground evaluation with unsatisfied parent dependency', async () => {
await createFeatureToggle('test-parent');
await createFeatureToggle('test-child');
await enableToggle('test-child');
@ -126,6 +126,35 @@ test('advanced playground evaluation with parent dependency', async () => {
expect(parent.isEnabled).toBe(false);
});
test('advanced playground evaluation with satisfied disabled parent dependency', async () => {
await createFeatureToggle('test-parent');
await createFeatureToggle('test-child');
await enableToggle('test-child');
await app.addDependency('test-child', {
feature: 'test-parent',
enabled: false,
variants: [],
});
const { body: result } = await app.request
.post('/api/admin/playground/advanced')
.send({
environments: ['default'],
projects: ['default'],
context: { appName: 'test' },
})
.set('Content-Type', 'application/json')
.expect(200);
const child = result.features[0].environments.default[0];
const parent = result.features[1].environments.default[0];
expect(child.hasUnsatisfiedDependency).toBe(false);
expect(child.isEnabled).toBe(true);
expect(parent.hasUnsatisfiedDependency).toBe(false);
expect(parent.isEnabled).toBe(false);
});
test('advanced playground evaluation happy path', async () => {
await createFeatureToggleWithStrategy('test-playground-feature');
await enableToggle('test-playground-feature');

12
src/lib/features/playground/feature-evaluator/client.ts
View File

@ -77,9 +77,6 @@ export default class UnleashClient {
}
if (parent.enabled !== false) {
if (!parentToggle.enabled) {
return false;
}
if (parent.variants?.length) {
return parent.variants.includes(
this.getVariant(parent.feature, context).name,
@ -91,12 +88,9 @@ export default class UnleashClient {
);
}
return (
!parentToggle.enabled &&
!(
this.isEnabled(parent.feature, context, () => false)
.result === true
)
return !(
this.isEnabled(parent.feature, context, () => false).result ===
true
);
});
}

10
src/test/e2e/helpers/test-helper.ts
View File

@ -15,6 +15,7 @@ import type { Db } from '../../../lib/db/db';
import type { IContextFieldDto } from '../../../lib/types/stores/context-field-store';
import { DEFAULT_ENV } from '../../../lib/util';
import type {
CreateDependentFeatureSchema,
CreateFeatureSchema,
CreateFeatureStrategySchema,
ImportTogglesSchema,
@ -102,7 +103,10 @@ export interface IUnleashHttpAPI {
expectedResponseCode?: number,
): supertest.Test;
addDependency(child: string, parent: string): supertest.Test;
addDependency(
child: string,
parent: string | CreateDependentFeatureSchema,
): supertest.Test;
addTag(
feature: string,
@ -224,7 +228,7 @@ function httpApis(
addDependency(
child: string,
parent: string,
parent: string | CreateDependentFeatureSchema,
project = DEFAULT_PROJECT,
expectedResponseCode: number = 200,
): supertest.Test {
@ -232,7 +236,7 @@ function httpApis(
.post(
`/api/admin/projects/${project}/features/${child}/dependencies`,
)
.send({ feature: parent })
.send(typeof parent === 'string' ? { feature: parent } : parent)
.set('Content-Type', 'application/json')
.expect(expectedResponseCode);
},