Fix deprecation: Using positional arguments in integration tests
This commit is contained in:
parent
6a8b89d908
commit
d53755da68
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: 'Fix deprecation: Using positional arguments in integration tests'
|
||||
merge_request: 24110
|
||||
author: Jasper Maes
|
||||
type: other
|
|
@ -950,7 +950,7 @@ describe Projects::MergeRequestsController do
|
|||
end
|
||||
|
||||
it 'returns 200' do
|
||||
get :discussions, namespace_id: project.namespace, project_id: project, id: merge_request.iid
|
||||
get :discussions, params: { namespace_id: project.namespace, project_id: project, id: merge_request.iid }
|
||||
|
||||
expect(response.status).to eq(200)
|
||||
end
|
||||
|
@ -969,7 +969,7 @@ describe Projects::MergeRequestsController do
|
|||
expect(collection).to receive(:find_by_id).with(note_diff_file.id).and_call_original
|
||||
end
|
||||
|
||||
get :discussions, namespace_id: project.namespace, project_id: project, id: merge_request.iid
|
||||
get :discussions, params: { namespace_id: project.namespace, project_id: project, id: merge_request.iid }
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -986,7 +986,7 @@ describe Projects::MergeRequestsController do
|
|||
expect(collection).to receive(:find_by_id).with(note_diff_file.id).and_call_original
|
||||
end
|
||||
|
||||
get :discussions, namespace_id: project.namespace, project_id: project, id: merge_request.iid
|
||||
get :discussions, params: { namespace_id: project.namespace, project_id: project, id: merge_request.iid }
|
||||
end
|
||||
|
||||
it 'does not preload highlights when diff note is resolved' do
|
||||
|
@ -999,7 +999,7 @@ describe Projects::MergeRequestsController do
|
|||
expect(collection).to receive(:find_by_id).with(note_diff_file.id).and_call_original
|
||||
end
|
||||
|
||||
get :discussions, namespace_id: project.namespace, project_id: project, id: merge_request.iid
|
||||
get :discussions, params: { namespace_id: project.namespace, project_id: project, id: merge_request.iid }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -385,7 +385,7 @@ describe Projects::SnippetsController do
|
|||
before do
|
||||
sign_in(user)
|
||||
|
||||
get :show, namespace_id: project.namespace, project_id: project, id: project_snippet.to_param, format: :js
|
||||
get :show, params: { namespace_id: project.namespace, project_id: project, id: project_snippet.to_param }, format: :js
|
||||
end
|
||||
|
||||
context 'when snippet is private' do
|
||||
|
|
|
@ -667,7 +667,7 @@ describe ProjectsController do
|
|||
project.add_guest(user)
|
||||
|
||||
sign_in(user)
|
||||
get :refs, namespace_id: project.namespace, id: project
|
||||
get :refs, params: { namespace_id: project.namespace, id: project }
|
||||
|
||||
expect(response).to have_gitlab_http_status(404)
|
||||
end
|
||||
|
|
|
@ -82,7 +82,7 @@ describe SnippetsController do
|
|||
end
|
||||
|
||||
it 'responds with status 404 when embeddable content is requested' do
|
||||
get :show, id: personal_snippet.to_param, format: :js
|
||||
get :show, params: { id: personal_snippet.to_param }, format: :js
|
||||
|
||||
expect(response).to have_gitlab_http_status(404)
|
||||
end
|
||||
|
@ -114,7 +114,7 @@ describe SnippetsController do
|
|||
end
|
||||
|
||||
it 'responds with status 404 when embeddable content is requested' do
|
||||
get :show, id: personal_snippet.to_param, format: :js
|
||||
get :show, params: { id: personal_snippet.to_param }, format: :js
|
||||
|
||||
expect(response).to have_gitlab_http_status(404)
|
||||
end
|
||||
|
@ -145,7 +145,7 @@ describe SnippetsController do
|
|||
end
|
||||
|
||||
it 'responds with status 200 when embeddable content is requested' do
|
||||
get :show, id: personal_snippet.to_param, format: :js
|
||||
get :show, params: { id: personal_snippet.to_param }, format: :js
|
||||
|
||||
expect(assigns(:snippet)).to eq(personal_snippet)
|
||||
expect(response).to have_gitlab_http_status(200)
|
||||
|
|
Loading…
Reference in New Issue