Commit eb967bd2 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch 'remove_duplicate_spec_for_merge_request_base_pipeline' into 'master'

Remove duplicate spec

See merge request gitlab-org/gitlab-ee!9575
parents 144ca906 c25176ee
...@@ -435,7 +435,6 @@ describe MergeRequest do ...@@ -435,7 +435,6 @@ describe MergeRequest do
it 'does not cache issues from external trackers' do it 'does not cache issues from external trackers' do
issue = ExternalIssue.new('JIRA-123', subject.project) issue = ExternalIssue.new('JIRA-123', subject.project)
commit = double('commit1', safe_message: "Fixes #{issue.to_reference}") commit = double('commit1', safe_message: "Fixes #{issue.to_reference}")
allow(subject).to receive(:commits).and_return([commit]) allow(subject).to receive(:commits).and_return([commit])
expect { subject.cache_merge_request_closes_issues!(subject.author) }.not_to raise_error expect { subject.cache_merge_request_closes_issues!(subject.author) }.not_to raise_error
...@@ -2591,26 +2590,6 @@ describe MergeRequest do ...@@ -2591,26 +2590,6 @@ describe MergeRequest do
end end
end end
describe '#base_pipeline' do
let(:pipeline_arguments) do
{
project: project,
ref: merge_request.target_branch,
sha: merge_request.diff_base_sha
}
end
let(:project) { create(:project, :public, :repository) }
let(:merge_request) { create(:merge_request, source_project: project) }
let!(:first_pipeline) { create(:ci_pipeline_without_jobs, pipeline_arguments) }
let!(:last_pipeline) { create(:ci_pipeline_without_jobs, pipeline_arguments) }
it 'returns latest pipeline' do
expect(merge_request.base_pipeline).to eq(last_pipeline)
end
end
describe '#base_pipeline' do describe '#base_pipeline' do
let(:pipeline_arguments) do let(:pipeline_arguments) do
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment