summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/data_builder
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 00:08:46 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 00:08:46 +0000
commit6755df108b123ecc8ae330d7c7bf2f04fbf36a81 (patch)
tree7609bd6c0a9ac607d8f57737a2c27a460b7fcfdd /spec/lib/gitlab/data_builder
parentee7fba4b844935437233f6c5b74545a28bac4298 (diff)
downloadgitlab-ce-6755df108b123ecc8ae330d7c7bf2f04fbf36a81.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/data_builder')
-rw-r--r--spec/lib/gitlab/data_builder/pipeline_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/data_builder/pipeline_spec.rb b/spec/lib/gitlab/data_builder/pipeline_spec.rb
index 635bf56b72e..86ab7f888ca 100644
--- a/spec/lib/gitlab/data_builder/pipeline_spec.rb
+++ b/spec/lib/gitlab/data_builder/pipeline_spec.rb
@@ -77,7 +77,7 @@ describe Gitlab::DataBuilder::Pipeline do
expect(merge_request_attrs[:target_project_id]).to eq(merge_request.target_project_id)
expect(merge_request_attrs[:state]).to eq(merge_request.state)
expect(merge_request_attrs[:merge_status]).to eq(merge_request.merge_status)
- expect(merge_request_attrs[:url]).to eq("http://localhost/#{merge_request.target_project.full_path}/merge_requests/#{merge_request.iid}")
+ expect(merge_request_attrs[:url]).to eq("http://localhost/#{merge_request.target_project.full_path}/-/merge_requests/#{merge_request.iid}")
end
end
end