Add latest changes from gitlab-org/gitlab@15-10-stable-eev15.10.0-rc42

1 files changed, 28 insertions, 1 deletions

diff --git a/spec/models/achievements/user_achievement_spec.rb b/spec/models/achievements/user_achievement_spec.rb
index 9d88bfdd477..41eaadafa67 100644
--- a/spec/models/achievements/user_achievement_spec.rb
+++ b/spec/models/achievements/user_achievement_spec.rb
@@ -7,7 +7,34 @@ RSpec.describe Achievements::UserAchievement, type: :model, feature_category: :u
     it { is_expected.to belong_to(:achievement).inverse_of(:user_achievements).required }
     it { is_expected.to belong_to(:user).inverse_of(:user_achievements).required }
 
-    it { is_expected.to belong_to(:awarded_by_user).class_name('User').inverse_of(:awarded_user_achievements).optional }
+    it { is_expected.to belong_to(:awarded_by_user).class_name('User').inverse_of(:awarded_user_achievements).required }
     it { is_expected.to belong_to(:revoked_by_user).class_name('User').inverse_of(:revoked_user_achievements).optional }
+
+    describe '#revoked?' do
+      subject { achievement.revoked? }
+
+      context 'when revoked' do
+        let_it_be(:achievement) { create(:user_achievement, :revoked) }
+
+        it { is_expected.to be true }
+      end
+
+      context 'when not revoked' do
+        let_it_be(:achievement) { create(:user_achievement) }
+
+        it { is_expected.to be false }
+      end
+    end
+  end
+
+  describe 'scopes' do
+    let_it_be(:user_achievement) { create(:user_achievement) }
+    let_it_be(:revoked_user_achievement) { create(:user_achievement, :revoked) }
+
+    describe '.not_revoked' do
+      it 'only returns user achievements which have not been revoked' do
+        expect(described_class.not_revoked).to contain_exactly(user_achievement)
+      end
+    end
   end
 end