1 files changed, 25 insertions, 11 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 429b6615131..243eeddc7a8 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -1064,16 +1064,6 @@ describe MergeRequest do
   end
 
   describe '#can_be_reverted?' do
-    context 'when there is no merged_at for the MR' do
-      before do
-        subject.metrics.update!(merged_at: nil)
-      end
-
-      it 'returns false' do
-        expect(subject.can_be_reverted?(nil)).to be_falsey
-      end
-    end
-
     context 'when there is no merge_commit for the MR' do
       before do
         subject.metrics.update!(merged_at: Time.now.utc)
@@ -1097,6 +1087,16 @@ describe MergeRequest do
         end
       end
 
+      context 'when there is no merged_at for the MR' do
+        before do
+          subject.metrics.update!(merged_at: nil)
+        end
+
+        it 'returns true' do
+          expect(subject.can_be_reverted?(nil)).to be_truthy
+        end
+      end
+
       context 'when there is a revert commit' do
         let(:current_user) { subject.author }
         let(:branch) { subject.target_branch }
@@ -1127,6 +1127,16 @@ describe MergeRequest do
           end
         end
 
+        context 'when there is no merged_at for the MR' do
+          before do
+            subject.metrics.update!(merged_at: nil)
+          end
+
+          it 'returns false' do
+            expect(subject.can_be_reverted?(current_user)).to be_falsey
+          end
+        end
+
         context 'when the revert commit is mentioned in a note just before the MR was merged' do
           before do
             subject.notes.last.update!(created_at: subject.metrics.merged_at - 30.seconds)
@@ -1329,6 +1339,10 @@ describe MergeRequest do
         it 'returns false' do
           expect(subject.mergeable_state?).to be_falsey
         end
+
+        it 'returns true when skipping discussions check' do
+          expect(subject.mergeable_state?(skip_discussions_check: true)).to be(true)
+        end
       end
     end
   end
@@ -1529,7 +1543,7 @@ describe MergeRequest do
       expect { subject.reload_diff }.to change { subject.merge_request_diffs.count }.by(1)
     end
 
-    it "executs diff cache service" do
+    it "executes diff cache service" do
       expect_any_instance_of(MergeRequests::MergeRequestDiffCacheService).to receive(:execute).with(subject)
 
       subject.reload_diff