Add latest changes from gitlab-org/gitlab@master

5 files changed, 14 insertions, 14 deletions

diff --git a/spec/lib/gitlab/danger/helper_spec.rb b/spec/lib/gitlab/danger/helper_spec.rb
index ae0fcf443c5..2561e763429 100644
--- a/spec/lib/gitlab/danger/helper_spec.rb
+++ b/spec/lib/gitlab/danger/helper_spec.rb
@@ -335,14 +335,14 @@ describe Gitlab::Danger::Helper do
 
     it 'returns false when on a normal merge request' do
       expect(fake_gitlab).to receive(:mr_json)
-        .and_return('web_url' => 'https://gitlab.com/gitlab-org/gitlab/merge_requests/1')
+        .and_return('web_url' => 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1')
 
       expect(helper).not_to be_security_mr
     end
 
     it 'returns true when on a security merge request' do
       expect(fake_gitlab).to receive(:mr_json)
-        .and_return('web_url' => 'https://gitlab.com/gitlab-org/security/gitlab/merge_requests/1')
+        .and_return('web_url' => 'https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/1')
 
       expect(helper).to be_security_mr
     end
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
diff --git a/spec/lib/gitlab/etag_caching/router_spec.rb b/spec/lib/gitlab/etag_caching/router_spec.rb
index e25ce4df4aa..4cbabb5ad8d 100644
--- a/spec/lib/gitlab/etag_caching/router_spec.rb
+++ b/spec/lib/gitlab/etag_caching/router_spec.rb
@@ -68,7 +68,7 @@ describe Gitlab::EtagCaching::Router do
 
   it 'matches new merge request pipelines endpoint' do
     result = described_class.match(
-      '/my-group/my-project/merge_requests/new.json'
+      '/my-group/my-project/-/merge_requests/new.json'
     )
 
     expect(result).to be_present
@@ -77,7 +77,7 @@ describe Gitlab::EtagCaching::Router do
 
   it 'matches merge request pipelines endpoint' do
     result = described_class.match(
-      '/my-group/my-project/merge_requests/234/pipelines.json'
+      '/my-group/my-project/-/merge_requests/234/pipelines.json'
     )
 
     expect(result).to be_present
diff --git a/spec/lib/gitlab/internal_post_receive/response_spec.rb b/spec/lib/gitlab/internal_post_receive/response_spec.rb
index f43762c9248..d90b85a41ed 100644
--- a/spec/lib/gitlab/internal_post_receive/response_spec.rb
+++ b/spec/lib/gitlab/internal_post_receive/response_spec.rb
@@ -9,8 +9,8 @@ describe Gitlab::InternalPostReceive::Response do
     context 'when there are urls_data' do
       it 'adds a message for each merge request URL' do
         urls_data = [
-          { new_merge_request: false, branch_name: 'foo', url: 'http://example.com/foo/bar/merge_requests/1' },
-          { new_merge_request: true, branch_name: 'bar', url: 'http://example.com/foo/bar/merge_requests/new?merge_request%5Bsource_branch%5D=bar' }
+          { new_merge_request: false, branch_name: 'foo', url: 'http://example.com/foo/bar/-/merge_requests/1' },
+          { new_merge_request: true, branch_name: 'bar', url: 'http://example.com/foo/bar/-/merge_requests/new?merge_request%5Bsource_branch%5D=bar' }
         ]
 
         subject.add_merge_request_urls(urls_data)
@@ -24,13 +24,13 @@ describe Gitlab::InternalPostReceive::Response do
   describe '#add_merge_request_url' do
     context 'when :new_merge_request is false' do
       it 'adds a basic message to view the existing merge request' do
-        url_data = { new_merge_request: false, branch_name: 'foo', url: 'http://example.com/foo/bar/merge_requests/1' }
+        url_data = { new_merge_request: false, branch_name: 'foo', url: 'http://example.com/foo/bar/-/merge_requests/1' }
 
         subject.add_merge_request_url(url_data)
 
         message = <<~MESSAGE.strip
           View merge request for foo:
-            http://example.com/foo/bar/merge_requests/1
+            http://example.com/foo/bar/-/merge_requests/1
         MESSAGE
 
         expect(subject.messages.first.message).to eq(message)
@@ -40,13 +40,13 @@ describe Gitlab::InternalPostReceive::Response do
 
     context 'when :new_merge_request is true' do
       it 'adds a basic message to create a new merge request' do
-        url_data = { new_merge_request: true, branch_name: 'bar', url: 'http://example.com/foo/bar/merge_requests/new?merge_request%5Bsource_branch%5D=bar' }
+        url_data = { new_merge_request: true, branch_name: 'bar', url: 'http://example.com/foo/bar/-/merge_requests/new?merge_request%5Bsource_branch%5D=bar' }
 
         subject.add_merge_request_url(url_data)
 
         message = <<~MESSAGE.strip
           To create a merge request for bar, visit:
-            http://example.com/foo/bar/merge_requests/new?merge_request%5Bsource_branch%5D=bar
+            http://example.com/foo/bar/-/merge_requests/new?merge_request%5Bsource_branch%5D=bar
         MESSAGE
 
         expect(subject.messages.first.message).to eq(message)
diff --git a/spec/lib/gitlab/url_builder_spec.rb b/spec/lib/gitlab/url_builder_spec.rb
index 0aab02b6c4c..d349c2928b0 100644
--- a/spec/lib/gitlab/url_builder_spec.rb
+++ b/spec/lib/gitlab/url_builder_spec.rb
@@ -55,7 +55,7 @@ describe Gitlab::UrlBuilder do
 
         url = described_class.build(merge_request)
 
-        expect(url).to eq "#{Settings.gitlab['url']}/#{merge_request.project.full_path}/merge_requests/#{merge_request.iid}"
+        expect(url).to eq "#{Settings.gitlab['url']}/#{merge_request.project.full_path}/-/merge_requests/#{merge_request.iid}"
       end
     end
 
@@ -118,7 +118,7 @@ describe Gitlab::UrlBuilder do
 
           url = described_class.build(note)
 
-          expect(url).to eq "#{Settings.gitlab['url']}/#{merge_request.project.full_path}/merge_requests/#{merge_request.iid}#note_#{note.id}"
+          expect(url).to eq "#{Settings.gitlab['url']}/#{merge_request.project.full_path}/-/merge_requests/#{merge_request.iid}#note_#{note.id}"
         end
       end
 
@@ -129,7 +129,7 @@ describe Gitlab::UrlBuilder do
 
           url = described_class.build(note)
 
-          expect(url).to eq "#{Settings.gitlab['url']}/#{merge_request.project.full_path}/merge_requests/#{merge_request.iid}#note_#{note.id}"
+          expect(url).to eq "#{Settings.gitlab['url']}/#{merge_request.project.full_path}/-/merge_requests/#{merge_request.iid}#note_#{note.id}"
         end
       end