Merge branch '434381-update-avatarable-spec-use' into 'master'

Use shared examples for models that use Avatarable module

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



Merged-by: Dmitry Gruzd <dgruzd@gitlab.com>
Approved-by: Dmitry Gruzd <dgruzd@gitlab.com>
Approved-by: Michael Becker <11881043-wandering_person@users.noreply.gitlab.com>
Co-authored-by: Doug Stull <dstull@gitlab.com>

spec/factories/achievements/achievements.rb

@@ -5,5 +5,9 @@
     namespace
 
     name { generate(:name) }
+
+    trait :with_avatar do
+      avatar { fixture_file_upload('spec/fixtures/dk.png') }
+    end
   end
 end

spec/factories/topics.rb

@@ -4,5 +4,9 @@
   factory :topic, class: 'Projects::Topic' do
     name { generate(:name) }
     title { generate(:title) }
+
+    trait :with_avatar do
+      avatar { fixture_file_upload('spec/fixtures/dk.png') }
+    end
   end
 end

spec/models/achievements/achievement_spec.rb

@@ -4,18 +4,12 @@
 
 RSpec.describe Achievements::Achievement, type: :model, feature_category: :user_profile do
   describe 'associations' do
-    it { is_expected.to belong_to(:namespace).required }
+    it { is_expected.to belong_to(:namespace).inverse_of(:achievements).required }
 
     it { is_expected.to have_many(:user_achievements).inverse_of(:achievement) }
     it { is_expected.to have_many(:users).through(:user_achievements).inverse_of(:achievements) }
   end
 
-  describe 'modules' do
-    subject { described_class }
-
-    it { is_expected.to include_module(Avatarable) }
-  end
-
   describe 'validations' do
     subject { create(:achievement) }
 
@@ -27,10 +21,15 @@
 
   describe '#name' do
     it 'strips name' do
-      achievement = described_class.new(name: '  AchievementTest  ')
+      achievement = build(:achievement, name: '  AchievementTest  ')
+
       achievement.valid?
 
       expect(achievement.name).to eq('AchievementTest')
     end
   end
+
+  it_behaves_like Avatarable do
+    let(:model) { create(:achievement, :with_avatar) }
+  end
 end

spec/models/projects/topic_spec.rb

@@ -96,31 +96,8 @@
     end
   end
 
-  describe '#avatar_type' do
-    it "is true if avatar is image" do
-      topic.update_attribute(:avatar, 'uploads/avatar.png')
-      expect(topic.avatar_type).to be_truthy
-    end
-
-    it "is false if avatar is html page" do
-      topic.update_attribute(:avatar, 'uploads/avatar.html')
-      topic.avatar_type
-
-      expect(topic.errors.added?(:avatar, "file format is not supported. Please try one of the following supported formats: png, jpg, jpeg, gif, bmp, tiff, ico, webp")).to be true
-    end
-  end
-
-  describe '#avatar_url' do
-    context 'when avatar file is uploaded' do
-      before do
-        topic.update!(avatar: fixture_file_upload("spec/fixtures/dk.png"))
-      end
-
-      it 'shows correct avatar url' do
-        expect(topic.avatar_url).to eq(topic.avatar.url)
-        expect(topic.avatar_url(only_path: false)).to eq([Gitlab.config.gitlab.url, topic.avatar.url].join)
-      end
-    end
+  it_behaves_like Avatarable do
+    let(:model) { create(:topic, :with_avatar) }
   end
 
   describe '#title_or_name' do