1 files changed, 1 insertions, 82 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index e1db1b3cf3e..4005a2ec6da 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -1648,10 +1648,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
 
     it 'uses template from target project' do
       request = build(:merge_request, title: 'Fix everything')
-      request.compare_commits = [
-        double(safe_message: 'Commit message', gitaly_commit?: true, merge_commit?: false, description?: false)
-      ]
-      subject.target_project.merge_commit_template = '%{title}'
+      request.target_project.merge_commit_template = '%{title}'
 
       expect(request.default_merge_commit_message)
         .to eq('Fix everything')
@@ -3495,84 +3492,6 @@ RSpec.describe MergeRequest, factory_default: :keep do
     end
   end
 
-  describe "#environments_for" do
-    let(:project)       { create(:project, :repository) }
-    let(:user)          { project.creator }
-    let(:merge_request) { create(:merge_request, source_project: project) }
-    let(:source_branch) { merge_request.source_branch }
-    let(:target_branch) { merge_request.target_branch }
-    let(:source_oid) { project.commit(source_branch).id }
-    let(:target_oid) { project.commit(target_branch).id }
-
-    before do
-      merge_request.source_project.add_maintainer(user)
-      merge_request.target_project.add_maintainer(user)
-    end
-
-    context 'with multiple environments' do
-      let(:environments) { create_list(:environment, 3, project: project) }
-
-      before do
-        create(:deployment, :success, environment: environments.first, ref: source_branch, sha: source_oid)
-        create(:deployment, :success, environment: environments.second, ref: target_branch, sha: target_oid)
-      end
-
-      it 'selects deployed environments' do
-        expect(merge_request.environments_for(user)).to contain_exactly(environments.first)
-      end
-
-      it 'selects latest deployed environment' do
-        latest_environment = create(:environment, project: project)
-        create(:deployment, :success, environment: latest_environment, ref: source_branch, sha: source_oid)
-
-        expect(merge_request.environments_for(user)).to eq([environments.first, latest_environment])
-        expect(merge_request.environments_for(user, latest: true)).to contain_exactly(latest_environment)
-      end
-    end
-
-    context 'with environments on source project' do
-      let(:source_project) { fork_project(project, nil, repository: true) }
-
-      let(:merge_request) do
-        create(:merge_request,
-               source_project: source_project, source_branch: 'feature',
-               target_project: project)
-      end
-
-      let(:source_environment) { create(:environment, project: source_project) }
-
-      before do
-        create(:deployment, :success, environment: source_environment, ref: 'feature', sha: merge_request.diff_head_sha)
-      end
-
-      it 'selects deployed environments', :sidekiq_might_not_need_inline do
-        expect(merge_request.environments_for(user)).to contain_exactly(source_environment)
-      end
-
-      context 'with environments on target project' do
-        let(:target_environment) { create(:environment, project: project) }
-
-        before do
-          create(:deployment, :success, environment: target_environment, tag: true, sha: merge_request.diff_head_sha)
-        end
-
-        it 'selects deployed environments', :sidekiq_might_not_need_inline do
-          expect(merge_request.environments_for(user)).to contain_exactly(source_environment, target_environment)
-        end
-      end
-    end
-
-    context 'without a diff_head_commit' do
-      before do
-        expect(merge_request).to receive(:diff_head_commit).and_return(nil)
-      end
-
-      it 'returns an empty array' do
-        expect(merge_request.environments_for(user)).to be_empty
-      end
-    end
-  end
-
   describe "#environments" do
     subject { merge_request.environments }