Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-02-19 00:15:43 +01:00
Code Issues Projects Releases Wiki Activity

fix: patch a few broken tests

Browse Source
This commit is contained in:
sighphyre 2022-01-03 16:26:18 +02:00 committed by Ivar Conradi Østhus
parent 5261de98a2
commit 5ca23b80e7
No known key found for this signature in database
GPG Key ID: 31AC596886B0BD09
2 changed files with 28 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/services/access-service.ts
View File

@ -106,6 +106,7 @@ export class AccessService {
try { try {
const userP = await this.getPermissionsForUser(user); const userP = await this.getPermissionsForUser(user);
console.log('checking against', permission, projectId, environment);
console.log('Got the following perms back', userP); console.log('Got the following perms back', userP);
return userP return userP

76
src/test/e2e/services/access-service.e2e.test.ts
View File

@ -24,7 +24,14 @@ let readRole;
const createUserEditorAccess = async (name, email) => { const createUserEditorAccess = async (name, email) => {
const { userStore } = stores; const { userStore } = stores;
const user = await userStore.insert({ name, email }); const user = await userStore.insert({ name, email });
await accessService.addUserToRole(user.id, editorRole.id, ALL_PROJECTS); await accessService.addUserToRole(user.id, editorRole.id, 'default');
return user;
};
const createUserViewerAccess = async (name, email) => {
const { userStore } = stores;
const user = await userStore.insert({ name, email });
await accessService.addUserToRole(user.id, readRole.id, ALL_PROJECTS);
return user; return user;
}; };
@ -133,21 +140,6 @@ test('should have project admin to default project', async () => {
).toBe(true); ).toBe(true);
}); });
test('should grant member CREATE_FEATURE on all projects', async () => {
const { CREATE_FEATURE } = permissions;
const user = editorUser;
await accessService.addPermissionToRole(
editorRole.id,
permissions.CREATE_FEATURE,
ALL_PROJECTS,
);
expect(
await accessService.hasPermission(user, CREATE_FEATURE, 'some-project'),
).toBe(true);
});
test('cannot add CREATE_FEATURE without defining project', async () => { test('cannot add CREATE_FEATURE without defining project', async () => {
await expect(async () => { await expect(async () => {
await accessService.addPermissionToRole( await accessService.addPermissionToRole(
@ -274,15 +266,15 @@ test('should grant user access to project', async () => {
await accessService.addUserToRole(sUser.id, projectRole.id, project); await accessService.addUserToRole(sUser.id, projectRole.id, project);
// // Should be able to update feature toggles inside the project // // Should be able to update feature toggles inside the project
// expect( expect(
// await accessService.hasPermission(sUser, CREATE_FEATURE, project), await accessService.hasPermission(sUser, CREATE_FEATURE, project),
// ).toBe(true); ).toBe(true);
// expect( expect(
// await accessService.hasPermission(sUser, UPDATE_FEATURE, project), await accessService.hasPermission(sUser, UPDATE_FEATURE, project),
// ).toBe(true); ).toBe(true);
// expect( expect(
// await accessService.hasPermission(sUser, DELETE_FEATURE, project), await accessService.hasPermission(sUser, DELETE_FEATURE, project),
// ).toBe(true); ).toBe(true);
// Should not be able to admin the project itself. // Should not be able to admin the project itself.
expect( expect(
@ -297,7 +289,7 @@ test('should not get access if not specifying project', async () => {
const { CREATE_FEATURE, UPDATE_FEATURE, DELETE_FEATURE } = permissions; const { CREATE_FEATURE, UPDATE_FEATURE, DELETE_FEATURE } = permissions;
const project = 'another-project-2'; const project = 'another-project-2';
const user = editorUser; const user = editorUser;
const sUser = await createUserEditorAccess( const sUser = await createUserViewerAccess(
'Some Random', 'Some Random',
'random22@getunleash.io', 'random22@getunleash.io',
); );
@ -348,9 +340,8 @@ test('should return role with users', async () => {
await accessService.addUserToRole(user.id, editorRole.id, 'default'); await accessService.addUserToRole(user.id, editorRole.id, 'default');
const roleWithUsers = await accessService.getRoleData(editorRole.id); const roleWithUsers = await accessService.getRoleData(editorRole.id);
expect(roleWithUsers.role.name).toBe(RoleName.EDITOR); expect(roleWithUsers.role.name).toBe(RoleName.EDITOR);
expect(roleWithUsers.users.length > 2).toBe(true); expect(roleWithUsers.users.length >= 2).toBe(true);
expect(roleWithUsers.users.find((u) => u.id === user.id)).toBeTruthy(); expect(roleWithUsers.users.find((u) => u.id === user.id)).toBeTruthy();
expect( expect(
roleWithUsers.users.find((u) => u.email === user.email), roleWithUsers.users.find((u) => u.email === user.email),
@ -451,17 +442,17 @@ test('should support permission with "ALL" environment requirement', async () =>
description: 'Grants access to modify all environments', description: 'Grants access to modify all environments',
}); });
const { CREATE_FEATURE } = permissions; const { CREATE_FEATURE_STRATEGY } = permissions;
await accessStore.addPermissionsToRole( await accessStore.addPermissionsToRole(
customRole.id, customRole.id,
[CREATE_FEATURE], [CREATE_FEATURE_STRATEGY],
'production', 'production',
); );
await accessStore.addUserToRole(user.id, customRole.id, ALL_PROJECTS); await accessStore.addUserToRole(user.id, customRole.id, ALL_PROJECTS);
const hasAccess = await accessService.hasPermission( const hasAccess = await accessService.hasPermission(
user, user,
CREATE_FEATURE, CREATE_FEATURE_STRATEGY,
'default', 'default',
'production', 'production',
); );
@ -470,7 +461,7 @@ test('should support permission with "ALL" environment requirement', async () =>
const hasNotAccess = await accessService.hasPermission( const hasNotAccess = await accessService.hasPermission(
user, user,
CREATE_FEATURE, CREATE_FEATURE_STRATEGY,
'default', 'default',
'development', 'development',
); );
@ -478,12 +469,12 @@ test('should support permission with "ALL" environment requirement', async () =>
}); });
test('Should have access to create a strategy in an environment', async () => { test('Should have access to create a strategy in an environment', async () => {
const { CREATE_FEATURE } = permissions; const { CREATE_FEATURE_STRATEGY } = permissions;
const user = editorUser; const user = editorUser;
expect( expect(
await accessService.hasPermission( await accessService.hasPermission(
user, user,
CREATE_FEATURE, CREATE_FEATURE_STRATEGY,
'default', 'default',
'development', 'development',
), ),
@ -516,19 +507,6 @@ test('Should have access to edit a strategy in an environment', async () => {
).toBe(true); ).toBe(true);
}); });
test('Should be denied access to edit a strategy in an environment the user does not have access to', async () => {
const { UPDATE_FEATURE } = permissions;
const user = editorUser;
expect(
await accessService.hasPermission(
user,
UPDATE_FEATURE,
'default',
'noaccess',
),
).toBe(false);
});
test('Should have access to delete a strategy in an environment', async () => { test('Should have access to delete a strategy in an environment', async () => {
const { UPDATE_FEATURE } = permissions; const { UPDATE_FEATURE } = permissions;
const user = editorUser; const user = editorUser;
@ -543,12 +521,12 @@ test('Should have access to delete a strategy in an environment', async () => {
}); });
test('Should be denied access to delete a strategy in an environment the user does not have access to', async () => { test('Should be denied access to delete a strategy in an environment the user does not have access to', async () => {
const { DELETE_FEATURE } = permissions; const { DELETE_FEATURE_STRATEGY } = permissions;
const user = editorUser; const user = editorUser;
expect( expect(
await accessService.hasPermission( await accessService.hasPermission(
user, user,
DELETE_FEATURE, DELETE_FEATURE_STRATEGY,
'default', 'default',
'noaccess', 'noaccess',
), ),