Skip to content

Commit

Permalink
Fixes unit tests for check auth expected actions.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeramysoucy
jeramysoucy committed Nov 17, 2022
1 parent 7678f71 commit c9b25b0
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 38 deletions.
4 changes: 2 additions & 2 deletions ...aved-objects/core-saved-objects-api-server-internal/src/lib/internal_bulk_resolve.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ describe('internalBulkResolve', () => {

await internalBulkResolve(params);
expect(mockSecurityExt.checkAuthorization).toHaveBeenCalledTimes(1);
const expectedActions = ['bulk_get'];
const expectedActions = new Set(['bulk_get']);
const expectedSpaces = new Set([namespace]);
const expectedTypes = new Set([objects[0].type]);

Expand All @@ -514,7 +514,7 @@ describe('internalBulkResolve', () => {
types: actualTypes,
} = mockSecurityExt.checkAuthorization.mock.calls[0][0];

expect(actualActions).toEqual(expectedActions);
expect(setsAreEqual(actualActions, expectedActions)).toBeTruthy();
expect(setsAreEqual(actualSpaces, expectedSpaces)).toBeTruthy();
expect(setsAreEqual(actualTypes, expectedTypes)).toBeTruthy();
});
Expand Down
60 changes: 30 additions & 30 deletions ...ects/core-saved-objects-api-server-internal/src/lib/repository.security_extension.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ describe('SavedObjectsRepository Security Extension', () => {
);

expect(mockSecurityExt.checkAuthorization).toHaveBeenCalledTimes(1);
const expectedActions = ['get'];
const expectedActions = new Set(['get']);
const expectedSpaces = new Set(multiNamespaceObjNamespaces);
const expectedTypes = new Set([MULTI_NAMESPACE_CUSTOM_INDEX_TYPE]);

Expand All @@ -192,7 +192,7 @@ describe('SavedObjectsRepository Security Extension', () => {
types: actualTypes,
} = mockSecurityExt.checkAuthorization.mock.calls[0][0];

expect(actualActions).toEqual(expectedActions);
expect(setsAreEqual(actualActions, expectedActions)).toBeTruthy();
expect(setsAreEqual(actualSpaces, expectedSpaces)).toBeTruthy();
expect(setsAreEqual(actualTypes, expectedTypes)).toBeTruthy();
});
Expand Down Expand Up @@ -323,7 +323,7 @@ describe('SavedObjectsRepository Security Extension', () => {

expect(mockSecurityExt.checkAuthorization).toHaveBeenCalledTimes(1);

const expectedActions = ['update'];
const expectedActions = new Set(['update']);
const expectedSpaces = new Set(multiNamespaceObjNamespaces);
const expectedTypes = new Set([MULTI_NAMESPACE_CUSTOM_INDEX_TYPE]);

Expand All @@ -333,7 +333,7 @@ describe('SavedObjectsRepository Security Extension', () => {
types: actualTypes,
} = mockSecurityExt.checkAuthorization.mock.calls[0][0];

expect(actualActions).toEqual(expectedActions);
expect(setsAreEqual(actualActions, expectedActions)).toBeTruthy();
expect(setsAreEqual(actualSpaces, expectedSpaces)).toBeTruthy();
expect(setsAreEqual(actualTypes, expectedTypes)).toBeTruthy();
});
Expand Down Expand Up @@ -472,7 +472,7 @@ describe('SavedObjectsRepository Security Extension', () => {
});

expect(mockSecurityExt.checkAuthorization).toHaveBeenCalledTimes(1);
const expectedActions = ['create'];
const expectedActions = new Set(['create']);
const expectedSpaces = new Set([namespace]);
const expectedTypes = new Set([MULTI_NAMESPACE_CUSTOM_INDEX_TYPE]);

Expand All @@ -482,7 +482,7 @@ describe('SavedObjectsRepository Security Extension', () => {
types: actualTypes,
} = mockSecurityExt.checkAuthorization.mock.calls[0][0];

expect(actualActions).toEqual(expectedActions);
expect(setsAreEqual(actualActions, expectedActions)).toBeTruthy();
expect(setsAreEqual(actualSpaces, expectedSpaces)).toBeTruthy();
expect(setsAreEqual(actualTypes, expectedTypes)).toBeTruthy();
});
Expand All @@ -494,7 +494,7 @@ describe('SavedObjectsRepository Security Extension', () => {
});

expect(mockSecurityExt.checkAuthorization).toHaveBeenCalledTimes(1);
const expectedActions = ['create'];
const expectedActions = new Set(['create']);
const expectedSpaces = new Set(multiNamespaceObjNamespaces);
const expectedTypes = new Set([MULTI_NAMESPACE_CUSTOM_INDEX_TYPE]);

Expand All @@ -504,7 +504,7 @@ describe('SavedObjectsRepository Security Extension', () => {
types: actualTypes,
} = mockSecurityExt.checkAuthorization.mock.calls[0][0];

expect(actualActions).toEqual(expectedActions);
expect(setsAreEqual(actualActions, expectedActions)).toBeTruthy();
expect(setsAreEqual(actualSpaces, expectedSpaces)).toBeTruthy();
expect(setsAreEqual(actualTypes, expectedTypes)).toBeTruthy();
});
Expand Down Expand Up @@ -648,7 +648,7 @@ describe('SavedObjectsRepository Security Extension', () => {
});

