From 74f7fa6dce4a6d3378df9a7ba900de16f79fe61b Mon Sep 17 00:00:00 2001 From: Stephen Barry Date: Tue, 1 Aug 2023 10:38:59 +0100 Subject: [PATCH] Update tests after switch to publicEmail and add additional test data to SaaS full mutation test Signed-off-by: Stephen Barry --- .../src/lib/client.test.ts | 6 +- .../GitlabOrgDiscoveryEntityProvider.test.ts | 87 ++++++++++++++++--- 2 files changed, 77 insertions(+), 16 deletions(-) diff --git a/plugins/catalog-backend-module-gitlab/src/lib/client.test.ts b/plugins/catalog-backend-module-gitlab/src/lib/client.test.ts index b9fdf905ee..a62a3874d5 100644 --- a/plugins/catalog-backend-module-gitlab/src/lib/client.test.ts +++ b/plugins/catalog-backend-module-gitlab/src/lib/client.test.ts @@ -413,7 +413,7 @@ describe('GitLabClient', () => { user: { id: 'gid://gitlab/User/1', username: 'user1', - commitEmail: 'user1@example.com', + publicEmail: 'user1@example.com', name: 'user1', state: 'active', webUrl: 'user1.com', @@ -511,7 +511,7 @@ describe('GitLabClient', () => { user: { id: 'gid://gitlab/User/1', username: 'user1', - commitEmail: 'user1@example.com', + publicEmail: 'user1@example.com', name: 'user1', state: 'active', webUrl: 'user1.com', @@ -524,7 +524,7 @@ describe('GitLabClient', () => { user: { id: 'gid://gitlab/User/2', username: 'user2', - commitEmail: 'user2@example.com', + publicEmail: 'user2@example.com', name: 'user2', state: 'active', webUrl: 'user2.com', diff --git a/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.test.ts b/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.test.ts index b6c62be5a2..7339dd4a29 100644 --- a/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.test.ts +++ b/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.test.ts @@ -558,12 +558,23 @@ describe('GitlabOrgDiscoveryEntityProvider', () => { nodes: [ { user: { - id: 'gid://gitlab/User/1234', - username: 'testuser', - commitEmail: 'testuser@example.com', + id: 'gid://gitlab/User/12', + username: 'testuser1', + publicEmail: 'testuser1@example.com', state: 'active', - name: 'Test User', - webUrl: 'https://gitlab.com/testuser', + name: 'Test User 1', + webUrl: 'https://gitlab.com/testuser1', + avatarUrl: 'https://secure.gravatar.com/', + }, + }, + { + user: { + id: 'gid://gitlab/User/34', + username: 'testuser2', + publicEmail: 'testuser2@example.com', + state: 'active', + name: 'Test User 2', + webUrl: 'https://gitlab.com/testuser2', avatarUrl: 'https://secure.gravatar.com/', }, }, @@ -586,8 +597,8 @@ describe('GitlabOrgDiscoveryEntityProvider', () => { groupMembers: { nodes: req.variables.group === 'group1/group2' - ? [{ user: { id: 'gid://gitlab/User/1234' } }] - : [], + ? [{ user: { id: 'gid://gitlab/User/12' } }] + : [{ user: { id: 'gid://gitlab/User/34' } }], pageInfo: { endCursor: 'end', hasNextPage: false, @@ -615,18 +626,43 @@ describe('GitlabOrgDiscoveryEntityProvider', () => { metadata: { annotations: { 'backstage.io/managed-by-location': - 'url:https://gitlab.com/testuser', + 'url:https://gitlab.com/testuser1', 'backstage.io/managed-by-origin-location': - 'url:https://gitlab.com/testuser', - 'gitlab.com/user-login': 'https://gitlab.com/testuser', + 'url:https://gitlab.com/testuser1', + 'gitlab.com/user-login': 'https://gitlab.com/testuser1', }, - name: 'testuser', + name: 'testuser1', }, spec: { memberOf: ['group2'], profile: { - displayName: 'Test User', - email: 'testuser@example.com', + displayName: 'Test User 1', + email: 'testuser1@example.com', + picture: 'https://secure.gravatar.com/', + }, + }, + }, + locationKey: 'GitlabOrgDiscoveryEntityProvider:test-id', + }, + { + entity: { + apiVersion: 'backstage.io/v1alpha1', + kind: 'User', + metadata: { + annotations: { + 'backstage.io/managed-by-location': + 'url:https://gitlab.com/testuser2', + 'backstage.io/managed-by-origin-location': + 'url:https://gitlab.com/testuser2', + 'gitlab.com/user-login': 'https://gitlab.com/testuser2', + }, + name: 'testuser2', + }, + spec: { + memberOf: ['group3'], + profile: { + displayName: 'Test User 2', + email: 'testuser2@example.com', picture: 'https://secure.gravatar.com/', }, }, @@ -658,6 +694,31 @@ describe('GitlabOrgDiscoveryEntityProvider', () => { }, locationKey: 'GitlabOrgDiscoveryEntityProvider:test-id', }, + { + entity: { + apiVersion: 'backstage.io/v1alpha1', + kind: 'Group', + metadata: { + annotations: { + 'backstage.io/managed-by-location': + 'url:https://gitlab.com/group1/group3', + 'backstage.io/managed-by-origin-location': + 'url:https://gitlab.com/group1/group3', + 'gitlab.com/team-path': 'group1/group3', + }, + description: 'Group3', + name: 'group3', + }, + spec: { + children: [], + profile: { + displayName: 'group3', + }, + type: 'team', + }, + }, + locationKey: 'GitlabOrgDiscoveryEntityProvider:test-id', + }, ]; expect(entityProviderConnection.applyMutation).toHaveBeenCalledTimes(1);