From 7f8330873c1a5860b8a9a52d111083a65d210249 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 18 Dec 2019 21:07:37 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/serializers/blob_entity_spec.rb | 2 +- spec/serializers/merge_request_poll_widget_entity_spec.rb | 2 +- spec/serializers/merge_request_widget_entity_spec.rb | 4 ++-- spec/serializers/paginated_diff_entity_spec.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'spec/serializers') diff --git a/spec/serializers/blob_entity_spec.rb b/spec/serializers/blob_entity_spec.rb index 3cd967ed44c..7e3a0a87bd5 100644 --- a/spec/serializers/blob_entity_spec.rb +++ b/spec/serializers/blob_entity_spec.rb @@ -23,7 +23,7 @@ describe BlobEntity do mode: "100644", readable_text: true, icon: "file-text-o", - url: "/#{project.full_path}/-/blob/master/bar/branch-test.txt" + url: "/#{project.full_path}/blob/master/bar/branch-test.txt" }) end end diff --git a/spec/serializers/merge_request_poll_widget_entity_spec.rb b/spec/serializers/merge_request_poll_widget_entity_spec.rb index 0593dd527cc..ea9052b4046 100644 --- a/spec/serializers/merge_request_poll_widget_entity_spec.rb +++ b/spec/serializers/merge_request_poll_widget_entity_spec.rb @@ -60,7 +60,7 @@ describe MergeRequestPollWidgetEntity do project.add_developer(user) expect(subject[:new_blob_path]) - .to eq("/#{resource.project.full_path}/-/new/#{resource.source_branch}") + .to eq("/#{resource.project.full_path}/new/#{resource.source_branch}") end end diff --git a/spec/serializers/merge_request_widget_entity_spec.rb b/spec/serializers/merge_request_widget_entity_spec.rb index 80f59ef90ca..22232682be1 100644 --- a/spec/serializers/merge_request_widget_entity_spec.rb +++ b/spec/serializers/merge_request_widget_entity_spec.rb @@ -45,12 +45,12 @@ describe MergeRequestWidgetEntity do it 'has email_patches_path' do expect(subject[:email_patches_path]) - .to eq("/#{resource.project.full_path}/-/merge_requests/#{resource.iid}.patch") + .to eq("/#{resource.project.full_path}/merge_requests/#{resource.iid}.patch") end it 'has plain_diff_path' do expect(subject[:plain_diff_path]) - .to eq("/#{resource.project.full_path}/-/merge_requests/#{resource.iid}.diff") + .to eq("/#{resource.project.full_path}/merge_requests/#{resource.iid}.diff") end describe 'when source project is deleted' do diff --git a/spec/serializers/paginated_diff_entity_spec.rb b/spec/serializers/paginated_diff_entity_spec.rb index 77569aaa4bc..7432e072318 100644 --- a/spec/serializers/paginated_diff_entity_spec.rb +++ b/spec/serializers/paginated_diff_entity_spec.rb @@ -26,7 +26,7 @@ describe PaginatedDiffEntity do expect(subject[:pagination]).to eq( current_page: 2, next_page: 3, - next_page_href: "/#{merge_request.project.full_path}/-/merge_requests/#{merge_request.iid}/diffs_batch.json?page=3", + next_page_href: "/#{merge_request.project.full_path}/merge_requests/#{merge_request.iid}/diffs_batch.json?page=3", total_pages: 7 ) end -- cgit v1.2.3