paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 33 Packages Projects Releases Wiki Activity

fix gitlab client tests and add changeset

Browse Source 
Signed-off-by: Matteo Silvestri <matteosilv@gmail.com>
This commit is contained in:
Matteo Silvestri
2023-09-25 16:17:19 +02:00
parent fae0735ee0
commit 4f70fdfc93
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changeset/flat-rules-rush.md
+7
View File
@@ -0,0 +1,7 @@
---
'@backstage/plugin-catalog-backend-module-gitlab': patch
---
fix: use publicEmail in GitLab client
client was using commitEmail that is visible only for self-managed GitLab admins. publicEmail is visible, but only if the user explicitly enable the corresponding setting on GitLab.
plugins/catalog-backend-module-gitlab/src/lib/client.test.ts
+4 -4
View File
@@ -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',
@@ -517,7 +517,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',
@@ -530,7 +530,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',
@@ -764,7 +764,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',
plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.test.ts
+2 -2
View File
@@ -560,7 +560,7 @@ describe('GitlabOrgDiscoveryEntityProvider', () => {
user: {
id: 'gid://gitlab/User/12',
username: 'testuser1',
commitEmail: 'testuser1@example.com',
publicEmail: 'testuser1@example.com',
state: 'active',
name: 'Test User 1',
webUrl: 'https://gitlab.com/testuser1',
@@ -571,7 +571,7 @@ describe('GitlabOrgDiscoveryEntityProvider', () => {
user: {
id: 'gid://gitlab/User/34',
username: 'testuser2',
commitEmail: 'testuser2@example.com',
publicEmail: 'testuser2@example.com',
state: 'active',
name: 'Test User 2',
webUrl: 'https://gitlab.com/testuser2',