Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 100 deletions

diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index 47212f54df6..cfa87b3e39e 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -750,27 +750,6 @@ eos
     end
   end
 
-  describe '#reverting_commit' do
-    let(:user) { create(:user) }
-    let(:issue) { create(:issue, author: user, project: project) }
-
-    it 'returns the reverting commit' do
-      create(:note_on_issue,
-             noteable: issue,
-             system: true,
-             note: commit.revert_description(user),
-             project: issue.project)
-
-      expect_next_instance_of(Commit) do |revert_commit|
-        expect(revert_commit).to receive(:reverts_commit?)
-          .with(commit, user)
-          .and_return(true)
-      end
-
-      expect(commit.reverting_commit(user, issue.notes_with_associations)).to eq(commit)
-    end
-  end
-
   describe '#has_been_reverted?' do
     let(:user) { create(:user) }
     let(:issue) { create(:issue, author: user, project: project) }
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index d1f5a2c7077..1cf197322f5 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -2455,85 +2455,6 @@ RSpec.describe MergeRequest, factory_default: :keep do
     end
   end
 
-  describe '#reverting_merge_request' do
-    subject { create(:merge_request, source_project: create(:project, :repository)) }
-
-    context 'when there is no merge_commit for the MR' do
-      before do
-        subject.metrics.update!(merged_at: Time.current.utc)
-      end
-
-      it 'returns nil' do
-        expect(subject.reverting_merge_request(nil)).to be_nil
-      end
-    end
-
-    context 'when the MR has been merged' do
-      before do
-        MergeRequests::MergeService
-          .new(subject.target_project, subject.author, { sha: subject.diff_head_sha })
-          .execute(subject)
-      end
-
-      context 'when there is no revert commit' do
-        it 'returns nil' do
-          expect(subject.reverting_merge_request(nil)).to be_nil
-        end
-      end
-
-      context 'when there is no merged_at for the MR' do
-        before do
-          subject.metrics.update!(merged_at: nil)
-        end
-
-        it 'returns nil' do
-          expect(subject.reverting_merge_request(nil)).to be_nil
-        end
-      end
-
-      context 'when there is a revert commit by MR' do
-        let(:current_user) { subject.author }
-        let(:branch) { subject.source_branch }
-        let(:project) { subject.source_project }
-
-        let(:revert_commit_id) do
-          params = {
-            commit: subject.merge_commit,
-            branch_name: branch,
-            start_branch: branch
-          }
-
-          Commits::RevertService.new(project, current_user, params).execute[:result]
-        end
-
-        let(:revert_merge_request) do
-          create(
-            :merge_request,
-            author: subject.author,
-            target_project: subject.target_project,
-            source_project: subject.source_project,
-            merge_commit_sha: revert_commit_id,
-            description: "This reverts merge request !#{subject.id}")
-        end
-
-        it 'returns the reverting merge request' do
-          ProcessCommitWorker.new.perform(project.id,
-                                          current_user.id,
-                                          project.commit(revert_commit_id).to_hash,
-                                          project.default_branch == branch)
-
-          MergeRequests::MergeService.new(
-            subject.target_project,
-            subject.author,
-            { sha: revert_merge_request.diff_head_sha }
-          ).execute(revert_merge_request)
-
-          expect(subject.reverting_merge_request(current_user)).to eq(revert_merge_request)
-        end
-      end
-    end
-  end
-
   describe '#can_be_reverted?' do
     subject { create(:merge_request, source_project: create(:project, :repository)) }