diff options
Diffstat (limited to 'spec/requests')
| -rw-r--r-- | spec/requests/api/internal/base_spec.rb | 4 | ||||
| -rw-r--r-- | spec/requests/api/releases_spec.rb | 2 | ||||
| -rw-r--r-- | spec/requests/projects/merge_requests_discussions_spec.rb | 2 | ||||
| -rw-r--r-- | spec/requests/user_activity_spec.rb | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/spec/requests/api/internal/base_spec.rb b/spec/requests/api/internal/base_spec.rb index ecbb81294a0..d38b7eafe97 100644 --- a/spec/requests/api/internal/base_spec.rb +++ b/spec/requests/api/internal/base_spec.rb @@ -852,7 +852,7 @@ describe API::Internal::Base do message = <<~MESSAGE.strip To create a merge request for #{branch_name}, visit: - http://#{Gitlab.config.gitlab.host}/#{project.full_path}/merge_requests/new?merge_request%5Bsource_branch%5D=#{branch_name} + http://#{Gitlab.config.gitlab.host}/#{project.full_path}/-/merge_requests/new?merge_request%5Bsource_branch%5D=#{branch_name} MESSAGE expect(json_response['messages']).to include(build_basic_message(message)) @@ -909,7 +909,7 @@ describe API::Internal::Base do message = <<~MESSAGE.strip View merge request for #{branch_name}: - http://#{Gitlab.config.gitlab.host}/#{project.full_path}/merge_requests/1 + http://#{Gitlab.config.gitlab.host}/#{project.full_path}/-/merge_requests/1 MESSAGE expect(json_response['messages']).to include(build_basic_message(message)) diff --git a/spec/requests/api/releases_spec.rb b/spec/requests/api/releases_spec.rb index da04e852795..534dced16bf 100644 --- a/spec/requests/api/releases_spec.rb +++ b/spec/requests/api/releases_spec.rb @@ -76,7 +76,7 @@ describe API::Releases do mr_uri = URI.parse(links['merge_requests_url']) issue_uri = URI.parse(links['issues_url']) - expect(mr_uri.path).to eq("#{path_base}/merge_requests") + expect(mr_uri.path).to eq("#{path_base}/-/merge_requests") expect(issue_uri.path).to eq("#{path_base}/issues") expect(mr_uri.query).to eq(expected_query) expect(issue_uri.query).to eq(expected_query) diff --git a/spec/requests/projects/merge_requests_discussions_spec.rb b/spec/requests/projects/merge_requests_discussions_spec.rb index 5945561aa7b..ffc98d09e5c 100644 --- a/spec/requests/projects/merge_requests_discussions_spec.rb +++ b/spec/requests/projects/merge_requests_discussions_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' describe 'merge requests discussions' do # Further tests can be found at merge_requests_controller_spec.rb - describe 'GET /:namespace/:project/merge_requests/:iid/discussions' do + describe 'GET /:namespace/:project/-/merge_requests/:iid/discussions' do let(:project) { create(:project, :repository) } let(:user) { project.owner } let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) } diff --git a/spec/requests/user_activity_spec.rb b/spec/requests/user_activity_spec.rb index 15666e00b9f..3cd4911098a 100644 --- a/spec/requests/user_activity_spec.rb +++ b/spec/requests/user_activity_spec.rb @@ -26,8 +26,8 @@ describe 'Update of user activity' do '/dashboard/todos', '/group/project/issues', '/group/project/issues/10', - '/group/project/merge_requests', - '/group/project/merge_requests/15' + '/group/project/-/merge_requests', + '/group/project/-/merge_requests/15' ] context 'without an authenticated user' do |