Add latest changes from gitlab-org/gitlab@master

1 files changed, 27 insertions, 1 deletions

diff --git a/spec/frontend/vue_shared/components/project_avatar_spec.js b/spec/frontend/vue_shared/components/project_avatar_spec.js
index 51750808bfd..af828fbca51 100644
--- a/spec/frontend/vue_shared/components/project_avatar_spec.js
+++ b/spec/frontend/vue_shared/components/project_avatar_spec.js
@@ -43,13 +43,39 @@ describe('ProjectAvatar', () => {
   });
 
   describe('with `projectId` prop', () => {
-    it('renders GlAvatar with specified `entityId` prop', () => {
+    const validatorFunc = ProjectAvatar.props.projectId.validator;
+
+    it('prop validators return true for valid types', () => {
+      expect(validatorFunc(1)).toBe(true);
+      expect(validatorFunc('gid://gitlab/Project/1')).toBe(true);
+    });
+
+    it('prop validators return false for invalid types', () => {
+      expect(validatorFunc('1')).toBe(false);
+    });
+
+    it('renders GlAvatar with `entityId` 0 when `projectId` is not informed', () => {
+      createComponent({ props: { projectId: undefined } });
+
+      const avatar = findGlAvatar();
+      expect(avatar.props('entityId')).toBe(0);
+    });
+
+    it('renders GlAvatar with specified `entityId` when `projectId` is a Number', () => {
       const mockProjectId = 1;
       createComponent({ props: { projectId: mockProjectId } });
 
       const avatar = findGlAvatar();
       expect(avatar.props('entityId')).toBe(mockProjectId);
     });
+
+    it('renders GlAvatar with specified `entityId` when `projectId` is a gid String', () => {
+      const mockProjectId = 'gid://gitlab/Project/1';
+      createComponent({ props: { projectId: mockProjectId } });
+
+      const avatar = findGlAvatar();
+      expect(avatar.props('entityId')).toBe(1);
+    });
   });
 
   describe('with `projectAvatarUrl` prop', () => {