Merge branch '433518-Remove_group_icon' into 'master'

Remove final instances of `group_icon` #433518

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139205



Merged-by: Mireya Andres <mandres@gitlab.com>
Approved-by: Doug Stull <dstull@gitlab.com>
Approved-by: Mireya Andres <mandres@gitlab.com>
Reviewed-by: Doug Stull <dstull@gitlab.com>
Reviewed-by: Sean Jin <yonghyun.jin13@gmail.com>
Co-authored-by: Doug Stull <dstull@gitlab.com>
Co-authored-by: sean3687 <yonghyun.jin13@gmail.com>

app/helpers/avatars_helper.rb

@@ -113,7 +113,7 @@ def avatar_without_link(resource, options = {})
     when Namespaces::UserNamespace
       user_avatar_without_link(options.merge(user: resource.first_owner))
     when Group
-      group_icon(resource, options.merge(class: 'avatar'))
+      render Pajamas::AvatarComponent.new(resource, class: 'gl-avatar-circle gl-mr-3', size: 32)
     end
   end
 

spec/helpers/avatars_helper_spec.rb

@@ -478,7 +478,20 @@
       let(:resource) { build_stubbed(:group, name: 'foo') }
 
       it 'displays group avatar' do
-        is_expected.to match(%r{<span class="avatar identicon bg\d+ s32">F</span>})
+        expected_pattern = %r{
+          <div\s+
+          alt="foo"\s+
+          class="gl-avatar\s+
+          gl-avatar-s32\s+
+          gl-avatar-circle\s+
+          gl-mr-3\s+
+          gl-avatar-identicon\s+
+          gl-avatar-identicon-bg\d+"\s*>
+          \s*F\s*
+          </div>
+        }x
+
+        is_expected.to match(expected_pattern)
       end
     end
   end