expect(mockSecurityExt.checkAuthorization).toHaveBeenCalledTimes(1);
const expectedActions = ['delete'];
const expectedActions = new Set(['delete']);
const expectedSpaces = new Set([namespace]);
const expectedTypes = new Set([MULTI_NAMESPACE_CUSTOM_INDEX_TYPE]);

Expand All @@ -658,7 +658,7 @@ describe('SavedObjectsRepository Security Extension', () => {
types: actualTypes,
} = mockSecurityExt.checkAuthorization.mock.calls[0][0];

expect(actualActions).toEqual(expectedActions);
expect(setsAreEqual(actualActions, expectedActions)).toBeTruthy();
expect(setsAreEqual(actualSpaces, expectedSpaces)).toBeTruthy();
expect(setsAreEqual(actualTypes, expectedTypes)).toBeTruthy();
});
Expand Down Expand Up @@ -759,7 +759,7 @@ describe('SavedObjectsRepository Security Extension', () => {
await removeReferencesToSuccess(client, repository, type, id, { namespace });

expect(mockSecurityExt.checkAuthorization).toHaveBeenCalledTimes(1);
const expectedActions = ['delete'];
const expectedActions = new Set(['delete']);
const expectedSpaces = new Set([namespace]);
const expectedTypes = new Set([type]);

Expand All @@ -769,7 +769,7 @@ describe('SavedObjectsRepository Security Extension', () => {
types: actualTypes,
} = mockSecurityExt.checkAuthorization.mock.calls[0][0];

expect(actualActions).toEqual(expectedActions);
expect(setsAreEqual(actualActions, expectedActions)).toBeTruthy();
expect(setsAreEqual(actualSpaces, expectedSpaces)).toBeTruthy();
expect(setsAreEqual(actualTypes, expectedTypes)).toBeTruthy();
});
Expand Down Expand Up @@ -896,7 +896,7 @@ describe('SavedObjectsRepository Security Extension', () => {
await checkConflictsSuccess(client, repository, registry, [obj1, obj2], { namespace });

expect(mockSecurityExt.checkAuthorization).toHaveBeenCalledTimes(1);
const expectedActions = ['bulk_create'];
const expectedActions = new Set(['bulk_create']);
const expectedSpaces = new Set([namespace]);
const expectedTypes = new Set([type]);

Expand All @@ -906,7 +906,7 @@ describe('SavedObjectsRepository Security Extension', () => {
types: actualTypes,
} = mockSecurityExt.checkAuthorization.mock.calls[0][0];

expect(actualActions).toEqual(expectedActions);
expect(setsAreEqual(actualActions, expectedActions)).toBeTruthy();
expect(setsAreEqual(actualSpaces, expectedSpaces)).toBeTruthy();
expect(setsAreEqual(actualTypes, expectedTypes)).toBeTruthy();
});
Expand Down Expand Up @@ -989,7 +989,7 @@ describe('SavedObjectsRepository Security Extension', () => {
await repository.openPointInTimeForType(type, { namespaces: [namespace] });

expect(mockSecurityExt.checkAuthorization).toHaveBeenCalledTimes(1);
const expectedActions = ['open_point_in_time'];
const expectedActions = new Set(['open_point_in_time']);
const expectedSpaces = new Set([namespace]);
const expectedTypes = new Set([type]);

Expand All @@ -999,7 +999,7 @@ describe('SavedObjectsRepository Security Extension', () => {
types: actualTypes,
} = mockSecurityExt.checkAuthorization.mock.calls[0][0];

expect(actualActions).toEqual(expectedActions);
expect(setsAreEqual(actualActions, expectedActions)).toBeTruthy();
expect(setsAreEqual(actualSpaces, expectedSpaces)).toBeTruthy();
expect(setsAreEqual(actualTypes, expectedTypes)).toBeTruthy();
});
Expand Down Expand Up @@ -1157,7 +1157,7 @@ describe('SavedObjectsRepository Security Extension', () => {
await findSuccess(client, repository, { type, namespaces: [namespace] });

expect(mockSecurityExt.checkAuthorization).toHaveBeenCalledTimes(2);
const expectedActions = ['find'];
const expectedActions = new Set(['find']);
const expectedSpaces = new Set([namespace]);
const expectedTypes = new Set([type]);

Expand All @@ -1167,7 +1167,7 @@ describe('SavedObjectsRepository Security Extension', () => {
types: actualTypes,
} = mockSecurityExt.checkAuthorization.mock.calls[0][0];

expect(actualActions).toEqual(expectedActions);
expect(setsAreEqual(actualActions, expectedActions)).toBeTruthy();
expect(setsAreEqual(actualSpaces, expectedSpaces)).toBeTruthy();
expect(setsAreEqual(actualTypes, expectedTypes)).toBeTruthy();
});
Expand Down Expand Up @@ -1338,7 +1338,7 @@ describe('SavedObjectsRepository Security Extension', () => {
});

expect(mockSecurityExt.checkAuthorization).toHaveBeenCalledTimes(1);
const expectedActions = ['bulk_get'];
const expectedActions = new Set(['bulk_get']);
const expectedSpaces = new Set([optionsNamespace, ...objA.namespaces, ...objB.namespaces]);
const expectedTypes = new Set([objA.type, objB.type]);

Expand All @@ -1348,7 +1348,7 @@ describe('SavedObjectsRepository Security Extension', () => {
types: actualTypes,
} = mockSecurityExt.checkAuthorization.mock.calls[0][0];

expect(actualActions).toEqual(expectedActions);
expect(setsAreEqual(actualActions, expectedActions)).toBeTruthy();
expect(setsAreEqual(actualSpaces, expectedSpaces)).toBeTruthy();
expect(setsAreEqual(actualTypes, expectedTypes)).toBeTruthy();
});
Expand Down Expand Up @@ -1517,7 +1517,7 @@ describe('SavedObjectsRepository Security Extension', () => {
});

expect(mockSecurityExt.checkAuthorization).toHaveBeenCalledTimes(1);
const expectedActions = ['bulk_create'];
const expectedActions = new Set(['bulk_create']);
const expectedSpaces = new Set([namespace]);
const expectedTypes = new Set([obj1.type, obj2.type]);

Expand All @@ -1527,7 +1527,7 @@ describe('SavedObjectsRepository Security Extension', () => {
types: actualTypes,
} = mockSecurityExt.checkAuthorization.mock.calls[0][0];

expect(actualActions).toEqual(expectedActions);
expect(setsAreEqual(actualActions, expectedActions)).toBeTruthy();
expect(setsAreEqual(actualSpaces, expectedSpaces)).toBeTruthy();
expect(setsAreEqual(actualTypes, expectedTypes)).toBeTruthy();
});
Expand All @@ -1553,7 +1553,7 @@ describe('SavedObjectsRepository Security Extension', () => {

expect(mockSecurityExt.checkAuthorization).toHaveBeenCalledTimes(1);

const expectedActions = ['bulk_create'];
const expectedActions = new Set(['bulk_create']);
const expectedSpaces = new Set([
optionsNamespace,
...objA.initialNamespaces,
Expand All @@ -1567,7 +1567,7 @@ describe('SavedObjectsRepository Security Extension', () => {
types: actualTypes,
} = mockSecurityExt.checkAuthorization.mock.calls[0][0];

expect(actualActions).toEqual(expectedActions);
expect(setsAreEqual(actualActions, expectedActions)).toBeTruthy();
expect(setsAreEqual(actualSpaces, expectedSpaces)).toBeTruthy();
expect(setsAreEqual(actualTypes, expectedTypes)).toBeTruthy();
});
Expand Down Expand Up @@ -1728,7 +1728,7 @@ describe('SavedObjectsRepository Security Extension', () => {
});

expect(mockSecurityExt.checkAuthorization).toHaveBeenCalledTimes(1);
const expectedActions = ['bulk_update'];
const expectedActions = new Set(['bulk_update']);
const expectedSpaces = new Set([namespace]);
const expectedTypes = new Set([obj1.type, obj2.type]);

Expand All @@ -1738,7 +1738,7 @@ describe('SavedObjectsRepository Security Extension', () => {
types: actualTypes,
} = mockSecurityExt.checkAuthorization.mock.calls[0][0];

expect(actualActions).toEqual(expectedActions);
expect(setsAreEqual(actualActions, expectedActions)).toBeTruthy();
expect(setsAreEqual(actualSpaces, expectedSpaces)).toBeTruthy();
expect(setsAreEqual(actualTypes, expectedTypes)).toBeTruthy();
});
Expand All @@ -1760,7 +1760,7 @@ describe('SavedObjectsRepository Security Extension', () => {
});

expect(mockSecurityExt.checkAuthorization).toHaveBeenCalledTimes(1);
const expectedActions = ['bulk_update'];
const expectedActions = new Set(['bulk_update']);
const expectedSpaces = new Set([namespace, objA.namespace, objB.namespace]);
const expectedTypes = new Set([objA.type, objB.type]);

Expand All @@ -1770,7 +1770,7 @@ describe('SavedObjectsRepository Security Extension', () => {
types: actualTypes,
} = mockSecurityExt.checkAuthorization.mock.calls[0][0];

expect(actualActions).toEqual(expectedActions);
expect(setsAreEqual(actualActions, expectedActions)).toBeTruthy();
expect(setsAreEqual(actualSpaces, expectedSpaces)).toBeTruthy();
expect(setsAreEqual(actualTypes, expectedTypes)).toBeTruthy();
});
Expand Down Expand Up @@ -1955,7 +1955,7 @@ describe('SavedObjectsRepository Security Extension', () => {
await bulkDeleteSuccess(client, repository, registry, testObjs, options, internalOptions);

expect(mockSecurityExt.checkAuthorization).toHaveBeenCalledTimes(1);
const expectedActions = ['bulk_delete'];
const expectedActions = new Set(['bulk_delete']);
const expectedSpaces = new Set(internalOptions.mockMGetResponseObjects[1].initialNamespaces);
const expectedTypes = new Set([obj1.type, obj2.type]);

Expand All @@ -1965,7 +1965,7 @@ describe('SavedObjectsRepository Security Extension', () => {
types: actualTypes,
} = mockSecurityExt.checkAuthorization.mock.calls[0][0];

expect(actualActions).toEqual(expectedActions);
expect(setsAreEqual(actualActions, expectedActions)).toBeTruthy();
expect(setsAreEqual(actualSpaces, expectedSpaces)).toBeTruthy();
expect(setsAreEqual(actualTypes, expectedTypes)).toBeTruthy();
});
Expand Down
12 changes: 6 additions & 6 deletions ...aved-objects/core-saved-objects-api-server-internal/src/lib/update_objects_spaces.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@ describe('#updateObjectsSpaces', () => {

expect(client.bulk).toHaveBeenCalledTimes(1);
expect(mockSecurityExt.checkAuthorization).toHaveBeenCalledTimes(1);
const expectedActions = ['share_to_space'];
const expectedActions = new Set(['share_to_space']);
const expectedSpaces = new Set([defaultSpace, otherSpace, EXISTING_SPACE]);
const expectedTypes = new Set([SHAREABLE_OBJ_TYPE]);

Expand All @@ -781,7 +781,7 @@ describe('#updateObjectsSpaces', () => {
types: actualTypes,
} = mockSecurityExt.checkAuthorization.mock.calls[0][0];

expect(actualActions).toEqual(expectedActions);
expect(setsAreEqual(actualActions, expectedActions)).toBeTruthy();
expect(setsAreEqual(actualSpaces, expectedSpaces)).toBeTruthy();
expect(setsAreEqual(actualTypes, expectedTypes)).toBeTruthy();
});
Expand Down Expand Up @@ -857,7 +857,7 @@ describe('#updateObjectsSpaces', () => {

expect(client.bulk).toHaveBeenCalledTimes(1);
expect(mockSecurityExt.checkAuthorization).toHaveBeenCalledTimes(1);
const expectedActions = ['share_to_space'];
const expectedActions = new Set(['share_to_space']);
const expectedSpaces = new Set(['*', defaultSpace, otherSpace, EXISTING_SPACE]);
const expectedTypes = new Set([SHAREABLE_OBJ_TYPE]);

Expand All @@ -867,7 +867,7 @@ describe('#updateObjectsSpaces', () => {
types: actualTypes,
} = mockSecurityExt.checkAuthorization.mock.calls[0][0];

expect(actualActions).toEqual(expectedActions);
expect(setsAreEqual(actualActions, expectedActions)).toBeTruthy();
expect(setsAreEqual(actualSpaces, expectedSpaces)).toBeTruthy();
expect(setsAreEqual(actualTypes, expectedTypes)).toBeTruthy();
});
Expand All @@ -880,7 +880,7 @@ describe('#updateObjectsSpaces', () => {

expect(client.bulk).toHaveBeenCalledTimes(1);
expect(mockSecurityExt.checkAuthorization).toHaveBeenCalledTimes(1);
const expectedActions = ['share_to_space'];
const expectedActions = new Set(['share_to_space']);
const expectedSpaces = new Set(['*', defaultSpace, otherSpace, EXISTING_SPACE]);
const expectedTypes = new Set([SHAREABLE_OBJ_TYPE]);

Expand All @@ -890,7 +890,7 @@ describe('#updateObjectsSpaces', () => {
types: actualTypes,
} = mockSecurityExt.checkAuthorization.mock.calls[0][0];

expect(actualActions).toEqual(expectedActions);
expect(setsAreEqual(actualActions, expectedActions)).toBeTruthy();
expect(setsAreEqual(actualSpaces, expectedSpaces)).toBeTruthy();
expect(setsAreEqual(actualTypes, expectedTypes)).toBeTruthy();
});
Expand Down

0 comments on commit c9b25b0

Please sign in to comment.