summaryrefslogtreecommitdiff
path: root/spec/presenters
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-14 03:09:39 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-14 03:09:39 +0000
commit52cacdb89bb29f355e0c3a33c3250ac2d3fea036 (patch)
tree106e4128d0b9e454f60287c9895fc2182e82db21 /spec/presenters
parent9398d718d92a40a0a917040645a55dea51467a91 (diff)
downloadgitlab-ce-52cacdb89bb29f355e0c3a33c3250ac2d3fea036.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/presenters')
-rw-r--r--spec/presenters/ci/pipeline_presenter_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/presenters/ci/pipeline_presenter_spec.rb b/spec/presenters/ci/pipeline_presenter_spec.rb
index 28eb6804703..e8b66682b97 100644
--- a/spec/presenters/ci/pipeline_presenter_spec.rb
+++ b/spec/presenters/ci/pipeline_presenter_spec.rb
@@ -236,7 +236,7 @@ describe Ci::PipelinePresenter do
context 'for a branch pipeline with two open MRs' do
let!(:one) { create(:merge_request, source_project: project, source_branch: pipeline.ref) }
- let!(:two) { create(:merge_request, source_project: project, source_branch: pipeline.ref, target_branch: 'wip') }
+ let!(:two) { create(:merge_request, source_project: project, source_branch: pipeline.ref, target_branch: 'fix') }
it { is_expected.to contain_exactly(one, two) }
end