Skip to content

G
gitlab-ce
Commit 77b85029 authored by blackst0ne's avatar blackst0ne
Browse files
Options

Update specs to rails5 format 

Updates specs to use new rails5 format.

The old format:
`get :show, { some: params }, { some: headers }`

The new format:
`get :show, params: { some: params }, headers: { some: headers }`
parent 2188cd1c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4044 additions and 3385 deletions
.rubocop.yml
View file @ 77b85029
......@@ -8,7 +8,7 @@ require:
- rubocop-rspec
AllCops:
TargetRailsVersion: 4.2
TargetRailsVersion: 5.0
Exclude:
- 'vendor/**/*'
- 'node_modules/**/*'
......
changelogs/unreleased/blackst0ne-convert-specs-rails5-style.yml 0 → 100644
View file @ 77b85029
---
title: "[Rails5.1] Update functional specs to use new keyword format"
merge_request: 23095
author: "@blackst0ne"
type: other
ee/spec/controllers/admin/appearances_controller_spec.rb
View file @ 77b85029
......@@ -23,7 +23,7 @@ describe Admin::AppearancesController do
it 'creates appearance with footer and header message' do
stub_licensed_features(system_header_footer: true)
post :create, appearance: create_params
post :create, params: { appearance: create_params }
expect(Appearance.current).to have_attributes(
header_message: header_message,
......@@ -36,7 +36,7 @@ describe Admin::AppearancesController do
it 'does not create appearance with footer and header message' do
stub_licensed_features(system_header_footer: false)
post :create, appearance: create_params
post :create, params: { appearance: create_params }
expect(Appearance.current).to have_attributes(
header_message: nil,
......@@ -64,7 +64,7 @@ describe Admin::AppearancesController do
it 'updates appearance with footer and header message' do
stub_licensed_features(system_header_footer: true)
put :update, appearance: update_params
put :update, params: { appearance: update_params }
expect(Appearance.current).to have_attributes(
header_message: header_message,
......@@ -77,7 +77,7 @@ describe Admin::AppearancesController do
it 'does not update appearance with footer and header message' do
stub_licensed_features(system_header_footer: false)
post :create, appearance: update_params
post :create, params: { appearance: update_params }
expect(Appearance.current).to have_attributes(
header_message: nil,
......
ee/spec/controllers/admin/application_settings_controller_spec.rb
View file @ 77b85029
......@@ -37,7 +37,7 @@ describe Admin::ApplicationSettingsController do
allow_group_owners_to_manage_ldap: false
}
put :update, application_setting: settings
put :update, params: { application_setting: settings }
expect(response).to redirect_to(admin_application_settings_path)
settings.except(:elasticsearch_url, :repository_size_limit).each do |setting, value|
......@@ -52,14 +52,14 @@ describe Admin::ApplicationSettingsController do
stub_licensed_features(feature => false)
attribute_names = settings.keys.map(&:to_s)
expect { put :update, application_setting: settings }
expect { put :update, params: { application_setting: settings } }
.not_to change { ApplicationSetting.current.reload.attributes.slice(*attribute_names) }
end
it 'updates settings when the feature is available' do
stub_licensed_features(feature => true)
put :update, application_setting: settings
put :update, params: { application_setting: settings }
settings.each do |attribute, value|
expect(ApplicationSetting.current.public_send(attribute)).to eq(value)
......@@ -114,35 +114,35 @@ describe Admin::ApplicationSettingsController do
it 'updates the default_project_creation for string value' do
stub_licensed_features(project_creation_level: true)
put :update, application_setting: { default_project_creation: ::EE::Gitlab::Access::MAINTAINER_PROJECT_ACCESS }
put :update, params: { application_setting: { default_project_creation: ::EE::Gitlab::Access::MAINTAINER_PROJECT_ACCESS } }
expect(response).to redirect_to(admin_application_settings_path)
expect(ApplicationSetting.current.default_project_creation).to eq(::EE::Gitlab::Access::MAINTAINER_PROJECT_ACCESS)
end
it 'updates repository_size_limit' do
put :update, application_setting: { repository_size_limit: '100' }
put :update, params: { application_setting: { repository_size_limit: '100' } }
expect(response).to redirect_to(admin_application_settings_path)
expect(response).to set_flash[:notice].to('Application settings saved successfully')
end
it 'does not accept negative repository_size_limit' do
put :update, application_setting: { repository_size_limit: '-100' }
put :update, params: { application_setting: { repository_size_limit: '-100' } }
expect(response).to render_template(:show)
expect(assigns(:application_setting).errors[:repository_size_limit]).to be_present
end
it 'does not accept invalid repository_size_limit' do
put :update, application_setting: { repository_size_limit: 'one thousand' }
put :update, params: { application_setting: { repository_size_limit: 'one thousand' } }
expect(response).to render_template(:show)
expect(assigns(:application_setting).errors[:repository_size_limit]).to be_present
end
it 'does not accept empty repository_size_limit' do
put :update, application_setting: { repository_size_limit: '' }
put :update, params: { application_setting: { repository_size_limit: '' } }
expect(response).to render_template(:show)
expect(assigns(:application_setting).errors[:repository_size_limit]).to be_present
......
ee/spec/controllers/admin/geo/nodes_controller_spec.rb
View file @ 77b85029
......@@ -60,7 +60,7 @@ describe Admin::Geo::NodesController, :postgresql do
let(:geo_node_attributes) { { url: 'http://example.com' } }
def go
post :create, geo_node: geo_node_attributes
post :create, params: { geo_node: geo_node_attributes }
end
context 'without add-on license' do
......@@ -91,7 +91,7 @@ describe Admin::Geo::NodesController, :postgresql do
let(:geo_node) { create(:geo_node) }
def go
post :update, id: geo_node, geo_node: geo_node_attributes
post :update, params: { id: geo_node, geo_node: geo_node_attributes }
end
context 'without add-on license' do
......
ee/spec/controllers/admin/geo/projects_controller_spec.rb
View file @ 77b85029
......@@ -47,7 +47,7 @@ describe Admin::Geo::ProjectsController, :geo do
end
context 'with sync_status=pending' do
subject { get :index, sync_status: 'pending' }
subject { get :index, params: { sync_status: 'pending' } }
it 'renders pending template' do
expect(subject).to have_gitlab_http_status(200)
......@@ -57,7 +57,7 @@ describe Admin::Geo::ProjectsController, :geo do
end
context 'with sync_status=failed' do
subject { get :index, sync_status: 'failed' }
subject { get :index, params: { sync_status: 'failed' } }
it 'renders failed template' do
expect(subject).to have_gitlab_http_status(200)
......@@ -67,7 +67,7 @@ describe Admin::Geo::ProjectsController, :geo do
end
context 'with sync_status=never' do
subject { get :index, sync_status: 'never' }
subject { get :index, params: { sync_status: 'never' } }
it 'renders failed template' do
expect(subject).to have_gitlab_http_status(200)
......@@ -77,7 +77,7 @@ describe Admin::Geo::ProjectsController, :geo do
end
context 'with sync_status=synced' do
subject { get :index, sync_status: 'synced' }
subject { get :index, params: { sync_status: 'synced' } }
it 'renders synced template' do
expect(subject).to have_gitlab_http_status(200)
......@@ -89,7 +89,7 @@ describe Admin::Geo::ProjectsController, :geo do
end
describe '#destroy' do
subject { delete :destroy, id: synced_registry }
subject { delete :destroy, params: { id: synced_registry } }
it_behaves_like 'license required'
......@@ -119,7 +119,7 @@ describe Admin::Geo::ProjectsController, :geo do
end
describe '#recheck' do
subject { post :recheck, id: synced_registry }
subject { post :recheck, params: { id: synced_registry } }
it_behaves_like 'license required'
......@@ -137,7 +137,7 @@ describe Admin::Geo::ProjectsController, :geo do
end
describe '#resync' do
subject { post :resync, id: synced_registry }
subject { post :resync, params: { id: synced_registry } }
it_behaves_like 'license required'
......@@ -205,7 +205,7 @@ describe Admin::Geo::ProjectsController, :geo do
end
describe '#force_redownload' do
subject { post :force_redownload, id: synced_registry }
subject { post :force_redownload, params: { id: synced_registry } }
it_behaves_like 'license required'
......
ee/spec/controllers/admin/groups_controller_spec.rb
View file @ 77b85029
......@@ -9,7 +9,7 @@ describe Admin::GroupsController do
end
describe 'POST #reset_runner_minutes' do
subject { post :reset_runners_minutes, id: group }
subject { post :reset_runners_minutes, params: { id: group } }
before do
allow_any_instance_of(ClearNamespaceSharedRunnersMinutesService)
......@@ -45,7 +45,7 @@ describe Admin::GroupsController do
stub_licensed_features(project_creation_level: false)
expect do
post :update, id: group.to_param, group: { project_creation_level: ::EE::Gitlab::Access::NO_ONE_PROJECT_ACCESS }
post :update, params: { id: group.to_param, group: { project_creation_level: ::EE::Gitlab::Access::NO_ONE_PROJECT_ACCESS } }
end.not_to change { group.reload.project_creation_level }
end
end
......@@ -55,7 +55,7 @@ describe Admin::GroupsController do
stub_licensed_features(project_creation_level: true)
expect do
post :update, id: group.to_param, group: { project_creation_level: ::EE::Gitlab::Access::NO_ONE_PROJECT_ACCESS }
post :update, params: { id: group.to_param, group: { project_creation_level: ::EE::Gitlab::Access::NO_ONE_PROJECT_ACCESS } }
end.to change { group.reload.project_creation_level }.to(::EE::Gitlab::Access::NO_ONE_PROJECT_ACCESS)
end
end
......
ee/spec/controllers/admin/licenses_controller_spec.rb
View file @ 77b85029
......@@ -9,7 +9,7 @@ describe Admin::LicensesController do
describe 'Upload license' do
it 'redirects back when no license is entered/uploaded' do
post :create, license: { data: '' }
post :create, params: { license: { data: '' } }
expect(response).to redirect_to new_admin_license_path
expect(flash[:alert]).to include 'Please enter or upload a license.'
......
ee/spec/controllers/admin/projects_controller_spec.rb
View file @ 77b85029
......@@ -13,7 +13,7 @@ describe Admin::ProjectsController, :geo do
end
describe 'GET /projects/:id' do
subject { get :show, namespace_id: project.namespace.path, id: project.path }
subject { get :show, params: { namespace_id: project.namespace.path, id: project.path } }
render_views
......
ee/spec/controllers/admin/push_rules_controller_spec.rb
View file @ 77b85029
......@@ -19,7 +19,7 @@ describe Admin::PushRulesController do
it 'updates sample push rule' do
expect_any_instance_of(PushRule).to receive(:update).with(ActionController::Parameters.new(params).permit!)
patch :update, push_rule: params
patch :update, params: { push_rule: params }
expect(response).to redirect_to(admin_push_rule_path)
end
......@@ -30,7 +30,7 @@ describe Admin::PushRulesController do
end
it 'returns 404' do
patch :update, push_rule: params
patch :update, params: { push_rule: params }
expect(response).to have_gitlab_http_status(404)
end
......
ee/spec/controllers/admin/users_controller_spec.rb
View file @ 77b85029
......@@ -9,7 +9,7 @@ describe Admin::UsersController do
end
describe 'POST #reset_runner_minutes' do
subject { post :reset_runners_minutes, id: user }
subject { post :reset_runners_minutes, params: { id: user } }
before do
allow_any_instance_of(ClearNamespaceSharedRunnersMinutesService)
......
ee/spec/controllers/autocomplete_controller_spec.rb
View file @ 77b85029
......@@ -16,7 +16,7 @@ describe AutocompleteController do
describe "GET #users that can push to protected branches" do
before do
get(:users, project_id: project.id, push_code_to_protected_branches: 'true')
get(:users, params: { project_id: project.id, push_code_to_protected_branches: 'true' })
end
it 'returns authorized users', :aggregate_failures do
......@@ -31,7 +31,7 @@ describe AutocompleteController do
before do
project.add_reporter(reporter_user)
get(:users, project_id: project.id, push_code: 'true')
get(:users, params: { project_id: project.id, push_code: 'true' })
end
it 'returns authorized users', :aggregate_failures do
......@@ -43,7 +43,7 @@ describe AutocompleteController do
describe "GET #users that can push to protected branches, including the current user" do
before do
get(:users, project_id: project.id, push_code_to_protected_branches: true, current_user: true)
get(:users, params: { project_id: project.id, push_code_to_protected_branches: true, current_user: true })
end
it 'returns authorized users', :aggregate_failures do
......@@ -67,7 +67,7 @@ describe AutocompleteController do
context "while fetching all groups belonging to a project" do
before do
sign_in(user)
get(:project_groups, project_id: project.id)
get(:project_groups, params: { project_id: project.id })
end
it 'returns a single group', :aggregate_failures do
......@@ -80,7 +80,7 @@ describe AutocompleteController do
context "while fetching all groups belonging to a project the current user cannot access" do
before do
sign_in(user2)
get(:project_groups, project_id: project.id)
get(:project_groups, params: { project_id: project.id })
end
it { expect(response).to be_not_found }
......@@ -89,7 +89,7 @@ describe AutocompleteController do
context "while fetching all groups belonging to an invalid project ID" do
before do
sign_in(user)
get(:project_groups, project_id: 'invalid')
get(:project_groups, params: { project_id: 'invalid' })
end
it { expect(response).to be_not_found }
......
ee/spec/controllers/boards/issues_controller_spec.rb
View file @ 77b85029
......@@ -97,7 +97,7 @@ describe Boards::IssuesController do
end
it 'returns a 403 for group boards' do
get :index, board_id: board
get :index, params: { board_id: board }
expect(response).to have_gitlab_http_status(403)
end
......@@ -118,7 +118,7 @@ describe Boards::IssuesController do
list_id: list.try(:to_param)
}
get :index, params.compact
get :index, params: params.compact
end
end
......@@ -184,9 +184,11 @@ describe Boards::IssuesController do
def create_issue(user:, board:, list:, title:)
sign_in(user)
post :create, board_id: board.to_param,
list_id: list.to_param,
issue: { title: title, project_id: project_1.id },
post :create, params: {
board_id: board.to_param,
list_id: list.to_param,
issue: { title: title, project_id: project_1.id }
},
format: :json
end
end
......@@ -245,10 +247,12 @@ describe Boards::IssuesController do
def move(user:, board:, issue:, from_list_id:, to_list_id:)
sign_in(user)
patch :update, board_id: board.to_param,
id: issue.id,
from_list_id: from_list_id,
to_list_id: to_list_id,
patch :update, params: {
board_id: board.to_param,
id: issue.id,
from_list_id: from_list_id,
to_list_id: to_list_id
},
format: :json
end
end
......
ee/spec/controllers/boards/lists_controller_spec.rb
View file @ 77b85029
......@@ -45,7 +45,7 @@ describe Boards::ListsController do
def read_board_list(user:, board:)
sign_in(user)
get :index, board_id: board.to_param, format: :json
get :index, params: { board_id: board.to_param }, format: :json
end
end
......@@ -99,8 +99,10 @@ describe Boards::ListsController do
def create_board_list(user:, board:, label_id:)
sign_in(user)
post :create, board_id: board.to_param,
list: { label_id: label_id },
post :create, params: {
board_id: board.to_param,
list: { label_id: label_id }
},
format: :json
end
end
......@@ -194,8 +196,10 @@ describe Boards::ListsController do
def remove_board_list(user:, board:, list:)
sign_in(user)
delete :destroy, board_id: board.to_param,
id: list.to_param,
delete :destroy, params: {
board_id: board.to_param,
id: list.to_param
},
format: :json
end
end
......
ee/spec/controllers/boards/milestones_controller_spec.rb
View file @ 77b85029
......@@ -15,7 +15,7 @@ describe Boards::MilestonesController do
end
it 'returns a list of all milestones of board parent' do
get :index, board_id: board.to_param, format: :json
get :index, params: { board_id: board.to_param }, format: :json
parsed_response = JSON.parse(response.body)
......@@ -33,7 +33,7 @@ describe Boards::MilestonesController do
shared_examples 'unauthorized board milestone listing' do
it 'returns a forbidden 403 response' do
get :index, board_id: board.to_param, format: :json
get :index, params: { board_id: board.to_param }, format: :json
expect(response).to have_gitlab_http_status(403)
end
......
ee/spec/controllers/boards/users_controller_spec.rb
View file @ 77b85029
......@@ -16,8 +16,10 @@ describe Boards::UsersController do
end
it 'returns a list of all members of board parent' do
get :index, namespace_id: group.to_param,
board_id: board.to_param,
get :index, params: {
namespace_id: group.to_param,
board_id: board.to_param
},
format: :json
parsed_response = JSON.parse(response.body)
......@@ -36,7 +38,7 @@ describe Boards::UsersController do
shared_examples 'unauthorized board user listing' do
it 'returns a forbidden 403 response' do
get :index, board_id: board.to_param, format: :json
get :index, params: { board_id: board.to_param }, format: :json
expect(response).to have_gitlab_http_status(403)
end
......
ee/spec/controllers/concerns/ee/project_unauthorized_spec.rb
View file @ 77b85029
......@@ -26,7 +26,7 @@ describe EE::ProjectUnauthorized do
it 'renders a 200 when the service allows access to the project' do
external_service_allow_access(user, project)
get :show, namespace_id: project.namespace.to_param, id: project.to_param
get :show, params: { namespace_id: project.namespace.to_param, id: project.to_param }
expect(response).to have_gitlab_http_status(200)
end
......@@ -34,7 +34,7 @@ describe EE::ProjectUnauthorized do
it 'renders a 403 when the service denies access to the project' do
external_service_deny_access(user, project)
get :show, namespace_id: project.namespace.to_param, id: project.to_param
get :show, params: { namespace_id: project.namespace.to_param, id: project.to_param }
expect(response).to have_gitlab_http_status(403)
expect(response.body).to match("External authorization denied access to this project")
......@@ -43,7 +43,7 @@ describe EE::ProjectUnauthorized do
it 'renders a 404 when the user cannot see the project at all' do
other_project = create(:project, :private)
get :show, namespace_id: other_project.namespace.to_param, id: other_project.to_param
get :show, params: { namespace_id: other_project.namespace.to_param, id: other_project.to_param }
expect(response).to have_gitlab_http_status(404)
end
......
ee/spec/controllers/ee/projects/autocomplete_sources_controller_spec.rb
View file @ 77b85029
......@@ -15,7 +15,7 @@ describe Projects::AutocompleteSourcesController do
context 'when epics feture is disabled' do
it 'returns 404 status' do
get :epics, namespace_id: project.namespace, project_id: project
get :epics, params: { namespace_id: project.namespace, project_id: project }
expect(response).to have_gitlab_http_status(404)
end
......@@ -28,7 +28,7 @@ describe Projects::AutocompleteSourcesController do
context '#epics' do
it 'returns the correct response' do
get :epics, namespace_id: project.namespace, project_id: project
get :epics, params: { namespace_id: project.namespace, project_id: project }
expect(response).to have_gitlab_http_status(200)
expect(json_response).to be_an(Array)
......
ee/spec/controllers/ee/sent_notifications_controller_spec.rb
View file @ 77b85029
......@@ -13,7 +13,7 @@ describe SentNotificationsController do
before do
sign_in(user)
get(:unsubscribe, id: sent_notification.reply_key)
get(:unsubscribe, params: { id: sent_notification.reply_key })
end
it 'unsubscribes the user' do
......
ee/spec/controllers/groups/analytics_controller_spec.rb
View file @ 77b85029
......@@ -41,7 +41,7 @@ describe Groups::AnalyticsController do
it 'returns 404 when feature is not available and we dont show promotions' do
stub_licensed_features(contribution_analytics: false)
get :show, group_id: group.path
get :show, params: { group_id: group.path }
expect(response).to have_gitlab_http_status(404)
end
......@@ -56,14 +56,14 @@ describe Groups::AnalyticsController do
it 'returns page when feature is not available and we show promotions' do
stub_licensed_features(contribution_analytics: false)
get :show, group_id: group.path
get :show, params: { group_id: group.path }
expect(response).to have_gitlab_http_status(200)
end
end
it 'sets instance variables properly', :aggregate_failures do
get :show, group_id: group.path
get :show, params: { group_id: group.path }
expect(response).to have_gitlab_http_status(200)
......@@ -78,7 +78,7 @@ describe Groups::AnalyticsController do
end
it "returns member contributions JSON when format is JSON" do
get :show, group_id: group.path, format: :json
get :show, params: { group_id: group.path }, format: :json
expect(json_response.length).to eq(3)
......@@ -96,14 +96,14 @@ describe Groups::AnalyticsController do
it 'does not cause N+1 queries when the format is JSON' do
control_count = ActiveRecord::QueryRecorder.new do
get :show, group_id: group.path, format: :json
get :show, params: { group_id: group.path }, format: :json
end
controller.instance_variable_set(:@group, nil)
user4 = create(:user)
group.add_user(user4, GroupMember::DEVELOPER)
expect { get :show, group_id: group.path, format: :json }
expect { get :show, params: { group_id: group.path }, format: :json }
.not_to exceed_query_limit(control_count)
end
......@@ -111,19 +111,19 @@ describe Groups::AnalyticsController do
render_views
it 'avoids a N+1 query in #show' do
control_count = ActiveRecord::QueryRecorder.new { get :show, group_id: group.path }.count
control_count = ActiveRecord::QueryRecorder.new { get :show, params: { group_id: group.path } }.count
# Clear out controller state to force a refresh of the group
controller.instance_variable_set(:@group, nil)
user4 = create(:user)
group.add_user(user4, GroupMember::DEVELOPER)
expect { get :show, group_id: group.path }.not_to exceed_query_limit(control_count)
expect { get :show, params: { group_id: group.path } }.not_to exceed_query_limit(control_count)
end
end
describe 'GET #index' do
subject { get :show, group_id: group.to_param }
subject { get :show, params: { group_id: group.to_param } }
it_behaves_like 'disabled when using an external authorization service'
end
......
ee/spec/controllers/groups/autocomplete_sources_controller_spec.rb
View file @ 77b85029
......@@ -15,13 +15,13 @@ describe Groups::AutocompleteSourcesController do
context '#epics' do
it 'returns 200 status' do
get :epics, group_id: group
get :epics, params: { group_id: group }
expect(response).to have_gitlab_http_status(200)
end
it 'returns the correct response' do
get :epics, group_id: group
get :epics, params: { group_id: group }
expect(json_response).to be_an(Array)
expect(json_response.first).to include(
......@@ -39,7 +39,7 @@ describe Groups::AutocompleteSourcesController do
create(:milestone, group: sub_group)
group_milestone = create(:milestone, group: group)
get :milestones, group_id: group
get :milestones, params: { group_id: group }
expect(response).to have_gitlab_http_status(200)
expect(json_response.count).to eq(1)
......@@ -52,13 +52,13 @@ describe Groups::AutocompleteSourcesController do
context '#commands' do
it 'returns 200 status' do
get :commands, group_id: group, type: 'Epic', type_id: epic.iid
get :commands, params: { group_id: group, type: 'Epic', type_id: epic.iid }
expect(response).to have_gitlab_http_status(200)
end
it 'returns the correct response' do
get :commands, group_id: group, type: 'Epic', type_id: epic.iid
get :commands, params: { group_id: group, type: 'Epic', type_id: epic.iid }
expect(json_response).to be_an(Array)
expect(json_response).to include(
......
ee/spec/controllers/groups/avatars_controller_spec.rb
View file @ 77b85029
......@@ -14,7 +14,7 @@ describe Groups::AvatarsController do
it 'works when external authorization service is enabled' do
enable_external_authorization_service_check
delete :destroy, group_id: group
delete :destroy, params: { group_id: group }
expect(response).to have_gitlab_http_status(302)
end
......
ee/spec/controllers/groups/billings_controller_spec.rb
View file @ 77b85029
......@@ -19,7 +19,7 @@ describe Groups::BillingsController do
it 'renders index with 200 status code' do
allow_any_instance_of(FetchSubscriptionPlansService).to receive(:execute)
get :index, group_id: group
get :index, params: { group_id: group }
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template(:index)
......@@ -29,7 +29,7 @@ describe Groups::BillingsController do
data = double
expect_any_instance_of(FetchSubscriptionPlansService).to receive(:execute).and_return(data)
get :index, group_id: group
get :index, params: { group_id: group }
expect(assigns(:plans_data)).to eq(data)
end
......@@ -40,7 +40,7 @@ describe Groups::BillingsController do
group.add_developer(user)
sign_in(user)
get :index, group_id: group.id
get :index, params: { group_id: group.id }
expect(response).to have_gitlab_http_status(404)
end
......@@ -50,7 +50,7 @@ describe Groups::BillingsController do
group.add_owner(user)
sign_in(user)
get :index, group_id: group
get :index, params: { group_id: group }
expect(response).to have_gitlab_http_status(404)
end
......
ee/spec/controllers/groups/boards_controller_spec.rb
View file @ 77b85029
......@@ -48,7 +48,7 @@ describe Groups::BoardsController do
end
def list_boards(format: :html)
get :index, group_id: group, format: format
get :index, params: { group_id: group }, format: format
end
end
......
ee/spec/controllers/groups/children_controller_spec.rb
View file @ 77b85029
......@@ -14,7 +14,7 @@ describe Groups::ChildrenController do
it 'works when external authorization service is enabled' do
enable_external_authorization_service_check
get :index, group_id: group, format: :json
get :index, params: { group_id: group }, format: :json
expect(response).to have_gitlab_http_status(200)
end
......
ee/spec/controllers/groups/epic_issues_controller_spec.rb
View file @ 77b85029
......@@ -30,7 +30,7 @@ describe Groups::EpicIssuesController do
describe 'GET #index' do
let!(:epic_issue) { create(:epic_issue, epic: epic, issue: issue) }
subject { get :index, group_id: group, epic_id: epic.to_param }
subject { get :index, params: { group_id: group, epic_id: epic.to_param } }
it_behaves_like 'unlicensed epics action'
......@@ -55,7 +55,7 @@ describe Groups::EpicIssuesController do
subject do
reference = [issue.to_reference(full: true)]
post :create, group_id: group, epic_id: epic.to_param, issuable_references: reference
post :create, params: { group_id: group, epic_id: epic.to_param, issuable_references: reference }
end
it_behaves_like 'unlicensed epics action'
......@@ -96,7 +96,7 @@ describe Groups::EpicIssuesController do
describe 'DELETE #destroy' do
let!(:epic_issue) { create(:epic_issue, epic: epic, issue: issue) }
subject { delete :destroy, group_id: group, epic_id: epic.to_param, id: epic_issue.id }
subject { delete :destroy, params: { group_id: group, epic_id: epic.to_param, id: epic_issue.id } }
it_behaves_like 'unlicensed epics action'
......@@ -131,7 +131,7 @@ describe Groups::EpicIssuesController do
context 'when the epic from the association does not equal epic from the path' do
subject do
delete :destroy, group_id: group, epic_id: another_epic.to_param, id: epic_issue.id
delete :destroy, params: { group_id: group, epic_id: another_epic.to_param, id: epic_issue.id }
end
let(:another_epic) { create(:epic, group: group) }
......@@ -153,7 +153,7 @@ describe Groups::EpicIssuesController do
context 'when the epic_issue record does not exists' do
it 'returns status 404' do
delete :destroy, group_id: group, epic_id: epic.to_param, id: 9999
delete :destroy, params: { group_id: group, epic_id: epic.to_param, id: 9999 }
expect(response.status).to eq(403)
end
......@@ -167,7 +167,7 @@ describe Groups::EpicIssuesController do
let!(:epic_issue2) { create(:epic_issue, epic: epic, issue: issue2, relative_position: 2) }
subject do
put :update, group_id: group, epic_id: epic.to_param, id: epic_issue1.id, epic: { move_before_id: epic_issue2.id }
put :update, params: { group_id: group, epic_id: epic.to_param, id: epic_issue1.id, epic: { move_before_id: epic_issue2.id } }
end
it_behaves_like 'unlicensed epics action'
......@@ -199,7 +199,7 @@ describe Groups::EpicIssuesController do
context 'when the epic from the association does not equal epic from the path' do
subject do
put :update, group_id: group, epic_id: another_epic.to_param, id: epic_issue1.id, epic: { after_move_id: epic_issue1.id }
put :update, params: { group_id: group, epic_id: another_epic.to_param, id: epic_issue1.id, epic: { after_move_id: epic_issue1.id } }
end
let(:another_epic) { create(:epic, group: group) }
......@@ -217,7 +217,7 @@ describe Groups::EpicIssuesController do
context 'when the epic_issue record does not exists' do
it 'returns status 404' do
delete :destroy, group_id: group, epic_id: epic.to_param, id: 9999
delete :destroy, params: { group_id: group, epic_id: epic.to_param, id: 9999 }
expect(response.status).to eq(403)
end
......
ee/spec/controllers/groups/epics/notes_controller_spec.rb
View file @ 77b85029
......@@ -29,7 +29,7 @@ describe Groups::Epics::NotesController do
end
it 'responds with array of notes' do
get :index, request_params
get :index, params: request_params
expect(parsed_response[:notes]).to be_an Array
expect(parsed_response[:notes].count).to eq(1)
......@@ -39,7 +39,7 @@ describe Groups::Epics::NotesController do
it "does not return any note" do
expect_any_instance_of(Note).to receive(:cross_reference_not_visible_for?).and_return(true)
get :index, request_params
get :index, params: request_params
expect(parsed_response[:notes].count).to eq(0)
end
......@@ -62,13 +62,13 @@ describe Groups::Epics::NotesController do
end
it "returns status 302 for html" do
post :create, request_params.merge(format: :html)
post :create, params: request_params.merge(format: :html)
expect(response).to have_gitlab_http_status(302)
end
it "returns status 200 for json" do
post :create, request_params
post :create, params: request_params
expect(response).to have_gitlab_http_status(200)
expect(parsed_response[:id]).not_to be_nil
......@@ -91,7 +91,7 @@ describe Groups::Epics::NotesController do
end
it "updates the note" do
expect { put :update, request_params }.to change { note.reload.note }
expect { put :update, params: request_params }.to change { note.reload.note }
end
end
......@@ -115,13 +115,13 @@ describe Groups::Epics::NotesController do
end
it "returns status 200" do
delete :destroy, request_params
delete :destroy, params: request_params
expect(response).to have_gitlab_http_status(200)
end
it "deletes the note" do
expect { delete :destroy, request_params }.to change { Note.count }.from(1).to(0)
expect { delete :destroy, params: request_params }.to change { Note.count }.from(1).to(0)
end
end
......@@ -131,7 +131,7 @@ describe Groups::Epics::NotesController do
end
it "returns status 404" do
delete :destroy, request_params
delete :destroy, params: request_params
expect(response).to have_gitlab_http_status(404)
end
......@@ -154,17 +154,17 @@ describe Groups::Epics::NotesController do
it "toggles the award emoji" do
expect do
post(:toggle_award_emoji, request_params.merge(name: "thumbsup"))
post(:toggle_award_emoji, params: request_params.merge(name: "thumbsup"))
end.to change { note.award_emoji.count }.by(1)
expect(response).to have_gitlab_http_status(200)
end
it "removes the already awarded emoji" do
post(:toggle_award_emoji, request_params.merge(name: "thumbsup"))
post(:toggle_award_emoji, params: request_params.merge(name: "thumbsup"))
expect do
post(:toggle_award_emoji, request_params.merge(name: "thumbsup"))
post(:toggle_award_emoji, params: request_params.merge(name: "thumbsup"))
end.to change { AwardEmoji.count }.by(-1)
expect(response).to have_gitlab_http_status(200)
......
ee/spec/controllers/groups/epics_controller_spec.rb
View file @ 77b85029
......@@ -20,19 +20,19 @@ describe Groups::EpicsController do
end
describe 'GET #index' do
subject { get :index, group_id: group }
subject { get :index, params: { group_id: group } }
it_behaves_like '404 status'
end
describe 'GET #show' do
subject { get :show, group_id: group, id: epic.to_param }
subject { get :show, params: { group_id: group, id: epic.to_param } }
it_behaves_like '404 status'
end
describe 'PUT #update' do
subject { put :update, group_id: group, id: epic.to_param }
subject { put :update, params: { group_id: group, id: epic.to_param } }
it_behaves_like '404 status'
end
......@@ -52,7 +52,7 @@ describe Groups::EpicsController do
end
it "returns index" do
get :index, group_id: group
get :index, params: { group_id: group }
expect(response).to have_gitlab_http_status(200)
end
......@@ -62,7 +62,7 @@ describe Groups::EpicsController do
group.update!(visibility_level: Gitlab::VisibilityLevel::PUBLIC)
sign_out(user)
get :index, group_id: group, sort: 'start_date_asc'
get :index, params: { group_id: group, sort: 'start_date_asc' }
expect(cookies['epic_sort']).to eq('start_date_asc')
expect(response).to have_gitlab_http_status(200)
......@@ -72,7 +72,7 @@ describe Groups::EpicsController do
context 'when there is a logged in user' do
context 'when epics_sort is nil' do
it 'stores sorting param in user preferences' do
get :index, group_id: group, sort: 'start_date_asc'
get :index, params: { group_id: group, sort: 'start_date_asc' }
expect(user.user_preference.epics_sort).to eq('start_date_asc')
expect(response).to have_gitlab_http_status(200)
......@@ -83,7 +83,7 @@ describe Groups::EpicsController do
it 'update epics_sort with current value' do
user.user_preference.update(epics_sort: 'created_desc')
get :index, group_id: group, sort: 'start_date_asc'
get :index, params: { group_id: group, sort: 'start_date_asc' }
expect(user.reload.user_preference.epics_sort).to eq('start_date_asc')
expect(response).to have_gitlab_http_status(200)
......@@ -99,20 +99,20 @@ describe Groups::EpicsController do
end
it 'redirects to last_page if page number is larger than number of pages' do
get :index, group_id: group, page: (last_page + 1).to_param
get :index, params: { group_id: group, page: (last_page + 1).to_param }
expect(response).to redirect_to(group_epics_path(page: last_page, state: controller.params[:state], scope: controller.params[:scope]))
end
it 'renders the specified page' do
get :index, group_id: group, page: last_page.to_param
get :index, params: { group_id: group, page: last_page.to_param }
expect(assigns(:epics).current_page).to eq(last_page)
expect(response).to have_gitlab_http_status(200)
end
it_behaves_like 'disabled when using an external authorization service' do
subject { get :index, group_id: group }
subject { get :index, params: { group_id: group } }
end
end
......@@ -122,7 +122,7 @@ describe Groups::EpicsController do
end
def list_epics
get :index, group_id: group, format: :json
get :index, params: { group_id: group }, format: :json
end
it 'returns a list of epics' do
......@@ -153,7 +153,7 @@ describe Groups::EpicsController do
let!(:labeled_epic) { create(:labeled_epic, group: group, labels: [label]) }
it 'returns all epics with given label' do
get :index, group_id: group, label_name: label.title, format: :json
get :index, params: { group_id: group, label_name: label.title }, format: :json
expect(json_response.size).to eq(1)
expect(json_response.first['id']).to eq(labeled_epic.id)
......@@ -174,7 +174,7 @@ describe Groups::EpicsController do
let(:issue) { create(:issue, project: project, description: "Project Issue") }
it 'the link to the issue is included' do
get :discussions, group_id: group, id: epic.to_param
get :discussions, params: { group_id: group, id: epic.to_param }
expect(response).to have_gitlab_http_status(200)
expect(json_response.size).to eq(1)
......@@ -201,7 +201,7 @@ describe Groups::EpicsController do
describe 'GET #show' do
def show_epic(format = :html)
get :show, group_id: group, id: epic.to_param, format: format
get :show, params: { group_id: group, id: epic.to_param }, format: format
end
context 'when format is HTML' do
......@@ -316,12 +316,12 @@ describe Groups::EpicsController do
end
def update_epic(epic, params)
put :update, group_id: epic.group.to_param, id: epic.to_param, epic: params, format: :json
put :update, params: { group_id: epic.group.to_param, id: epic.to_param, epic: params }, format: :json
end
end
describe 'GET #realtime_changes' do
subject { get :realtime_changes, group_id: group, id: epic.to_param }
subject { get :realtime_changes, params: { group_id: group, id: epic.to_param } }
it 'returns epic' do
group.add_developer(user)
......@@ -348,7 +348,7 @@ describe Groups::EpicsController do
describe '#create' do
subject do
post :create, group_id: group, epic: { title: 'new epic', description: 'some descripition', label_ids: [label.id] }
post :create, params: { group_id: group, epic: { title: 'new epic', description: 'some descripition', label_ids: [label.id] } }
end
context 'when user has permissions to create an epic' do
......@@ -382,7 +382,7 @@ describe Groups::EpicsController do
context 'when required parameter is missing' do
before do
post :create, group_id: group, epic: { description: 'some descripition' }
post :create, params: { group_id: group, epic: { description: 'some descripition' } }
end
it 'returns 422 response' do
......@@ -412,14 +412,14 @@ describe Groups::EpicsController do
it "rejects a developer to destroy an epic" do
group.add_developer(user)
delete :destroy, group_id: group, id: epic.to_param
delete :destroy, params: { group_id: group, id: epic.to_param }
expect(response).to have_gitlab_http_status(404)
end
it "deletes the epic" do
group.add_owner(user)
delete :destroy, group_id: group, id: epic.to_param
delete :destroy, params: { group_id: group, id: epic.to_param }
expect(response).to have_gitlab_http_status(302)
expect(controller).to set_flash[:notice].to(/The epic was successfully deleted\./)
......
ee/spec/controllers/groups/group_members_controller_spec.rb
View file @ 77b85029
......@@ -19,7 +19,7 @@ describe Groups::GroupMembersController do
describe 'GET #index' do
it 'is successful' do
get :index, group_id: group
get :index, params: { group_id: group }
expect(response).to have_gitlab_http_status(200)
end
......@@ -27,7 +27,7 @@ describe Groups::GroupMembersController do
describe 'POST #create' do
it 'is successful' do
post :create, group_id: group, users: user, access_level: Gitlab::Access::GUEST
post :create, params: { group_id: group, users: user, access_level: Gitlab::Access::GUEST }
expect(response).to have_gitlab_http_status(302)
end
......@@ -36,9 +36,11 @@ describe Groups::GroupMembersController do
describe 'PUT #update' do
it 'is successful' do
put :update,
group_member: { access_level: Gitlab::Access::GUEST },
group_id: group,
id: membership,
params: {
group_member: { access_level: Gitlab::Access::GUEST },
group_id: group,
id: membership
},
format: :js
expect(response).to have_gitlab_http_status(200)
......@@ -47,7 +49,7 @@ describe Groups::GroupMembersController do
describe 'DELETE #destroy' do
it 'is successful' do
delete :destroy, group_id: group, id: membership
delete :destroy, params: { group_id: group, id: membership }
expect(response).to have_gitlab_http_status(302)
end
......@@ -57,7 +59,7 @@ describe Groups::GroupMembersController do
it 'is successful' do
sign_in(create(:user))
post :request_access, group_id: group
post :request_access, params: { group_id: group }
expect(response).to have_gitlab_http_status(302)
end
......@@ -66,7 +68,7 @@ describe Groups::GroupMembersController do
describe 'POST #approve_request_access' do
it 'is successful' do
access_request = create(:group_member, :access_request, group: group)
post :approve_access_request, group_id: group, id: access_request
post :approve_access_request, params: { group_id: group, id: access_request }
expect(response).to have_gitlab_http_status(302)
end
......@@ -76,7 +78,7 @@ describe Groups::GroupMembersController do
it 'is successful' do
group.add_owner(create(:user))
delete :leave, group_id: group
delete :leave, params: { group_id: group }
expect(response).to have_gitlab_http_status(302)
end
......@@ -84,7 +86,7 @@ describe Groups::GroupMembersController do
describe 'POST #resend_invite' do
it 'is successful' do
post :resend_invite, group_id: group, id: membership
post :resend_invite, params: { group_id: group, id: membership }
expect(response).to have_gitlab_http_status(302)
end
......@@ -98,9 +100,11 @@ describe Groups::GroupMembersController do
allow(Ability).to receive(:allowed?).with(user, :override_group_member, membership) { true }
post :override,
group_id: group,
id: membership,
group_member: { override: true },
params: {
group_id: group,
id: membership,
group_member: { override: true }
},
format: :js
expect(response).to have_gitlab_http_status(200)
......
ee/spec/controllers/groups/groups_controller_spec.rb
View file @ 77b85029
......@@ -18,13 +18,13 @@ describe GroupsController do
describe 'GET #show' do
it 'is successful' do
get :show, id: group.to_param
get :show, params: { id: group.to_param }
expect(response).to have_gitlab_http_status(200)
end
it 'does not allow other formats' do
get :show, id: group.to_param, format: :atom
get :show, params: { id: group.to_param }, format: :atom
expect(response).to have_gitlab_http_status(403)
end
......@@ -32,7 +32,7 @@ describe GroupsController do
describe 'GET #edit' do
it 'is successful' do
get :edit, id: group.to_param
get :edit, params: { id: group.to_param }
expect(response).to have_gitlab_http_status(200)
end
......@@ -58,7 +58,7 @@ describe GroupsController do
describe 'POST #create' do
it 'creates a group' do
expect do
post :create, group: { name: 'a name', path: 'a-name' }
post :create, params: { group: { name: 'a name', path: 'a-name' } }
end.to change { Group.count }.by(1)
end
end
......@@ -66,7 +66,7 @@ describe GroupsController do
describe 'PUT #update' do
it 'updates a group' do
expect do
put :update, id: group.to_param, group: { name: 'world' }
put :update, params: { id: group.to_param, group: { name: 'world' } }
end.to change { group.reload.name }
end
......@@ -77,7 +77,7 @@ describe GroupsController do
stub_licensed_features(custom_file_templates_for_namespace: false)
expect do
post :update, id: group.to_param, group: { file_template_project_id: project.id }
post :update, params: { id: group.to_param, group: { file_template_project_id: project.id } }
end.not_to change { group.reload.file_template_project_id }
end
end
......@@ -89,7 +89,7 @@ describe GroupsController do
stub_licensed_features(custom_file_templates_for_namespace: true)
expect do
post :update, id: group.to_param, group: { file_template_project_id: project.id }
post :update, params: { id: group.to_param, group: { file_template_project_id: project.id } }
end.to change { group.reload.file_template_project_id }.to(project.id)
end
end
......@@ -97,7 +97,7 @@ describe GroupsController do
describe 'DELETE #destroy' do
it 'deletes the group' do
delete :destroy, id: group.to_param
delete :destroy, params: { id: group.to_param }
expect(response).to have_gitlab_http_status(302)
end
......@@ -105,19 +105,19 @@ describe GroupsController do
end
describe 'GET #activity' do
subject { get :activity, id: group.to_param }
subject { get :activity, params: { id: group.to_param } }
it_behaves_like 'disabled when using an external authorization service'
end
describe 'GET #issues' do
subject { get :issues, id: group.to_param }
subject { get :issues, params: { id: group.to_param } }
it_behaves_like 'disabled when using an external authorization service'
end
describe 'GET #merge_requests' do
subject { get :merge_requests, id: group.to_param }
subject { get :merge_requests, params: { id: group.to_param } }
it_behaves_like 'disabled when using an external authorization service'
end
......
ee/spec/controllers/groups/hooks_controller_spec.rb
View file @ 77b85029
......@@ -16,7 +16,7 @@ describe Groups::HooksController do
describe 'GET #index' do
it 'is successfull' do
get :index, group_id: group.to_param
get :index, params: { group_id: group.to_param }
expect(response).to have_gitlab_http_status(200)
end
......@@ -39,7 +39,7 @@ describe Groups::HooksController do
wiki_page_events: true
}
post :create, group_id: group.to_param, hook: hook_params
post :create, params: { group_id: group.to_param, hook: hook_params }
expect(response).to have_gitlab_http_status(302)
expect(group.hooks.size).to eq(1)
......@@ -55,7 +55,7 @@ describe Groups::HooksController do
describe 'GET #index' do
it 'renders a 404' do
get :index, group_id: group.to_param
get :index, params: { group_id: group.to_param }
expect(response).to have_gitlab_http_status(404)
end
......
ee/spec/controllers/groups/issues_analytics_controller_spec.rb
View file @ 77b85029
......@@ -16,7 +16,7 @@ describe Groups::IssuesAnalyticsController do
describe 'GET #show' do
context 'when issues analytics is not available for license' do
it 'renders 404' do
get :show, group_id: group.to_param
get :show, params: { group_id: group.to_param }
expect(response).to have_gitlab_http_status(404)
end
......@@ -30,7 +30,7 @@ describe Groups::IssuesAnalyticsController do
end
it 'renders 404' do
get :show, group_id: group.to_param
get :show, params: { group_id: group.to_param }
expect(response).to have_gitlab_http_status(404)
end
......@@ -43,7 +43,7 @@ describe Groups::IssuesAnalyticsController do
context 'as HTML' do
it 'renders show template' do
get :show, group_id: group.to_param, months_back: 2
get :show, params: { group_id: group.to_param, months_back: 2 }
expect(response).to render_template(:show)
end
......@@ -56,7 +56,7 @@ describe Groups::IssuesAnalyticsController do
it 'renders chart data as JSON' do
expected_result = { issue1.created_at.strftime(IssuablesAnalytics::DATE_FORMAT) => 2 }
get :show, group_id: group.to_param, format: :json
get :show, params: { group_id: group.to_param }, format: :json
expect(JSON.parse(response.body)).to include(expected_result)
end
......@@ -72,7 +72,7 @@ describe Groups::IssuesAnalyticsController do
it 'does not count issues which user cannot view' do
expected_result = { issue1.created_at.strftime(IssuablesAnalytics::DATE_FORMAT) => 1 }
get :show, group_id: group.to_param, format: :json
get :show, params: { group_id: group.to_param }, format: :json
expect(JSON.parse(response.body)).to include(expected_result)
end
......
ee/spec/controllers/groups/labels_controller_spec.rb
View file @ 77b85029
......@@ -11,7 +11,7 @@ describe Groups::LabelsController do
end
describe 'GET #index' do
subject { get :index, group_id: group.to_param }
subject { get :index, params: { group_id: group.to_param } }
it_behaves_like 'disabled when using an external authorization service'
end
......
ee/spec/controllers/groups/milestones_controller_spec.rb
View file @ 77b85029
......@@ -11,7 +11,7 @@ describe Groups::MilestonesController do
end
describe 'GET #index' do
subject { get :index, group_id: group.to_param }
subject { get :index, params: { group_id: group.to_param } }
it_behaves_like 'disabled when using an external authorization service'
end
......
ee/spec/controllers/groups/omniauth_callbacks_controller_spec.rb
View file @ 77b85029
......@@ -23,7 +23,7 @@ describe Groups::OmniauthCallbacksController do
sign_in(user)
expect do
post provider, group_id: group
post provider, params: { group_id: group }
end.to raise_error(AbstractController::ActionNotFound)
end
end
......@@ -43,24 +43,24 @@ describe Groups::OmniauthCallbacksController do
let(:user) { create(:omniauth_user, extern_uid: uid, provider: provider, saml_provider: saml_provider) }
it "redirects to RelayState" do
post provider, group_id: group, RelayState: '/explore'
post provider, params: { group_id: group, RelayState: '/explore' }
expect(response).to redirect_to('/explore')
end
it "displays a flash message verifying group sign in" do
post provider, group_id: group
post provider, params: { group_id: group }
expect(flash[:notice]).to start_with "Signed in with SAML"
end
it 'uses existing linked identity' do
expect { post provider, group_id: group }.not_to change(linked_accounts, :count)
expect { post provider, params: { group_id: group } }.not_to change(linked_accounts, :count)
end
it 'skips authenticity token based forgery protection' do
with_forgery_protection do
post provider, group_id: group
post provider, params: { group_id: group }
expect(response).not_to be_client_error
expect(response).not_to be_server_error
......@@ -74,7 +74,7 @@ describe Groups::OmniauthCallbacksController do
end
it 'displays warning to user' do
post provider, group_id: group
post provider, params: { group_id: group }
expect(flash[:notice]).to match(/has already been taken*/)
end
......@@ -82,19 +82,19 @@ describe Groups::OmniauthCallbacksController do
context "and identity hasn't been linked" do
it "links the identity" do
post provider, group_id: group
post provider, params: { group_id: group }
expect(group).to be_member(user)
end
it "redirects to RelayState" do
post provider, group_id: group, RelayState: '/explore'
post provider, params: { group_id: group, RelayState: '/explore' }
expect(response).to redirect_to('/explore')
end
it "displays a flash indicating the account has been linked" do
post provider, group_id: group
post provider, params: { group_id: group }
expect(flash[:notice]).to match(/SAML for .* was added/)
end
......@@ -103,13 +103,13 @@ describe Groups::OmniauthCallbacksController do
context "when not signed in" do
it "redirects to sign in page" do
post provider, group_id: group
post provider, params: { group_id: group }
expect(response).to redirect_to(new_user_session_path)
end
it "informs users that they need to sign in to the GitLab instance first" do
post provider, group_id: group
post provider, params: { group_id: group }
expect(flash[:notice]).to start_with("You must be signed in")
end
......@@ -140,14 +140,14 @@ describe Groups::OmniauthCallbacksController do
context "not signed in" do
it "doesn't disclose group existence" do
expect do
post :failure, group_id: group
post :failure, params: { group_id: group }
end.to raise_error(ActionController::RoutingError)
end
context "group doesn't exist" do
it "doesn't disclose group non-existence" do
expect do
post :failure, group_id: 'not-a-group'
post :failure, params: { group_id: 'not-a-group' }
end.to raise_error(ActionController::RoutingError)
end
end
......@@ -159,14 +159,14 @@ describe Groups::OmniauthCallbacksController do
end
it "has descriptive error flash" do
post :failure, group_id: group
post :failure, params: { group_id: group }
expect(flash[:alert]).to start_with("Unable to sign you in to the group with SAML due to")
expect(flash[:alert]).to include("Fingerprint mismatch")
end
it "redirects back go the SSO page" do
post :failure, group_id: group
post :failure, params: { group_id: group }
expect(response).to redirect_to(sso_group_saml_providers_path)
end
......@@ -179,7 +179,7 @@ describe Groups::OmniauthCallbacksController do
end
it "redirects to the settings page" do
post :failure, group_id: group
post :failure, params: { group_id: group }
expect(response).to redirect_to(group_saml_providers_path)
end
......
ee/spec/controllers/groups/roadmap_controller_spec.rb
View file @ 77b85029
......@@ -14,7 +14,7 @@ describe Groups::RoadmapController do
context 'when epics feature is disabled' do
it "returns 404 status" do
get :show, group_id: group
get :show, params: { group_id: group }
expect(response).to have_gitlab_http_status(404)
end
......@@ -26,7 +26,7 @@ describe Groups::RoadmapController do
end
it "returns 200 status" do
get :show, group_id: group
get :show, params: { group_id: group }
expect(response).to have_gitlab_http_status(200)
end
......@@ -36,7 +36,7 @@ describe Groups::RoadmapController do
group.update!(visibility_level: Gitlab::VisibilityLevel::PUBLIC)
sign_out(user)
get :show, group_id: group, sort: 'start_date_asc'
get :show, params: { group_id: group, sort: 'start_date_asc' }
expect(cookies['epic_sort']).to eq('start_date_asc')
expect(response).to have_gitlab_http_status(200)
......@@ -46,7 +46,7 @@ describe Groups::RoadmapController do
context 'when there is a user logged in' do
context 'when epics_sort is nil' do
it 'stores epics sorting param in user preference' do
get :show, group_id: group, sort: 'start_date_asc'
get :show, params: { group_id: group, sort: 'start_date_asc' }
expect(response).to have_gitlab_http_status(200)
expect(user.reload.user_preference.epics_sort).to eq('start_date_asc')
......@@ -57,7 +57,7 @@ describe Groups::RoadmapController do
it 'update epics_sort with current value' do
user.user_preference.update(epics_sort: 'created_desc')
get :show, group_id: group, sort: 'start_date_asc'
get :show, params: { group_id: group, sort: 'start_date_asc' }
expect(user.reload.user_preference.epics_sort).to eq('start_date_asc')
expect(response).to have_gitlab_http_status(200)
......
ee/spec/controllers/groups/saml_providers_controller_spec.rb
View file @ 77b85029
......@@ -26,19 +26,19 @@ describe Groups::SamlProvidersController do
shared_examples 'configuration is prevented' do
describe 'GET #show' do
subject { get :show, group_id: group }
subject { get :show, params: { group_id: group } }
it_behaves_like '404 status'
end
describe 'POST #create' do
subject { post :create, group_id: group, saml_provider: { enabled: 'false' } }
subject { post :create, params: { group_id: group, saml_provider: { enabled: 'false' } } }
it_behaves_like '404 status'
end
describe 'PUT #update' do
subject { put :update, group_id: group, saml_provider: { enabled: 'false' } }
subject { put :update, params: { group_id: group, saml_provider: { enabled: 'false' } } }
it_behaves_like '404 status'
end
......@@ -69,7 +69,7 @@ describe Groups::SamlProvidersController do
end
describe 'GET #show' do
subject { get :show, group_id: group }
subject { get :show, params: { group_id: group } }
it 'shows configuration page' do
group.add_owner(user)
......
ee/spec/controllers/groups/security/vulnerabilities_controller_spec.rb
View file @ 77b85029
......@@ -16,7 +16,7 @@ describe Groups::Security::VulnerabilitiesController do
end
describe 'GET index.json' do
subject { get :index, group_id: group, format: :json }
subject { get :index, params: { group_id: group }, format: :json }
context 'when security dashboard feature is disabled' do
before do
......@@ -77,7 +77,7 @@ describe Groups::Security::VulnerabilitiesController do
end
it "returns a list of vulnerabilities" do
get :index, group_id: group, page: 3, format: :json
get :index, params: { group_id: group, page: 3 }, format: :json
expect(response).to have_gitlab_http_status(200)
expect(json_response).to be_an(Array)
......@@ -99,7 +99,7 @@ describe Groups::Security::VulnerabilitiesController do
private
def get_summary
get :index, group_id: group, format: :json
get :index, params: { group_id: group }, format: :json
end
end
......@@ -148,7 +148,7 @@ describe Groups::Security::VulnerabilitiesController do
end
describe 'GET summary.json' do
subject { get :summary, group_id: group, format: :json }
subject { get :summary, params: { group_id: group }, format: :json }
context 'when security dashboard feature is disabled' do
before do
......@@ -216,7 +216,7 @@ describe Groups::Security::VulnerabilitiesController do
end
describe 'GET history.json' do
subject { get :history, group_id: group, format: :json }
subject { get :history, params: { group_id: group }, format: :json }
context 'when security dashboard feature is disabled' do
before do
......
ee/spec/controllers/groups/settings/ci_cd_controller_spec.rb
View file @ 77b85029
......@@ -18,7 +18,7 @@ describe Groups::Settings::CiCdController do
describe 'GET #show' do
it 'renders show with 200 status code' do
get :show, group_id: group
get :show, params: { group_id: group }
expect(response).to have_gitlab_http_status(200)
end
......
ee/spec/controllers/groups/sso_controller_spec.rb
View file @ 77b85029
......@@ -14,13 +14,13 @@ describe Groups::SsoController do
let!(:saml_provider) { create(:saml_provider, group: group) }
it 'has status 200' do
get :saml, group_id: group
get :saml, params: { group_id: group }
expect(response).to have_gitlab_http_status(200)
end
it 'passes group name to the view' do
get :saml, group_id: group
get :saml, params: { group_id: group }
expect(assigns[:group_name]).to eq 'our-group'
end
......@@ -29,7 +29,7 @@ describe Groups::SsoController do
it 'acts as route not found' do
sign_out(user)
get :saml, group_id: group
get :saml, params: { group_id: group }
expect(response).to redirect_to(new_user_session_path)
end
......@@ -39,7 +39,7 @@ describe Groups::SsoController do
let(:redirect_route) { group.redirect_routes.create(path: 'old-path') }
it 'redirects to new location' do
get :saml, group_id: redirect_route.path
get :saml, params: { group_id: redirect_route.path }
expect(response).to redirect_to(sso_group_saml_providers_path(group))
end
......@@ -49,7 +49,7 @@ describe Groups::SsoController do
context 'saml_provider is unconfigured for the group' do
context 'when user cannot configure Group SAML' do
it 'renders 404' do
get :saml, group_id: group
get :saml, params: { group_id: group }
expect(response).to have_gitlab_http_status(404)
end
......@@ -61,13 +61,13 @@ describe Groups::SsoController do
end
it 'redirects to the Group SAML config page' do
get :saml, group_id: group
get :saml, params: { group_id: group }
expect(response).to redirect_to(group_saml_providers_path)
end
it 'sets a flash message explaining that setup is required' do
get :saml, group_id: group
get :saml, params: { group_id: group }
expect(flash[:notice]).to match /not been configured/
end
......@@ -76,7 +76,7 @@ describe Groups::SsoController do
context 'group does not exist' do
it 'renders 404' do
get :saml, group_id: 'not-a-group'
get :saml, params: { group_id: 'not-a-group' }
expect(response).to have_gitlab_http_status(404)
end
......@@ -85,7 +85,7 @@ describe Groups::SsoController do
it 'acts as route not found' do
sign_out(user)
get :saml, group_id: 'not-a-group'
get :saml, params: { group_id: 'not-a-group' }
expect(response).to redirect_to(new_user_session_path)
end
......
ee/spec/controllers/groups/todos_controller_spec.rb
View file @ 77b85029
......@@ -9,9 +9,11 @@ describe Groups::TodosController do
describe 'POST create' do
def post_create
post :create,
group_id: group,
issuable_id: epic.id,
issuable_type: 'epic',
params: {
group_id: group,
issuable_id: epic.id,
issuable_type: 'epic'
},
format: :json
end
......
ee/spec/controllers/groups/variables_controller_spec.rb
View file @ 77b85029
......@@ -20,7 +20,7 @@ describe Groups::VariablesController do
let!(:variable) { create(:ci_group_variable, group: group) }
it 'is successful' do
get :show, group_id: group, format: :json
get :show, params: { group_id: group }, format: :json
expect(response).to have_gitlab_http_status(200)
end
......@@ -32,8 +32,10 @@ describe Groups::VariablesController do
it 'is successful' do
patch :update,
group_id: group,
variables_attributes: [{ id: variable.id, key: 'hello' }],
params: {
group_id: group,
variables_attributes: [{ id: variable.id, key: 'hello' }]
},
format: :json
expect(response).to have_gitlab_http_status(200)
......
ee/spec/controllers/oauth/applications_controller_spec.rb
View file @ 77b85029
......@@ -17,7 +17,7 @@ describe Oauth::ApplicationsController do
application = build(:oauth_application)
application_attributes = application.attributes.merge("scopes" => [])
expect { post :create, doorkeeper_application: application_attributes }.to change { SecurityEvent.count }.by(1)
expect { post :create, params: { doorkeeper_application: application_attributes } }.to change { SecurityEvent.count }.by(1)
end
end
end
......
ee/spec/controllers/oauth/geo_auth_controller_spec.rb
View file @ 77b85029
......@@ -22,7 +22,7 @@ describe Oauth::GeoAuthController do
it 'redirects to root_url when state is invalid' do
allow_any_instance_of(Gitlab::Geo::Oauth::LoginState).to receive(:valid?).and_return(false)
get :auth, state: login_state
get :auth, params: { state: login_state }
expect(response).to redirect_to(root_url)
end
......@@ -30,7 +30,7 @@ describe Oauth::GeoAuthController do
it "redirects to primary node's oauth endpoint" do
oauth_endpoint = Gitlab::Geo::Oauth::Session.new.authorize_url(redirect_uri: oauth_geo_callback_url, state: login_state)
get :auth, state: login_state
get :auth, params: { state: login_state }
expect(response).to redirect_to(oauth_endpoint)
end
......@@ -50,19 +50,19 @@ describe Oauth::GeoAuthController do
it 'redirects to login screen if state is invalid' do
allow_any_instance_of(Gitlab::Geo::Oauth::LoginState).to receive(:valid?).and_return(false)
get :callback, state: login_state
get :callback, params: { state: login_state }
expect(response).to redirect_to(new_user_session_path)
end
it 'redirects to redirect_url if state is valid' do
get :callback, state: login_state
get :callback, params: { state: login_state }
expect(response).to redirect_to(secondary_node.url)
end
it 'does not display a flash message if state is valid' do
get :callback, state: login_state
get :callback, params: { state: login_state }
expect(controller).to set_flash[:alert].to(nil)
end
......@@ -80,7 +80,7 @@ describe Oauth::GeoAuthController do
it 'handles invalid credentials error' do
oauth_endpoint = Gitlab::Geo::Oauth::Session.new.authorize_url(redirect_uri: oauth_geo_callback_url, state: login_state)
get :callback, state: login_state
get :callback, params: { state: login_state }
expect(response).to redirect_to(oauth_endpoint)
end
......@@ -95,7 +95,7 @@ describe Oauth::GeoAuthController do
end
it 'handles non-existent remote user error' do
get :callback, state: login_state
get :callback, params: { state: login_state }
expect(response.code).to eq '200'
expect(response.body).to include('Your account may have been deleted')
......@@ -111,7 +111,7 @@ describe Oauth::GeoAuthController do
end
it 'handles non-existent local user error' do
get :callback, state: login_state
get :callback, params: { state: login_state }
expect(response.code).to eq '200'
expect(response.body).to include('Your account may have been deleted')
......@@ -130,7 +130,7 @@ describe Oauth::GeoAuthController do
context 'when access_token is valid' do
it 'logs out and redirects to the root_url' do
get :logout, state: logout_state
get :logout, params: { state: logout_state }
expect(assigns(:current_user)).to be_nil
expect(response).to redirect_to root_url
......@@ -143,7 +143,7 @@ describe Oauth::GeoAuthController do
.to receive(:by_token)
.and_return(double(resource_owner_id: user.id, expired?: true))
get :logout, state: logout_state
get :logout, params: { state: logout_state }
expect(response.body).to include("There is a problem with the OAuth access_token: Token has expired")
end
......
ee/spec/controllers/oauth/jira/authorizations_controller_spec.rb
View file @ 77b85029
......@@ -3,7 +3,7 @@ require 'spec_helper'
describe Oauth::Jira::AuthorizationsController do
describe 'GET new' do
it 'redirects to OAuth authorization with correct params' do
get :new, client_id: 'client-123', redirect_uri: 'http://example.com/'
get :new, params: { client_id: 'client-123', redirect_uri: 'http://example.com/' }
expect(response).to redirect_to(oauth_authorization_url(client_id: 'client-123',
response_type: 'code',
......@@ -15,7 +15,7 @@ describe Oauth::Jira::AuthorizationsController do
it 'redirects to redirect_uri on session with code param' do
session['redirect_uri'] = 'http://example.com'
get :callback, code: 'hash-123'
get :callback, params: { code: 'hash-123' }
expect(response).to redirect_to('http://example.com?code=hash-123')
end
......@@ -23,7 +23,7 @@ describe Oauth::Jira::AuthorizationsController do
it 'redirects to redirect_uri on session with code param preserving existing query' do
session['redirect_uri'] = 'http://example.com?foo=bar'
get :callback, code: 'hash-123'
get :callback, params: { code: 'hash-123' }
expect(response).to redirect_to('http://example.com?foo=bar&code=hash-123')
end
......@@ -41,7 +41,7 @@ describe Oauth::Jira::AuthorizationsController do
{ 'access_token' => 'fake-123', 'scope' => 'foo', 'token_type' => 'bar' }
end
post :access_token, code: 'code-123', client_id: 'client-123', client_secret: 'secret-123'
post :access_token, params: { code: 'code-123', client_id: 'client-123', client_secret: 'secret-123' }
expect(response.body).to eq('access_token=fake-123&scope=foo&token_type=bar')
end
......
ee/spec/controllers/operations_controller_spec.rb
View file @ 77b85029
......@@ -155,7 +155,7 @@ describe OperationsController do
end
it 'adds projects to the dasboard' do
post :create, project_ids: [project_a.id, project_b.id.to_s]
post :create, params: { project_ids: [project_a.id, project_b.id.to_s] }
expect(response).to have_gitlab_http_status(200)
expect(json_response).to match_schema('dashboard/operations/add', dir: 'ee')
......@@ -168,7 +168,7 @@ describe OperationsController do
end
it 'cannot add a project twice' do
post :create, project_ids: [project_a.id, project_a.id]
post :create, params: { project_ids: [project_a.id, project_a.id] }
expect(response).to have_gitlab_http_status(200)
expect(json_response).to match_schema('dashboard/operations/add', dir: 'ee')
......@@ -181,7 +181,7 @@ describe OperationsController do
end
it 'does not add invalid project ids' do
post :create, project_ids: ['', -1, '-2']
post :create, params: { project_ids: ['', -1, '-2'] }
expect(response).to have_gitlab_http_status(200)
expect(json_response).to match_schema('dashboard/operations/add', dir: 'ee')
......@@ -203,7 +203,7 @@ describe OperationsController do
end
it 'does not add already added project' do
post :create, project_ids: [project.id]
post :create, params: { project_ids: [project.id] }
expect(response).to have_gitlab_http_status(200)
expect(json_response).to match_schema('dashboard/operations/add', dir: 'ee')
......@@ -240,7 +240,7 @@ describe OperationsController do
end
it 'removes a project successfully' do
delete :destroy, project_id: project.id
delete :destroy, params: { project_id: project.id }
expect(response).to have_gitlab_http_status(200)
......@@ -251,7 +251,7 @@ describe OperationsController do
context 'without projects' do
it 'cannot remove invalid project' do
delete :destroy, project_id: -1
delete :destroy, params: { project_id: -1 }
expect(response).to have_gitlab_http_status(204)
end
......
ee/spec/controllers/profiles/keys_controller_spec.rb
View file @ 77b85029
......@@ -11,7 +11,7 @@ describe Profiles::KeysController do
key = build(:key)
expect { post :create, key: key.attributes }.to change { SecurityEvent.count }.by(1)
expect { post :create, params: { key: key.attributes } }.to change { SecurityEvent.count }.by(1)
end
end
end
ee/spec/controllers/projects/approver_groups_controller_spec.rb
View file @ 77b85029
......@@ -19,10 +19,12 @@ describe Projects::ApproverGroupsController do
def destroy_merge_request_approver_group
delete :destroy,
namespace_id: project.namespace.to_param,
project_id: project.to_param,
merge_request_id: merge_request.to_param,
id: approver_group.id
params: {
namespace_id: project.namespace.to_param,
project_id: project.to_param,
merge_request_id: merge_request.to_param,
id: approver_group.id
}
end
context 'when the user cannot update approvers because they do not have access' do
......@@ -73,9 +75,11 @@ describe Projects::ApproverGroupsController do
def destroy_project_approver_group
delete :destroy,
namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: approver_group.id
params: {
namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: approver_group.id
}
end
context 'when the user cannot update approvers because they do not have access' do
......
ee/spec/controllers/projects/approvers_controller_spec.rb
View file @ 77b85029
......@@ -19,10 +19,12 @@ describe Projects::ApproversController do
def destroy_merge_request_approver
delete :destroy,
namespace_id: project.namespace.to_param,
project_id: project.to_param,
merge_request_id: merge_request.to_param,
id: approver.id
params: {
namespace_id: project.namespace.to_param,
project_id: project.to_param,
merge_request_id: merge_request.to_param,
id: approver.id
}
end
context 'when the user cannot update approvers because they do not have access' do
......@@ -73,9 +75,11 @@ describe Projects::ApproversController do
def destroy_project_approver
delete :destroy,
namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: approver.id
params: {
namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: approver.id
}
end
context 'when the user cannot update approvers because they do not have access' do
......
ee/spec/controllers/projects/boards_controller_spec.rb
View file @ 77b85029
......@@ -30,8 +30,10 @@ describe Projects::BoardsController do
end
def list_boards(format: :html)
get :index, namespace_id: project.namespace,
project_id: project,
get :index, params: {
namespace_id: project.namespace,
project_id: project
},
format: format
end
end
......@@ -116,9 +118,11 @@ describe Projects::BoardsController do
end
def create_board(board_params)
post :create, namespace_id: project.namespace.to_param,
project_id: project.to_param,
board: board_params,
post :create, params: {
namespace_id: project.namespace.to_param,
project_id: project.to_param,
board: board_params
},
format: :json
end
end
......@@ -189,10 +193,12 @@ describe Projects::BoardsController do
end
def update_board(board, update_params)
patch :update, namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: board.to_param,
board: update_params,
patch :update, params: {
namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: board.to_param,
board: update_params
},
format: :json
end
end
......@@ -235,9 +241,11 @@ describe Projects::BoardsController do
end
def remove_board(board:)
delete :destroy, namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: board.to_param,
delete :destroy, params: {
namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: board.to_param
},
format: :html
end
end
......
ee/spec/controllers/projects/clusters_controller_spec.rb
View file @ 77b85029
......@@ -69,10 +69,12 @@ describe Projects::ClustersController do
end
def go
get :metrics, format: :json,
namespace_id: project.namespace,
project_id: project,
id: cluster
get :metrics, params: {
namespace_id: project.namespace,
project_id: project,
id: cluster
},
format: :json
end
describe 'security' do
......
ee/spec/controllers/projects/environments_controller_spec.rb
View file @ 77b85029
......@@ -41,7 +41,7 @@ describe Projects::EnvironmentsController do
before do
stub_licensed_features(deploy_board: true)
get :index, environment_params(format: :json, scope: :available)
get :index, params: environment_params(format: :json, scope: :available)
end
it 'responds with matching schema' do
......@@ -63,7 +63,7 @@ describe Projects::EnvironmentsController do
before do
stub_licensed_features(deploy_board: false)
get :index, environment_params(format: :json)
get :index, params: environment_params(format: :json)
end
it 'does not return the rollout_status_path attribute' do
......@@ -94,7 +94,7 @@ describe Projects::EnvironmentsController do
end
it 'renders forbidden' do
get :logs, environment_params(pod_name: pod_name)
get :logs, params: environment_params(pod_name: pod_name)
expect(response).to have_gitlab_http_status(:not_found)
end
......@@ -102,7 +102,7 @@ describe Projects::EnvironmentsController do
context 'when using HTML format' do
it 'renders logs template' do
get :logs, environment_params(pod_name: pod_name)
get :logs, params: environment_params(pod_name: pod_name)
expect(response).to be_ok
expect(response).to render_template 'logs'
......@@ -111,7 +111,7 @@ describe Projects::EnvironmentsController do
context 'when using JSON format' do
it 'returns the logs for a specific pod' do
get :logs, environment_params(pod_name: pod_name, format: :json)
get :logs, params: environment_params(pod_name: pod_name, format: :json)
expect(response).to be_ok
expect(json_response["logs"]).to match_array(["Log 1", "Log 2", "Log 3"])
......@@ -133,7 +133,7 @@ describe Projects::EnvironmentsController do
before do
protected_environment
get :terminal, environment_params
get :terminal, params: environment_params
end
it 'should response with access denied' do
......@@ -145,7 +145,7 @@ describe Projects::EnvironmentsController do
before do
protected_environment.deploy_access_levels.create(user: user)
get :terminal, environment_params
get :terminal, params: environment_params
end
it 'should be successful' do
......@@ -156,7 +156,7 @@ describe Projects::EnvironmentsController do
context 'when environment is not protected' do
it 'should be successful' do
get :terminal, environment_params
get :terminal, params: environment_params
expect(response).to have_gitlab_http_status(200)
end
......
ee/spec/controllers/projects/feature_flags_controller_spec.rb
View file @ 77b85029
......@@ -17,7 +17,7 @@ describe Projects::FeatureFlagsController do
describe 'GET index' do
render_views
subject { get(:index, view_params) }
subject { get(:index, params: view_params) }
context 'when there is no feature flags' do
before do
......@@ -63,7 +63,7 @@ describe Projects::FeatureFlagsController do
describe 'GET new' do
render_views
subject { get(:new, view_params) }
subject { get(:new, params: view_params) }
it 'renders the form' do
subject
......@@ -77,7 +77,7 @@ describe Projects::FeatureFlagsController do
describe 'POST create' do
render_views
subject { post(:create, params) }
subject { post(:create, params: params) }
context 'when creating a new feature flag' do
let(:params) do
......@@ -112,7 +112,7 @@ describe Projects::FeatureFlagsController do
render_views
subject { post(:create, params) }
subject { post(:create, params: params) }
context 'when updating an existing feature flag' do
let(:params) do
......
ee/spec/controllers/projects/imports_controller_spec.rb
View file @ 77b85029
......@@ -17,9 +17,11 @@ describe Projects::ImportsController do
new_user = create(:user)
project.add_maintainer(new_user)
post :create, namespace_id: project.namespace.to_param,
project_id: project,
project: { mirror: true, mirror_user_id: new_user.id, import_url: 'http://local.dev' },
post :create, params: {
namespace_id: project.namespace.to_param,
project_id: project,
project: { mirror: true, mirror_user_id: new_user.id, import_url: 'http://local.dev' }
},
format: :json
expect(project.reload.mirror).to eq(true)
......
ee/spec/controllers/projects/issues_controller_spec.rb
View file @ 77b85029
......@@ -14,7 +14,7 @@ describe Projects::IssuesController do
end
it_behaves_like 'unauthorized when external service denies access' do
subject { get :index, namespace_id: project.namespace, project_id: project }
subject { get :index, params: { namespace_id: project.namespace, project_id: project } }
end
end
......@@ -33,7 +33,7 @@ describe Projects::IssuesController do
end
def request_csv
post :export_csv, namespace_id: project.namespace.to_param, project_id: project.to_param
post :export_csv, params: { namespace_id: project.namespace.to_param, project_id: project.to_param }
end
context 'unlicensed' do
......@@ -198,7 +198,7 @@ describe Projects::IssuesController do
describe 'GET service_desk' do
def get_service_desk(extra_params = {})
get :service_desk, extra_params.merge(namespace_id: project.namespace, project_id: project)
get :service_desk, params: extra_params.merge(namespace_id: project.namespace, project_id: project)
end
context 'when Service Desk is available on the project' do
......@@ -265,7 +265,7 @@ describe Projects::IssuesController do
end
it 'displays related notes' do
get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid
get :discussions, params: { namespace_id: project.namespace, project_id: project, id: issue.iid }
discussions = json_response
notes = discussions.flat_map {|d| d['notes']}
......@@ -283,7 +283,7 @@ describe Projects::IssuesController do
end
it 'redacts note related to a confidential issue' do
get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid
get :discussions, params: { namespace_id: project.namespace, project_id: project, id: issue.iid }
discussions = json_response
notes = discussions.flat_map {|d| d['notes']}
......
ee/spec/controllers/projects/jobs_controller_spec.rb
View file @ 77b85029
......@@ -122,7 +122,7 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
project_id: project
}
get :show, params.merge(extra_params)
get :show, params: params.merge(extra_params)
end
end
end
ee/spec/controllers/projects/managed_licenses_controller_spec.rb
View file @ 77b85029
......@@ -43,7 +43,7 @@ describe Projects::ManagedLicensesController do
subject do
allow(controller).to receive(:current_user).and_return(user)
get :index, namespace_id: project.namespace.to_param, project_id: project, format: :json
get :index, params: { namespace_id: project.namespace.to_param, project_id: project }, format: :json
end
context 'with license management not available' do
......@@ -101,9 +101,11 @@ describe Projects::ManagedLicensesController do
allow(controller).to receive(:current_user).and_return(user)
get :show,
namespace_id: project.namespace.to_param,
project_id: project,
id: software_license_policy.id,
params: {
namespace_id: project.namespace.to_param,
project_id: project,
id: software_license_policy.id
},
format: :json
end
......@@ -152,9 +154,11 @@ describe Projects::ManagedLicensesController do
allow(controller).to receive(:current_user).and_return(user)
get :show,
namespace_id: project.namespace.to_param,
project_id: project,
id: CGI.escape(software_license_policy.name),
params: {
namespace_id: project.namespace.to_param,
project_id: project,
id: CGI.escape(software_license_policy.name)
},
format: :json
end
......@@ -188,9 +192,11 @@ describe Projects::ManagedLicensesController do
allow(controller).to receive(:current_user).and_return(user)
post :create,
namespace_id: project.namespace.to_param,
project_id: project,
managed_license: to_create_software_license_policy_attributes,
params: {
namespace_id: project.namespace.to_param,
project_id: project,
managed_license: to_create_software_license_policy_attributes
},
format: :json
end
......@@ -297,10 +303,12 @@ describe Projects::ManagedLicensesController do
allow(controller).to receive(:current_user).and_return(user)
patch :update,
namespace_id: project.namespace.to_param,
project_id: project,
id: software_license_policy.id,
managed_license: modified_software_license_policy_attributes,
params: {
namespace_id: project.namespace.to_param,
project_id: project,
id: software_license_policy.id,
managed_license: modified_software_license_policy_attributes
},
format: :json
end
......@@ -401,9 +409,11 @@ describe Projects::ManagedLicensesController do
allow(controller).to receive(:current_user).and_return(user)
delete :destroy,
namespace_id: project.namespace.to_param,
project_id: project,
id: id_to_destroy,
params: {
namespace_id: project.namespace.to_param,
project_id: project,
id: id_to_destroy
},
format: :json
end
......
ee/spec/controllers/projects/merge_requests/creations_controller_spec.rb
View file @ 77b85029
......@@ -23,7 +23,7 @@ describe Projects::MergeRequests::CreationsController do
}.merge(overrides)
}
post :create, params
post :create, params: params
end
context 'the approvals_before_merge param' do
......
ee/spec/controllers/projects/merge_requests/drafts_controller_spec.rb
View file @ 77b85029
......@@ -24,7 +24,7 @@ describe Projects::MergeRequests::DraftsController do
let!(:draft_note) { create(:draft_note, merge_request: merge_request, author: user) }
it 'list merge request draft notes for current user' do
get :index, params
get :index, params: params
expect(json_response.first['merge_request_id']).to eq(merge_request.id)
expect(json_response.first['author']['id']).to eq(user.id)
......@@ -40,7 +40,7 @@ describe Projects::MergeRequests::DraftsController do
}.merge(draft_overrides)
}.merge(overrides))
post :create, post_params
post :create, params: post_params
end
context 'without permissions' do
......@@ -147,7 +147,7 @@ describe Projects::MergeRequests::DraftsController do
}.merge(overrides)
})
put :update, put_params
put :update, params: put_params
end
context 'without permissions' do
......@@ -186,7 +186,7 @@ describe Projects::MergeRequests::DraftsController do
it 'does not allow publishing draft note belonging to someone else' do
draft = create(:draft_note, merge_request: merge_request, author: user)
expect { post :publish, params.merge(id: draft.id) }.to change { Note.count }.by(0)
expect { post :publish, params: params.merge(id: draft.id) }.to change { Note.count }.by(0)
.and change { DraftNote.count }.by(0)
expect(response).to have_gitlab_http_status(404)
......@@ -202,7 +202,7 @@ describe Projects::MergeRequests::DraftsController do
allow(service).to receive(:execute).and_return({ message: error_message, status: :error })
end
post :publish, params
post :publish, params: params
expect(response).to have_gitlab_http_status(:error)
expect(json_response["message"]).to include(error_message)
......@@ -222,7 +222,7 @@ describe Projects::MergeRequests::DraftsController do
draft = create(:draft_note_on_text_diff, merge_request: merge_request, author: user, position: position)
expect { post :publish, params }.to change { Note.count }.by(1)
expect { post :publish, params: params }.to change { Note.count }.by(1)
.and change { DraftNote.count }.by(-1)
note = merge_request.notes.reload.last
......@@ -232,7 +232,7 @@ describe Projects::MergeRequests::DraftsController do
end
it 'does nothing if there are no draft notes' do
expect { post :publish, params }.to change { Note.count }.by(0).and change { DraftNote.count }.by(0)
expect { post :publish, params: params }.to change { Note.count }.by(0).and change { DraftNote.count }.by(0)
end
it 'publishes a draft note with quick actions and applies them' do
......@@ -240,7 +240,7 @@ describe Projects::MergeRequests::DraftsController do
expect(merge_request.assignee_id).to be_nil
expect { post :publish, params }.to change { Note.count }.by(1)
expect { post :publish, params: params }.to change { Note.count }.by(1)
.and change { DraftNote.count }.by(-1)
expect(response).to have_gitlab_http_status(200)
......@@ -259,7 +259,7 @@ describe Projects::MergeRequests::DraftsController do
diff_note = create(:diff_note_on_merge_request, noteable: merge_request, project: project)
diff_draft_reply = create(:draft_note, draft_params.merge(discussion_id: diff_note.discussion_id))
expect { post :publish, params }.to change { Note.count }.by(6)
expect { post :publish, params: params }.to change { Note.count }.by(6)
.and change { DraftNote.count }.by(-6)
expect(response).to have_gitlab_http_status(200)
......@@ -276,7 +276,7 @@ describe Projects::MergeRequests::DraftsController do
drafts = create_list(:draft_note, 4, draft_params)
expect { post :publish, params.merge(id: drafts.first.id) }.to change { Note.count }.by(1)
expect { post :publish, params: params.merge(id: drafts.first.id) }.to change { Note.count }.by(1)
.and change { DraftNote.count }.by(-1)
end
......@@ -295,7 +295,7 @@ describe Projects::MergeRequests::DraftsController do
it 'resolves a discussion if the draft note resolves it' do
draft_reply = create_reply(note.discussion_id, resolves: true)
post :publish, params
post :publish, params: params
discussion = note.discussion
......@@ -310,7 +310,7 @@ describe Projects::MergeRequests::DraftsController do
draft_reply = create_reply(note.discussion_id, resolves: false)
post :publish, params
post :publish, params: params
discussion = note.discussion
......@@ -336,7 +336,7 @@ describe Projects::MergeRequests::DraftsController do
it 'does not allow destroying a draft note belonging to someone else' do
draft = create(:draft_note, merge_request: merge_request, author: user)
expect { post :destroy, params.merge(id: draft.id) }
expect { post :destroy, params: params.merge(id: draft.id) }
.not_to change { DraftNote.count }
expect(response).to have_gitlab_http_status(404)
......@@ -346,7 +346,7 @@ describe Projects::MergeRequests::DraftsController do
it 'destroys the draft note when ID is given' do
draft = create_draft
expect { delete :destroy, params.merge(id: draft.id) }.to change { DraftNote.count }.by(-1)
expect { delete :destroy, params: params.merge(id: draft.id) }.to change { DraftNote.count }.by(-1)
expect(response).to have_gitlab_http_status(200)
end
......@@ -358,7 +358,7 @@ describe Projects::MergeRequests::DraftsController do
it 'does not allow editing draft note belonging to someone else' do
draft = create_draft
expect { delete :destroy, params.merge(id: draft.id) }.to change { DraftNote.count }.by(0)
expect { delete :destroy, params: params.merge(id: draft.id) }.to change { DraftNote.count }.by(0)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -368,7 +368,7 @@ describe Projects::MergeRequests::DraftsController do
it 'deletes all DraftNotes belonging to a user in a Merge Request' do
create_list(:draft_note, 6, merge_request: merge_request, author: user)
expect { delete :discard, params }.to change { DraftNote.count }.by(-6)
expect { delete :discard, params: params }.to change { DraftNote.count }.by(-6)
expect(response).to have_gitlab_http_status(200)
end
......@@ -381,7 +381,7 @@ describe Projects::MergeRequests::DraftsController do
it 'does not destroys a draft note belonging to someone else' do
create(:draft_note, merge_request: merge_request, author: user)
expect { post :discard, params }
expect { post :discard, params: params }
.not_to change { DraftNote.count }
expect(response).to have_gitlab_http_status(200)
......@@ -394,7 +394,7 @@ describe Projects::MergeRequests::DraftsController do
it 'does not return existing drafts' do
create_list(:draft_note, 4, merge_request: merge_request, author: user)
get :index, params
get :index, params: params
expect(json_response).to eq([])
end
......@@ -403,7 +403,7 @@ describe Projects::MergeRequests::DraftsController do
context 'POST #create' do
it 'errors out' do
expect do
post :create, params.merge(draft_note: { note: 'comment' })
post :create, params: params.merge(draft_note: { note: 'comment' })
end.to change { DraftNote.count }.by(0)
expect(response).to have_gitlab_http_status(403)
......@@ -415,7 +415,7 @@ describe Projects::MergeRequests::DraftsController do
draft = create(:draft_note, merge_request: merge_request, author: user)
expect do
put :update, params.merge(id: draft.id, draft_note: { note: 'comment' })
put :update, params: params.merge(id: draft.id, draft_note: { note: 'comment' })
end.to change { DraftNote.count }.by(0)
expect(response).to have_gitlab_http_status(403)
......@@ -426,7 +426,7 @@ describe Projects::MergeRequests::DraftsController do
it 'errors out' do
draft = create(:draft_note, merge_request: merge_request, author: user)
expect { delete :destroy, params.merge(id: draft.id) }.to change { DraftNote.count }.by(0)
expect { delete :destroy, params: params.merge(id: draft.id) }.to change { DraftNote.count }.by(0)
expect(response).to have_gitlab_http_status(403)
end
end
......@@ -439,7 +439,7 @@ describe Projects::MergeRequests::DraftsController do
context 'POST #publish' do
it 'errors out' do
expect do
post :publish, params
post :publish, params: params
end.to change { DraftNote.count }.by(0).and change { Note.count }.by(0)
expect(response).to have_gitlab_http_status(403)
......@@ -450,7 +450,7 @@ describe Projects::MergeRequests::DraftsController do
context 'DELETE #discard' do
it 'errors out' do
expect do
delete :discard, params
delete :discard, params: params
end.to change { DraftNote.count }.by(0)
expect(response).to have_gitlab_http_status(403)
......
ee/spec/controllers/projects/merge_requests_controller_spec.rb
View file @ 77b85029
......@@ -16,9 +16,11 @@ shared_examples 'approvals' do
describe 'approve' do
before do
post :approve,
namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: merge_request.iid,
params: {
namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: merge_request.iid
},
format: :json
end
......@@ -41,9 +43,11 @@ shared_examples 'approvals' do
before do
get :approvals,
namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: merge_request.iid,
params: {
namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: merge_request.iid
},
format: :json
end
......@@ -66,9 +70,11 @@ shared_examples 'approvals' do
before do
delete :unapprove,
namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: merge_request.iid,
params: {
namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: merge_request.iid
},
format: :json
end
......@@ -106,10 +112,12 @@ describe Projects::MergeRequestsController do
def update_merge_request(params = {})
post :update,
namespace_id: merge_request.target_project.namespace.to_param,
project_id: merge_request.target_project.to_param,
id: merge_request.iid,
merge_request: params
params: {
namespace_id: merge_request.target_project.namespace.to_param,
project_id: merge_request.target_project.to_param,
id: merge_request.iid,
merge_request: params
}
end
context 'when the merge request requires approval' do
......@@ -319,7 +327,7 @@ describe Projects::MergeRequestsController do
describe 'POST #rebase' do
def post_rebase
post :rebase, namespace_id: project.namespace, project_id: project, id: merge_request
post :rebase, params: { namespace_id: project.namespace, project_id: project, id: merge_request }
end
def expect_rebase_worker_for(user)
......
ee/spec/controllers/projects/mirrors_controller_spec.rb
View file @ 77b85029
......@@ -122,7 +122,7 @@ describe Projects::MirrorsController do
expect_any_instance_of(EE::ProjectImportState).to receive(:force_import_job!)
put :update_now, { namespace_id: project.namespace.to_param, project_id: project.to_param }
put :update_now, params: { namespace_id: project.namespace.to_param, project_id: project.to_param }
end
end
......@@ -218,6 +218,6 @@ describe Projects::MirrorsController do
attrs = extra_attrs.merge(namespace_id: project.namespace.to_param, project_id: project.to_param)
attrs[:project] = options
put :update, attrs
put :update, params: attrs
end
end
ee/spec/controllers/projects/pipelines_controller_spec.rb
View file @ 77b85029
......@@ -22,7 +22,7 @@ describe Projects::PipelinesController do
before do
stub_licensed_features(sast: true)
get :security, namespace_id: project.namespace, project_id: project, id: pipeline
get :security, params: { namespace_id: project.namespace, project_id: project, id: pipeline }
end
it do
......@@ -33,7 +33,7 @@ describe Projects::PipelinesController do
context 'with feature disabled' do
before do
get :security, namespace_id: project.namespace, project_id: project, id: pipeline
get :security, params: { namespace_id: project.namespace, project_id: project, id: pipeline }
end
it do
......@@ -47,7 +47,7 @@ describe Projects::PipelinesController do
before do
stub_licensed_features(sast: true)
get :security, namespace_id: project.namespace, project_id: project, id: pipeline
get :security, params: { namespace_id: project.namespace, project_id: project, id: pipeline }
end
it do
......@@ -57,7 +57,7 @@ describe Projects::PipelinesController do
context 'with feature disabled' do
before do
get :security, namespace_id: project.namespace, project_id: project, id: pipeline
get :security, params: { namespace_id: project.namespace, project_id: project, id: pipeline }
end
it do
......@@ -80,7 +80,7 @@ describe Projects::PipelinesController do
before do
stub_licensed_features(license_management: true)
get :licenses, namespace_id: project.namespace, project_id: project, id: pipeline
get :licenses, params: { namespace_id: project.namespace, project_id: project, id: pipeline }
end
it do
......@@ -91,7 +91,7 @@ describe Projects::PipelinesController do
context 'with feature disabled' do
before do
get :licenses, namespace_id: project.namespace, project_id: project, id: pipeline
get :licenses, params: { namespace_id: project.namespace, project_id: project, id: pipeline }
end
it do
......@@ -105,7 +105,7 @@ describe Projects::PipelinesController do
before do
stub_licensed_features(license_management: true)
get :licenses, namespace_id: project.namespace, project_id: project, id: pipeline
get :licenses, params: { namespace_id: project.namespace, project_id: project, id: pipeline }
end
it do
......@@ -115,7 +115,7 @@ describe Projects::PipelinesController do
context 'with feature disabled' do
before do
get :licenses, namespace_id: project.namespace, project_id: project, id: pipeline
get :licenses, params: { namespace_id: project.namespace, project_id: project, id: pipeline }
end
it do
......
ee/spec/controllers/projects/prometheus/alerts_controller_spec.rb
View file @ 77b85029
......@@ -19,13 +19,13 @@ describe Projects::Prometheus::AlertsController do
it 'renders forbidden when unlicensed' do
stub_licensed_features(prometheus_alerts: false)
get :index, project_params
get :index, params: project_params
expect(response).to have_gitlab_http_status(:not_found)
end
it 'returns an empty response' do
get :index, project_params
get :index, params: project_params
expect(response).to have_gitlab_http_status(200)
expect(JSON.parse(response.body)).to be_empty
......@@ -38,7 +38,7 @@ describe Projects::Prometheus::AlertsController do
end
it 'contains prometheus alerts' do
get :index, project_params
get :index, params: project_params
expect(response).to have_gitlab_http_status(200)
expect(JSON.parse(response.body).count).to eq(3)
......@@ -49,7 +49,7 @@ describe Projects::Prometheus::AlertsController do
describe 'GET #show' do
context 'when alert does not exist' do
it 'renders 404' do
get :show, project_params(id: PrometheusAlert.all.maximum(:prometheus_metric_id).to_i + 1)
get :show, params: project_params(id: PrometheusAlert.all.maximum(:prometheus_metric_id).to_i + 1)
expect(response).to have_gitlab_http_status(404)
end
......@@ -61,7 +61,7 @@ describe Projects::Prometheus::AlertsController do
it 'renders forbidden when unlicensed' do
stub_licensed_features(prometheus_alerts: false)
get :show, project_params(id: alert.prometheus_metric_id)
get :show, params: project_params(id: alert.prometheus_metric_id)
expect(response).to have_gitlab_http_status(:not_found)
end
......@@ -76,7 +76,7 @@ describe Projects::Prometheus::AlertsController do
"alert_path" => Gitlab::Routing.url_helpers.project_prometheus_alert_path(project, alert.prometheus_metric_id, environment_id: alert.environment.id, format: :json)
}
get :show, project_params(id: alert.prometheus_metric_id)
get :show, params: project_params(id: alert.prometheus_metric_id)
expect(response).to have_gitlab_http_status(200)
expect(JSON.parse(response.body)).to include(alert_params)
......@@ -95,7 +95,7 @@ describe Projects::Prometheus::AlertsController do
it 'sends a notification for firing alerts only' do
expect(notify_service).to receive(:execute).and_return(true)
post :notify, project_params(payload), as: :json
post :notify, params: project_params(payload), session: { as: :json }
expect(response).to have_gitlab_http_status(200)
end
......@@ -103,7 +103,7 @@ describe Projects::Prometheus::AlertsController do
it 'renders unprocessable entity if notification fails' do
expect(notify_service).to receive(:execute).and_return(false)
post :notify, project_params, as: :json
post :notify, params: project_params, session: { as: :json }
expect(response).to have_gitlab_http_status(422)
end
......@@ -113,7 +113,7 @@ describe Projects::Prometheus::AlertsController do
it 'renders forbidden when unlicensed' do
stub_licensed_features(prometheus_alerts: false)
post :create, project_params(
post :create, params: project_params(
operator: ">",
threshold: "1",
environment_id: environment.id,
......@@ -134,7 +134,7 @@ describe Projects::Prometheus::AlertsController do
allow(::Clusters::Applications::ScheduleUpdateService).to receive(:new).and_return(schedule_update_service)
post :create, project_params(
post :create, params: project_params(
operator: ">",
threshold: "1",
environment_id: environment.id,
......@@ -150,7 +150,7 @@ describe Projects::Prometheus::AlertsController do
let(:environment) { create(:environment) }
it 'returns 204 status' do
post :create, project_params(
post :create, params: project_params(
operator: ">",
threshold: "1",
environment_id: environment.id,
......@@ -173,7 +173,7 @@ describe Projects::Prometheus::AlertsController do
it 'renders forbidden when unlicensed' do
stub_licensed_features(prometheus_alerts: false)
put :update, project_params(id: alert.prometheus_metric_id, operator: "<")
put :update, params: project_params(id: alert.prometheus_metric_id, operator: "<")
expect(response).to have_gitlab_http_status(:not_found)
end
......@@ -189,7 +189,7 @@ describe Projects::Prometheus::AlertsController do
}
expect do
put :update, project_params(id: alert.prometheus_metric_id, operator: "<")
put :update, params: project_params(id: alert.prometheus_metric_id, operator: "<")
end.to change { alert.reload.operator }.to("lt")
expect(schedule_update_service).to have_received(:execute)
......@@ -209,14 +209,14 @@ describe Projects::Prometheus::AlertsController do
it 'renders forbidden when unlicensed' do
stub_licensed_features(prometheus_alerts: false)
delete :destroy, project_params(id: alert.prometheus_metric_id)
delete :destroy, params: project_params(id: alert.prometheus_metric_id)
expect(response).to have_gitlab_http_status(:not_found)
end
it 'destroys the specified prometheus alert' do
expect do
delete :destroy, project_params(id: alert.prometheus_metric_id)
delete :destroy, params: project_params(id: alert.prometheus_metric_id)
end.to change { PrometheusAlert.count }.from(1).to(0)
expect(schedule_update_service).to have_received(:execute)
......
ee/spec/controllers/projects/prometheus/metrics_controller_spec.rb
View file @ 77b85029
......@@ -25,7 +25,7 @@ describe Projects::Prometheus::MetricsController do
let(:validation_result) { { valid: true } }
it 'validation data is returned' do
post :validate_query, project_params(format: :json, query: query)
post :validate_query, params: project_params(format: :json, query: query)
expect(json_response).to eq('valid' => true)
end
......@@ -35,7 +35,7 @@ describe Projects::Prometheus::MetricsController do
let(:validation_result) { {} }
it 'validation data is returned' do
post :validate_query, project_params(format: :json, query: query)
post :validate_query, params: project_params(format: :json, query: query)
expect(response).to have_gitlab_http_status(204)
end
......@@ -47,7 +47,7 @@ describe Projects::Prometheus::MetricsController do
let!(:prometheus_metric) { create(:prometheus_metric, project: project) }
it 'returns a list of metrics' do
get :index, project_params(format: :json)
get :index, params: project_params(format: :json)
expect(response).to have_gitlab_http_status(200)
expect(response).to match_response_schema('prometheus/metrics', dir: 'ee')
......@@ -56,7 +56,7 @@ describe Projects::Prometheus::MetricsController do
context 'without custom metrics ' do
it 'returns an empty json' do
get :index, project_params(format: :json)
get :index, params: project_params(format: :json)
expect(response).to have_gitlab_http_status(200)
expect(json_response).to eq({})
......@@ -69,7 +69,7 @@ describe Projects::Prometheus::MetricsController do
let(:valid_metric) { { prometheus_metric: { title: 'title', query: 'query', group: 'business', y_label: 'label', unit: 'u', legend: 'legend' } } }
it 'shows a success flash message' do
post :create, project_params(valid_metric)
post :create, params: project_params(valid_metric)
expect(flash[:notice]).to include('Metric was successfully added.')
......@@ -81,7 +81,7 @@ describe Projects::Prometheus::MetricsController do
let(:invalid_metric) { { prometheus_metric: { title: 'title' } } }
it 'renders new metric page' do
post :create, project_params(invalid_metric)
post :create, params: project_params(invalid_metric)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template('new')
......@@ -94,7 +94,7 @@ describe Projects::Prometheus::MetricsController do
let!(:metric) { create(:prometheus_metric, project: project) }
it 'destroys the metric' do
delete :destroy, project_params(id: metric.id)
delete :destroy, params: project_params(id: metric.id)
expect(response).to redirect_to(edit_project_service_path(project, PrometheusService))
expect(PrometheusMetric.find_by(id: metric.id)).to be_nil
......@@ -105,7 +105,7 @@ describe Projects::Prometheus::MetricsController do
let!(:metric) { create(:prometheus_metric, project: project) }
it 'destroys the metric' do
delete :destroy, project_params(id: metric.id, format: :json)
delete :destroy, params: project_params(id: metric.id, format: :json)
expect(response).to have_gitlab_http_status(200)
expect(PrometheusMetric.find_by(id: metric.id)).to be_nil
......
ee/spec/controllers/projects/protected_environments_controller_spec.rb
View file @ 77b85029
......@@ -18,9 +18,11 @@ describe Projects::ProtectedEnvironmentsController do
subject do
post :create,
namespace_id: project.namespace.to_param,
project_id: project.to_param,
protected_environment: params
params: {
namespace_id: project.namespace.to_param,
project_id: project.to_param,
protected_environment: params
}
end
context 'with valid access and params' do
......@@ -97,10 +99,12 @@ describe Projects::ProtectedEnvironmentsController do
subject do
put :update,
namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: protected_environment.id,
protected_environment: params
params: {
namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: protected_environment.id,
protected_environment: params
}
end
context 'when the user is authorized' do
......@@ -141,9 +145,11 @@ describe Projects::ProtectedEnvironmentsController do
subject do
delete :destroy,
namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: protected_environment.id
params: {
namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: protected_environment.id
}
end
context 'when the user is authorized' do
......
ee/spec/controllers/projects/push_rules_controller_spec.rb
View file @ 77b85029
......@@ -12,7 +12,7 @@ describe Projects::PushRulesController do
describe '#update' do
def do_update
patch :update, namespace_id: project.namespace, project_id: project, id: 1, push_rule: { prevent_secrets: true }
patch :update, params: { namespace_id: project.namespace, project_id: project, id: 1, push_rule: { prevent_secrets: true } }
end
it 'updates the push rule' do
......@@ -40,7 +40,7 @@ describe Projects::PushRulesController do
let(:user) { create(:admin) }
it 'updates the setting' do
patch :update, namespace_id: project.namespace, project_id: project, id: 1, push_rule: { rule_attr => true }
patch :update, params: { namespace_id: project.namespace, project_id: project, id: 1, push_rule: { rule_attr => true } }
expect(project.push_rule(true).public_send(rule_attr)).to be_truthy
end
......@@ -53,7 +53,7 @@ describe Projects::PushRulesController do
context 'when global setting is disabled' do
it 'updates the setting' do
patch :update, namespace_id: project.namespace, project_id: project, id: 1, push_rule: { rule_attr => true }
patch :update, params: { namespace_id: project.namespace, project_id: project, id: 1, push_rule: { rule_attr => true } }
expect(project.push_rule(true).public_send(rule_attr)).to be_truthy
end
......@@ -65,7 +65,7 @@ describe Projects::PushRulesController do
end
it 'does not update the setting' do
patch :update, namespace_id: project.namespace, project_id: project, id: 1, push_rule: { rule_attr => false }
patch :update, params: { namespace_id: project.namespace, project_id: project, id: 1, push_rule: { rule_attr => false } }
expect(project.push_rule(true).public_send(rule_attr)).to be_truthy
end
......@@ -78,7 +78,7 @@ describe Projects::PushRulesController do
end
it 'does not update the setting' do
patch :update, namespace_id: project.namespace, project_id: project, id: 1, push_rule: { rule_attr => true }
patch :update, params: { namespace_id: project.namespace, project_id: project, id: 1, push_rule: { rule_attr => true } }
expect(project.push_rule(true).public_send(rule_attr)).to be_falsy
end
......
ee/spec/controllers/projects/security/dashboard_controller_spec.rb
View file @ 77b85029
......@@ -16,7 +16,7 @@ describe Projects::Security::DashboardController do
def show_security_dashboard(current_user = user)
sign_in(current_user)
get :show, namespace_id: project.namespace, project_id: project
get :show, params: { namespace_id: project.namespace, project_id: project }
end
context 'when security dashboard feature is enabled' do
......
ee/spec/controllers/projects/service_desk_controller_spec.rb
View file @ 77b85029
......@@ -16,7 +16,7 @@ describe Projects::ServiceDeskController do
describe 'GET service desk properties' do
it 'returns service_desk JSON data' do
get :show, namespace_id: project.namespace.to_param, project_id: project, format: :json
get :show, params: { namespace_id: project.namespace.to_param, project_id: project }, format: :json
body = JSON.parse(response.body)
......@@ -32,7 +32,7 @@ describe Projects::ServiceDeskController do
project.add_guest(guest)
sign_in(guest)
get :show, namespace_id: project.namespace.to_param, project_id: project, format: :json
get :show, params: { namespace_id: project.namespace.to_param, project_id: project }, format: :json
expect(response.status).to eq(404)
end
......@@ -43,7 +43,7 @@ describe Projects::ServiceDeskController do
it 'toggles services desk incoming email' do
project.update!(service_desk_enabled: false)
put :update, namespace_id: project.namespace.to_param, project_id: project, service_desk_enabled: true, format: :json
put :update, params: { namespace_id: project.namespace.to_param, project_id: project, service_desk_enabled: true }, format: :json
body = JSON.parse(response.body)
......@@ -57,7 +57,7 @@ describe Projects::ServiceDeskController do
it 'renders 404' do
sign_in(other_user)
put :update, namespace_id: project.namespace.to_param, project_id: project, service_desk_enabled: true, format: :json
put :update, params: { namespace_id: project.namespace.to_param, project_id: project, service_desk_enabled: true }, format: :json
expect(response.status).to eq(404)
end
......
ee/spec/controllers/projects/settings/integrations_controller_spec.rb
View file @ 77b85029
......@@ -11,7 +11,7 @@ describe Projects::Settings::IntegrationsController do
shared_examples 'endpoint with some disabled services' do
it 'has some disabled services' do
get :show, namespace_id: project.namespace, project_id: project
get :show, params: { namespace_id: project.namespace, project_id: project }
expect(active_services).not_to include(*disabled_services)
end
......@@ -19,7 +19,7 @@ describe Projects::Settings::IntegrationsController do
shared_examples 'endpoint without disabled services' do
it 'does not have disabled services' do
get :show, namespace_id: project.namespace, project_id: project
get :show, params: { namespace_id: project.namespace, project_id: project }
expect(active_services).to include(*disabled_services)
end
......@@ -30,7 +30,7 @@ describe Projects::Settings::IntegrationsController do
let(:disabled_services) { %w(JenkinsService JenkinsDeprecatedService) }
it 'enables SlackSlashCommandsService and disables GitlabSlackApplication' do
get :show, namespace_id: project.namespace, project_id: project
get :show, params: { namespace_id: project.namespace, project_id: project }
expect(active_services).to include('SlackSlashCommandsService')
expect(active_services).not_to include('GitlabSlackApplicationService')
......@@ -40,7 +40,7 @@ describe Projects::Settings::IntegrationsController do
stub_application_setting(slack_app_enabled: true)
allow(::Gitlab).to receive(:com?).and_return(true)
get :show, namespace_id: project.namespace, project_id: project
get :show, params: { namespace_id: project.namespace, project_id: project }
expect(active_services).to include('GitlabSlackApplicationService')
expect(active_services).not_to include('SlackSlashCommandsService')
......
ee/spec/controllers/projects/settings/operations_controller_spec.rb
View file @ 77b85029
......@@ -19,7 +19,7 @@ describe Projects::Settings::OperationsController do
end
it 'returns 404' do
get :show, namespace_id: project.namespace, project_id: project
get :show, params: { namespace_id: project.namespace, project_id: project }
expect(response).to have_gitlab_http_status(:not_found)
end
......@@ -34,7 +34,7 @@ describe Projects::Settings::OperationsController do
end
it 'renders ok' do
get :show, namespace_id: project.namespace, project_id: project
get :show, params: { namespace_id: project.namespace, project_id: project }
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template(:show)
......@@ -45,7 +45,7 @@ describe Projects::Settings::OperationsController do
it 'redirects for private project' do
project = create(:project, project_visibility)
get :show, namespace_id: project.namespace, project_id: project
get :show, params: { namespace_id: project.namespace, project_id: project }
expect(response).to redirect_to(new_user_session_path)
end
......@@ -230,7 +230,7 @@ describe Projects::Settings::OperationsController do
end
def update_project(project, params)
patch :update, project_params(project, params)
patch :update, params: project_params(project, params)
project.reload
end
......
ee/spec/controllers/projects/settings/repository_controller_spec.rb
View file @ 77b85029
......@@ -14,7 +14,7 @@ describe Projects::Settings::RepositoryController do
subject(:push_rule) { assigns(:push_rule) }
it 'is created' do
get :show, namespace_id: project.namespace, project_id: project
get :show, params: { namespace_id: project.namespace, project_id: project }
is_expected.to be_persisted
end
......@@ -25,7 +25,7 @@ describe Projects::Settings::RepositoryController do
end
it 'is not created' do
get :show, namespace_id: project.namespace, project_id: project
get :show, params: { namespace_id: project.namespace, project_id: project }
is_expected.to be_nil
end
......
ee/spec/controllers/projects/settings/slacks_controller_spec.rb
View file @ 77b85029
......@@ -32,7 +32,7 @@ describe Projects::Settings::SlacksController do
it 'calls service and redirects with no alerts if result is successful' do
stub_service(status: :success)
get :slack_auth, namespace_id: project.namespace, project_id: project
get :slack_auth, params: { namespace_id: project.namespace, project_id: project }
expect(response).to have_gitlab_http_status(302)
expect(response).to redirect_to(redirect_url(project))
......@@ -42,7 +42,7 @@ describe Projects::Settings::SlacksController do
it 'calls service and redirects with the alert if there is error' do
stub_service(status: :error, message: 'error')
get :slack_auth, namespace_id: project.namespace, project_id: project
get :slack_auth, params: { namespace_id: project.namespace, project_id: project }
expect(response).to have_gitlab_http_status(302)
expect(response).to redirect_to(redirect_url(project))
......@@ -52,7 +52,7 @@ describe Projects::Settings::SlacksController do
context 'when no CSRF token is provided' do
it 'returns 403' do
get :slack_auth, namespace_id: project.namespace, project_id: project
get :slack_auth, params: { namespace_id: project.namespace, project_id: project }
expect(response).to have_gitlab_http_status(403)
end
......
ee/spec/controllers/projects/tracings_controller_spec.rb
View file @ 77b85029
......@@ -14,7 +14,7 @@ describe Projects::TracingsController do
end
it 'renders OK' do
get :show, namespace_id: project.namespace, project_id: project
get :show, params: { namespace_id: project.namespace, project_id: project }
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template(:show)
......@@ -30,7 +30,7 @@ describe Projects::TracingsController do
end
it 'returns 404' do
get :show, namespace_id: project.namespace, project_id: project
get :show, params: { namespace_id: project.namespace, project_id: project }
expect(response).to have_gitlab_http_status(:not_found)
end
......
ee/spec/controllers/projects/variables_controller_spec.rb
View file @ 77b85029
......@@ -32,9 +32,11 @@ describe Projects::VariablesController do
subject do
patch :update,
namespace_id: project.namespace.to_param,
project_id: project,
variables_attributes: variables_attributes,
params: {
namespace_id: project.namespace.to_param,
project_id: project,
variables_attributes: variables_attributes
},
format: :json
end
......
ee/spec/controllers/projects/vulnerability_feedback_controller_spec.rb
View file @ 77b85029
......@@ -75,7 +75,7 @@ describe Projects::VulnerabilityFeedbackController do
end
def list_feedbacks(params = {})
get :index, { namespace_id: project.namespace.to_param, project_id: project }.merge(params)
get :index, params: { namespace_id: project.namespace.to_param, project_id: project }.merge(params)
end
end
......@@ -215,7 +215,7 @@ describe Projects::VulnerabilityFeedbackController do
def destroy_feedback(user:, project:, id:)
sign_in(user)
delete :destroy, namespace_id: project.namespace.to_param, project_id: project, id: id
delete :destroy, params: { namespace_id: project.namespace.to_param, project_id: project, id: id }
end
end
end
ee/spec/controllers/projects/web_ide_terminals_controller_spec.rb
View file @ 77b85029
......@@ -96,7 +96,7 @@ describe Projects::WebIdeTerminalsController do
describe 'GET show' do
before do
get(:show, namespace_id: project.namespace.to_param, project_id: project, id: job.id)
get(:show, params: { namespace_id: project.namespace.to_param, project_id: project, id: job.id })
end
it_behaves_like 'terminal access rights'
......@@ -110,9 +110,11 @@ describe Projects::WebIdeTerminalsController do
allow_any_instance_of(::Ci::WebIdeConfigService)
.to receive(:execute).and_return(result)
post :check_config, namespace_id: project.namespace.to_param,
project_id: project.to_param,
branch: 'master'
post :check_config, params: {
namespace_id: project.namespace.to_param,
project_id: project.to_param,
branch: 'master'
}
end
it_behaves_like 'terminal access rights'
......@@ -131,9 +133,11 @@ describe Projects::WebIdeTerminalsController do
let(:branch) { 'master' }
subject do
post :create, namespace_id: project.namespace.to_param,
project_id: project.to_param,
branch: branch
post :create, params: {
namespace_id: project.namespace.to_param,
project_id: project.to_param,
branch: branch
}
end
context 'access rights' do
......@@ -179,9 +183,11 @@ describe Projects::WebIdeTerminalsController do
let(:job) { create(:ci_build, :running, pipeline: pipeline, user: user, project: project) }
before do
post(:cancel, namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: job.id)
post(:cancel, params: {
namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: job.id
})
end
it_behaves_like 'terminal access rights'
......@@ -200,9 +206,11 @@ describe Projects::WebIdeTerminalsController do
let(:job) { create(:ci_build, :failed, pipeline: pipeline, user: user, project: project) }
before do
post(:retry, namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: job.id)
post(:retry, params: {
namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: job.id
})
end
it_behaves_like 'terminal access rights'
......
ee/spec/controllers/projects_controller_spec.rb
View file @ 77b85029
......@@ -30,7 +30,7 @@ describe ProjectsController do
end
it 'has mirror enabled in new project' do
post :create, project: params
post :create, params: { project: params }
created_project = Project.find_by_path('foo')
expect(created_project.reload.mirror).to be true
......@@ -44,7 +44,7 @@ describe ProjectsController do
end
it 'has mirror disabled in new project' do
post :create, project: params
post :create, params: { project: params }
created_project = Project.find_by_path('foo')
expect(created_project.reload.mirror).to be false
......@@ -77,7 +77,7 @@ describe ProjectsController do
end
it 'creates the project from project template' do
post :create, project: templates_params
post :create, params: { project: templates_params }
created_project = Project.find_by_path('foo')
expect(flash[:notice]).to eq "Project 'foo' was successfully created."
......@@ -92,7 +92,7 @@ describe ProjectsController do
end
it 'creates the project from project template' do
post :create, project: templates_params
post :create, params: { project: templates_params }
created_project = Project.find_by_path('foo')
expect(flash[:notice]).to eq "Project 'foo' was successfully created."
......@@ -109,9 +109,11 @@ describe ProjectsController do
}
put :update,
namespace_id: project.namespace,
id: project,
project: params
params: {
namespace_id: project.namespace,
id: project,
project: params
}
project.reload
expect(response).to have_gitlab_http_status(302)
......@@ -130,9 +132,11 @@ describe ProjectsController do
}
put :update,
namespace_id: project.namespace,
id: project,
project: params
params: {
namespace_id: project.namespace,
id: project,
project: params
}
project.reload
expect(response).to have_gitlab_http_status(302)
......@@ -147,9 +151,11 @@ describe ProjectsController do
}
put :update,
namespace_id: project.namespace,
id: project,
project: params
params: {
namespace_id: project.namespace,
id: project,
project: params
}
project.reload
expect(response).to have_gitlab_http_status(302)
......@@ -167,9 +173,11 @@ describe ProjectsController do
}
put :update,
namespace_id: project.namespace,
id: project,
project: params
params: {
namespace_id: project.namespace,
id: project,
project: params
}
project.reload
expect(response).to have_gitlab_http_status(302)
......@@ -195,9 +203,11 @@ describe ProjectsController do
expect_any_instance_of(EE::ProjectImportState).to receive(:force_import_job!).once
put :update,
namespace_id: project.namespace,
id: project,
project: params
params: {
namespace_id: project.namespace,
id: project,
project: params
}
project.reload
expect(project.mirror).to eq(true)
......@@ -216,9 +226,11 @@ describe ProjectsController do
params.each do |param, _value|
expect do
put :update,
namespace_id: project.namespace,
id: project,
project: params
params: {
namespace_id: project.namespace,
id: project,
project: params
}
project.reload
end.not_to change(project, param)
end
......@@ -229,9 +241,11 @@ describe ProjectsController do
it_behaves_like 'unauthorized when external service denies access' do
subject do
put :update,
namespace_id: project.namespace,
id: project,
project: { description: 'Hello world' }
params: {
namespace_id: project.namespace,
id: project,
project: { description: 'Hello world' }
}
project.reload
end
......
ee/spec/controllers/registrations_controller_spec.rb
View file @ 77b85029
......@@ -6,7 +6,7 @@ describe RegistrationsController do
let(:user_params) { { user: attributes_for(:user, email_opted_in: '1') } }
it 'sets the rest of the email_opted_in fields' do
post :create, user_params
post :create, params: user_params
user = User.find_by_username!(user_params[:user][:username])
expect(user.email_opted_in).to be_truthy
expect(user.email_opted_in_ip).to be_present
......@@ -19,7 +19,7 @@ describe RegistrationsController do
let(:user_params) { { user: attributes_for(:user, email_opted_in: '0') } }
it 'does not set the rest of the email_opted_in fields' do
post :create, user_params
post :create, params: user_params
user = User.find_by_username!(user_params[:user][:username])
expect(user.email_opted_in).to be_falsey
expect(user.email_opted_in_ip).to be_blank
......
ee/spec/controllers/search_controller_spec.rb
View file @ 77b85029
......@@ -18,13 +18,13 @@ describe SearchController do
describe 'GET #show' do
it 'renders a 403 when no project is given' do
get :show, scope: 'notes', search: note.note
get :show, params: { scope: 'notes', search: note.note }
expect(response).to have_gitlab_http_status(403)
end
it 'renders a 200 when a project was set' do
get :show, project_id: project.id, scope: 'notes', search: note.note
get :show, params: { project_id: project.id, scope: 'notes', search: note.note }
expect(response).to have_gitlab_http_status(200)
end
......@@ -32,13 +32,13 @@ describe SearchController do
describe 'GET #autocomplete' do
it 'renders a 403 when no project is given' do
get :autocomplete, term: 'hello'
get :autocomplete, params: { term: 'hello' }
expect(response).to have_gitlab_http_status(403)
end
it 'renders a 200 when a project was set' do
get :autocomplete, project_id: project.id, term: 'hello'
get :autocomplete, params: { project_id: project.id, term: 'hello' }
expect(response).to have_gitlab_http_status(200)
end
......
ee/spec/controllers/unsubscribes_controller_spec.rb
View file @ 77b85029
......@@ -5,13 +5,13 @@ describe UnsubscribesController do
describe "show" do
it "responds with success" do
get :show, email: Base64.urlsafe_encode64('me@example.com')
get :show, params: { email: Base64.urlsafe_encode64('me@example.com') }
assert_response :success
end
it "behaves the same if email address isn't known in the system" do
get :show, email: Base64.urlsafe_encode64('i@dont_exists.com')
get :show, params: { email: Base64.urlsafe_encode64('i@dont_exists.com') }
assert_response :success
end
......@@ -19,14 +19,14 @@ describe UnsubscribesController do
describe "create" do
it "unsubscribes the connected user" do
post :create, email: Base64.urlsafe_encode64('me@example.com')
post :create, params: { email: Base64.urlsafe_encode64('me@example.com') }
assert user.reload.admin_email_unsubscribed_at
end
# Don't tell if the email does not exists
it "behaves the same if email address isn't known in the system" do
post :create, email: Base64.urlsafe_encode64('i@dont_exists.com')
post :create, params: { email: Base64.urlsafe_encode64('i@dont_exists.com') }
assert_response :redirect
end
......
ee/spec/controllers/users_controller_spec.rb
View file @ 77b85029
......@@ -8,13 +8,13 @@ describe UsersController do
end
describe 'GET #snippets' do
subject { get :snippets, username: user.username }
subject { get :snippets, params: { username: user.username } }
it_behaves_like 'disabled when using an external authorization service'
end
describe 'GET #calendar_activities' do
subject { get :calendar_activities, username: user.username }
subject { get :calendar_activities, params: { username: user.username } }
it_behaves_like 'disabled when using an external authorization service'
end
......
ee/spec/javascripts/fixtures/merge_requests.rb
View file @ 77b85029
......@@ -36,9 +36,11 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont
it 'merge_requests_ee/merge_request_edit.html.raw' do |example|
get :edit,
id: merge_request.id,
namespace_id: project.namespace.to_param,
project_id: project,
params: {
id: merge_request.id,
namespace_id: project.namespace.to_param,
project_id: project
},
format: :html
expect(merge_request.all_approvers_including_groups.size).to eq(1)
......
ee/spec/javascripts/fixtures/saml_providers.rb
View file @ 77b85029
......@@ -23,7 +23,7 @@ describe Groups::SamlProvidersController, '(JavaScript fixtures)', type: :contro
it 'groups/saml_providers/show.html.raw' do |example|
create(:saml_provider, group: group)
get :show, group_id: group
get :show, params: { group_id: group }
expect(response).to be_success
expect(response).to render_template 'groups/saml_providers/show'
......
ee/spec/lib/ee/api/helpers_spec.rb
View file @ 77b85029
......@@ -67,7 +67,7 @@ describe EE::API::Helpers do
expect_any_instance_of(::Gitlab::Geo::JwtRequestDecoder).to receive(:decode) { raise ::Gitlab::Geo::InvalidDecryptionKeyError }
header 'Authorization', 'test'
get 'protected', current_user: 'test'
get 'protected', params: { current_user: 'test' }
expect(JSON.parse(last_response.body)).to eq({ 'message' => 'Gitlab::Geo::InvalidDecryptionKeyError' })
end
......@@ -76,7 +76,7 @@ describe EE::API::Helpers do
allow_any_instance_of(::Gitlab::Geo::JwtRequestDecoder).to receive(:decode) { raise ::Gitlab::Geo::InvalidSignatureTimeError }
header 'Authorization', 'test'
get 'protected', current_user: 'test'
get 'protected', params: { current_user: 'test' }
expect(JSON.parse(last_response.body)).to eq({ 'message' => 'Gitlab::Geo::InvalidSignatureTimeError' })
end
......
ee/spec/requests/api/epics_spec.rb
View file @ 77b85029
......@@ -12,7 +12,7 @@ describe API::Epics do
it 'returns 403 forbidden error' do
group.add_developer(user)
get api(url, user), params
get api(url, user), params: params
expect(response).to have_gitlab_http_status(403)
end
......@@ -23,7 +23,7 @@ describe API::Epics do
end
it 'returns 401 unauthorized error for non authenticated user' do
get api(url), params
get api(url), params: params
expect(response).to have_gitlab_http_status(401)
end
......@@ -32,7 +32,7 @@ describe API::Epics do
project.update(visibility_level: Gitlab::VisibilityLevel::PRIVATE)
group.update(visibility_level: Gitlab::VisibilityLevel::PRIVATE)
get api(url, user), params
get api(url, user), params: params
expect(response).to have_gitlab_http_status(404)
end
......@@ -47,7 +47,7 @@ describe API::Epics do
RSpec::Matchers.define_negated_matcher :exclude, :include
it 'returns epic with extra date fields' do
get api(url, user), params
get api(url, user), params: params
expect(Array.wrap(JSON.parse(response.body))).to all(exclude(*extra_date_fields))
end
......@@ -59,7 +59,7 @@ describe API::Epics do
end
it 'returns epic with extra date fields' do
get api(url, user), params
get api(url, user), params: params
expect(Array.wrap(JSON.parse(response.body))).to all(include(*extra_date_fields))
end
......@@ -119,31 +119,31 @@ describe API::Epics do
end
it 'returns epics authored by the given author id' do
get api(url, user), author_id: user2.id
get api(url, user), params: { author_id: user2.id }
expect_array_response([epic2.id])
end
it 'returns epics matching given search string for title' do
get api(url, user), search: epic2.title
get api(url, user), params: { search: epic2.title }
expect_array_response([epic2.id])
end
it 'returns epics matching given search string for description' do
get api(url, user), search: epic2.description
get api(url, user), params: { search: epic2.description }
expect_array_response([epic2.id])
end
it 'returns epics matching given status' do
get api(url, user), state: :opened
get api(url, user), params: { state: :opened }
expect_array_response([epic2.id])
end
it 'returns all epics when state set to all' do
get api(url, user), state: :all
get api(url, user), params: { state: :all }
expect_array_response([epic2.id, epic.id])
end
......@@ -155,25 +155,25 @@ describe API::Epics do
end
it 'sorts ascending when requested' do
get api(url, user), sort: :asc
get api(url, user), params: { sort: :asc }
expect_array_response([epic.id, epic2.id])
end
it 'sorts by updated_at descending when requested' do
get api(url, user), order_by: :updated_at
get api(url, user), params: { order_by: :updated_at }
expect_array_response([epic.id, epic2.id])
end
it 'sorts by updated_at ascending when requested' do
get api(url, user), order_by: :updated_at, sort: :asc
get api(url, user), params: { order_by: :updated_at, sort: :asc }
expect_array_response([epic2.id, epic.id])
end
it 'returns an array of labeled epics' do
get api(url, user), labels: label.title
get api(url, user), params: { labels: label.title }
expect_array_response([epic2.id])
end
......@@ -231,7 +231,7 @@ describe API::Epics do
it 'returns 400' do
group.add_developer(user)
post api(url, user), description: 'epic description'
post api(url, user), params: { description: 'epic description' }
expect(response).to have_gitlab_http_status(400)
end
......@@ -241,7 +241,7 @@ describe API::Epics do
before do
group.add_developer(user)
post api(url, user), params
post api(url, user), params: params
end
it 'returns 201 status' do
......@@ -301,7 +301,7 @@ describe API::Epics do
context 'when a user does not have permissions to create an epic' do
it 'returns 403 forbidden error' do
put api(url, user), params
put api(url, user), params: params
expect(response).to have_gitlab_http_status(403)
end
......@@ -324,7 +324,7 @@ describe API::Epics do
context 'with basic params' do
before do
put api(url, user), params
put api(url, user), params: params
end
it 'returns 200 status' do
......@@ -351,7 +351,7 @@ describe API::Epics do
context 'when state_event is close' do
it 'allows epic to be closed' do
put api(url, user), state_event: 'close'
put api(url, user), params: { state_event: 'close' }
expect(epic.reload).to be_closed
end
......@@ -361,7 +361,7 @@ describe API::Epics do
it 'allows epic to be reopend' do
epic.update!(state: 'closed')
put api(url, user), state_event: 'reopen'
put api(url, user), params: { state_event: 'reopen' }
expect(epic.reload).to be_opened
end
......@@ -373,7 +373,7 @@ describe API::Epics do
let(:new_due_date) { epic.end_date + 1.day }
it 'updates start_date_fixed and due_date_fixed' do
put api(url, user), start_date: new_start_date, end_date: new_due_date
put api(url, user), params: { start_date: new_start_date, end_date: new_due_date }
result = epic.reload
......@@ -388,7 +388,7 @@ describe API::Epics do
let(:new_due_date) { epic.end_date + 1.day }
it 'updates start_date_is_fixed' do
put api(url, user), start_date_is_fixed: false
put api(url, user), params: { start_date_is_fixed: false }
result = epic.reload
......
ee/spec/requests/api/geo_nodes_spec.rb
View file @ 77b85029
......@@ -199,11 +199,11 @@ describe API::GeoNodes, :geo, :prometheus, api: true do
describe 'PUT /geo_nodes/:id' do
it_behaves_like '404 response' do
let(:request) { put api("/geo_nodes/#{unexisting_node_id}", admin), {} }
let(:request) { put api("/geo_nodes/#{unexisting_node_id}", admin), params: {} }
end
it 'denies access if not admin' do
put api("/geo_nodes/#{secondary.id}", user), {}
put api("/geo_nodes/#{secondary.id}", user), params: {}
expect(response).to have_gitlab_http_status(403)
end
......@@ -217,7 +217,7 @@ describe API::GeoNodes, :geo, :prometheus, api: true do
verification_max_capacity: 55
}.stringify_keys
put api("/geo_nodes/#{secondary.id}", admin), params
put api("/geo_nodes/#{secondary.id}", admin), params: params
expect(response).to have_gitlab_http_status(200)
expect(response).to match_response_schema('public_api/v4/geo_node', dir: 'ee')
......@@ -293,7 +293,7 @@ describe API::GeoNodes, :geo, :prometheus, api: true do
create(:geo_project_registry, :wiki_sync_failed)
create(:geo_project_registry, :repository_sync_failed)
get api("/geo_nodes/current/failures", admin), type: :wiki
get api("/geo_nodes/current/failures", admin), params: { type: :wiki }
expect(response).to have_gitlab_http_status(200)
expect(json_response.count).to eq(1)
......@@ -306,7 +306,7 @@ describe API::GeoNodes, :geo, :prometheus, api: true do
create(:geo_project_registry, :wiki_sync_failed)
create(:geo_project_registry, :repository_sync_failed)
get api("/geo_nodes/current/failures", admin), type: :repository
get api("/geo_nodes/current/failures", admin), params: { type: :repository }
expect(response).to have_gitlab_http_status(200)
expect(json_response.count).to eq(1)
......@@ -318,7 +318,7 @@ describe API::GeoNodes, :geo, :prometheus, api: true do
it 'returns a bad request' do
create(:geo_project_registry, :repository_sync_failed)
get api("/geo_nodes/current/failures", admin), type: :nonexistent
get api("/geo_nodes/current/failures", admin), params: { type: :nonexistent }
expect(response).to have_gitlab_http_status(400)
end
......@@ -339,7 +339,7 @@ describe API::GeoNodes, :geo, :prometheus, api: true do
create(:geo_project_registry, :repository_verification_failed)
create(:geo_project_registry, :wiki_verification_failed)
get api("/geo_nodes/current/failures", admin), failure_type: 'verification'
get api("/geo_nodes/current/failures", admin), params: { failure_type: 'verification' }
expect(response).to have_gitlab_http_status(200)
expect(response).to match_response_schema('public_api/v4/geo_project_registry', dir: 'ee')
......@@ -348,7 +348,7 @@ describe API::GeoNodes, :geo, :prometheus, api: true do
it 'does not show any registry when there is no failure' do
create(:geo_project_registry, :repository_verified)
get api("/geo_nodes/current/failures", admin), failure_type: 'verification'
get api("/geo_nodes/current/failures", admin), params: { failure_type: 'verification' }
expect(response).to have_gitlab_http_status(200)
expect(json_response.count).to be_zero
......@@ -359,7 +359,7 @@ describe API::GeoNodes, :geo, :prometheus, api: true do
create(:geo_project_registry, :repository_verification_failed)
create(:geo_project_registry, :wiki_verification_failed)
get api("/geo_nodes/current/failures", admin), failure_type: 'verification', type: :wiki
get api("/geo_nodes/current/failures", admin), params: { failure_type: 'verification', type: :wiki }
expect(response).to have_gitlab_http_status(200)
expect(json_response.count).to eq(1)
......@@ -372,7 +372,7 @@ describe API::GeoNodes, :geo, :prometheus, api: true do
create(:geo_project_registry, :repository_verification_failed)
create(:geo_project_registry, :wiki_verification_failed)
get api("/geo_nodes/current/failures", admin), failure_type: 'verification', type: :repository
get api("/geo_nodes/current/failures", admin), params: { failure_type: 'verification', type: :repository }
expect(response).to have_gitlab_http_status(200)
expect(json_response.count).to eq(1)
......@@ -390,7 +390,7 @@ describe API::GeoNodes, :geo, :prometheus, api: true do
create(:geo_project_registry, :repository_checksum_mismatch)
create(:geo_project_registry, :wiki_checksum_mismatch)
get api("/geo_nodes/current/failures", admin), failure_type: 'checksum_mismatch'
get api("/geo_nodes/current/failures", admin), params: { failure_type: 'checksum_mismatch' }
expect(response).to have_gitlab_http_status(200)
expect(response).to match_response_schema('public_api/v4/geo_project_registry', dir: 'ee')
......@@ -399,7 +399,7 @@ describe API::GeoNodes, :geo, :prometheus, api: true do
it 'does not show any registry when there is no failure' do
create(:geo_project_registry, :repository_verified)
get api("/geo_nodes/current/failures", admin), failure_type: 'checksum_mismatch'
get api("/geo_nodes/current/failures", admin), params: { failure_type: 'checksum_mismatch' }
expect(response).to have_gitlab_http_status(200)
expect(json_response.count).to be_zero
......@@ -410,7 +410,7 @@ describe API::GeoNodes, :geo, :prometheus, api: true do
create(:geo_project_registry, :repository_checksum_mismatch)
create(:geo_project_registry, :wiki_checksum_mismatch)
get api("/geo_nodes/current/failures", admin), failure_type: 'checksum_mismatch', type: :wiki
get api("/geo_nodes/current/failures", admin), params: { failure_type: 'checksum_mismatch', type: :wiki }
expect(response).to have_gitlab_http_status(200)
expect(json_response.count).to eq(1)
......@@ -423,7 +423,7 @@ describe API::GeoNodes, :geo, :prometheus, api: true do
create(:geo_project_registry, :repository_checksum_mismatch)
create(:geo_project_registry, :wiki_checksum_mismatch)
get api("/geo_nodes/current/failures", admin), failure_type: 'checksum_mismatch', type: :repository
get api("/geo_nodes/current/failures", admin), params: { failure_type: 'checksum_mismatch', type: :repository }
expect(response).to have_gitlab_http_status(200)
expect(json_response.count).to eq(1)
......
ee/spec/requests/api/geo_spec.rb
View file @ 77b85029
......@@ -41,13 +41,13 @@ describe API::Geo do
end
it 'responds with 401 with invalid auth header' do
get api("/geo/transfers/attachment/#{upload.id}"), nil, Authorization: 'Test'
get api("/geo/transfers/attachment/#{upload.id}"), headers: { Authorization: 'Test' }
expect(response).to have_gitlab_http_status(401)
end
context 'attachment file exists' do
subject(:request) { get api("/geo/transfers/attachment/#{upload.id}"), nil, req_header }
subject(:request) { get api("/geo/transfers/attachment/#{upload.id}"), headers: req_header }
it 'responds with 200 with X-Sendfile' do
request
......@@ -62,7 +62,7 @@ describe API::Geo do
context 'attachment does not exist' do
it 'responds with 404' do
get api("/geo/transfers/attachment/100000"), nil, req_header
get api("/geo/transfers/attachment/100000"), headers: req_header
expect(response).to have_gitlab_http_status(404)
end
......@@ -80,13 +80,13 @@ describe API::Geo do
end
it 'responds with 401 with invalid auth header' do
get api("/geo/transfers/avatar/#{upload.id}"), nil, Authorization: 'Test'
get api("/geo/transfers/avatar/#{upload.id}"), headers: { Authorization: 'Test' }
expect(response).to have_gitlab_http_status(401)
end
context 'avatar file exists' do
subject(:request) { get api("/geo/transfers/avatar/#{upload.id}"), nil, req_header }
subject(:request) { get api("/geo/transfers/avatar/#{upload.id}"), headers: req_header }
it 'responds with 200 with X-Sendfile' do
request
......@@ -101,7 +101,7 @@ describe API::Geo do
context 'avatar does not exist' do
it 'responds with 404' do
get api("/geo/transfers/avatar/100000"), nil, req_header
get api("/geo/transfers/avatar/100000"), headers: req_header
expect(response).to have_gitlab_http_status(404)
end
......@@ -120,14 +120,14 @@ describe API::Geo do
end
it 'responds with 401 with invalid auth header' do
get api("/geo/transfers/file/#{upload.id}"), nil, Authorization: 'Test'
get api("/geo/transfers/file/#{upload.id}"), headers: { Authorization: 'Test' }
expect(response).to have_gitlab_http_status(401)
end
context 'when the Upload record exists' do
context 'when the file exists' do
subject(:request) { get api("/geo/transfers/file/#{upload.id}"), nil, req_header }
subject(:request) { get api("/geo/transfers/file/#{upload.id}"), headers: req_header }
it 'responds with 200 with X-Sendfile' do
request
......@@ -144,7 +144,7 @@ describe API::Geo do
it 'responds with 404 and a specific geo code' do
File.unlink(upload.absolute_path)
get api("/geo/transfers/file/#{upload.id}"), nil, req_header
get api("/geo/transfers/file/#{upload.id}"), headers: req_header
expect(response).to have_gitlab_http_status(404)
expect(json_response['geo_code']).to eq(Gitlab::Geo::FileUploader::FILE_NOT_FOUND_GEO_CODE)
......@@ -154,7 +154,7 @@ describe API::Geo do
context 'when the Upload record does not exist' do
it 'responds with 404' do
get api("/geo/transfers/file/100000"), nil, req_header
get api("/geo/transfers/file/100000"), headers: req_header
expect(response).to have_gitlab_http_status(404)
end
......@@ -173,14 +173,14 @@ describe API::Geo do
end
it 'responds with 401 with invalid auth header' do
get api("/geo/transfers/lfs/#{lfs_object.id}"), nil, Authorization: 'Test'
get api("/geo/transfers/lfs/#{lfs_object.id}"), headers: { Authorization: 'Test' }
expect(response).to have_gitlab_http_status(401)
end
context 'LFS object exists' do
context 'file exists' do
subject(:request) { get api("/geo/transfers/lfs/#{lfs_object.id}"), nil, req_header }
subject(:request) { get api("/geo/transfers/lfs/#{lfs_object.id}"), headers: req_header }
it 'responds with 200 with X-Sendfile' do
request
......@@ -197,7 +197,7 @@ describe API::Geo do
it 'responds with 404 and a specific geo code' do
File.unlink(lfs_object.file.path)
get api("/geo/transfers/lfs/#{lfs_object.id}"), nil, req_header
get api("/geo/transfers/lfs/#{lfs_object.id}"), headers: req_header
expect(response).to have_gitlab_http_status(404)
expect(json_response['geo_code']).to eq(Gitlab::Geo::FileUploader::FILE_NOT_FOUND_GEO_CODE)
......@@ -207,7 +207,7 @@ describe API::Geo do
context 'LFS object does not exist' do
it 'responds with 404' do
get api("/geo/transfers/lfs/100000"), nil, req_header
get api("/geo/transfers/lfs/100000"), headers: req_header
expect(response).to have_gitlab_http_status(404)
end
......@@ -255,10 +255,10 @@ describe API::Geo do
}
end
subject(:request) { post api('/geo/status'), data, geo_base_request.headers }
subject(:request) { post api('/geo/status'), params: data, headers: geo_base_request.headers }
it 'responds with 401 with invalid auth header' do
post api('/geo/status'), nil, Authorization: 'Test'
post api('/geo/status'), headers: { Authorization: 'Test' }
expect(response).to have_gitlab_http_status(401)
end
......@@ -300,7 +300,7 @@ describe API::Geo do
describe 'POST /geo/proxy_git_push_ssh/info_refs' do
context 'with all required params missing' do
it 'responds with 400' do
post api('/geo/proxy_git_push_ssh/info_refs'), nil
post api('/geo/proxy_git_push_ssh/info_refs'), params: nil
expect(response).to have_gitlab_http_status(400)
expect(json_response['error']).to eql('secret_token is missing, data is missing, data[gl_id] is missing, data[primary_repo] is missing')
......@@ -316,7 +316,7 @@ describe API::Geo do
context 'with an invalid secret_token' do
it 'responds with 401' do
post(api('/geo/proxy_git_push_ssh/info_refs'), { secret_token: 'invalid', data: data })
post(api('/geo/proxy_git_push_ssh/info_refs'), params: { secret_token: 'invalid', data: data })
expect(response).to have_gitlab_http_status(401)
expect(json_response['error']).to be_nil
......@@ -327,7 +327,7 @@ describe API::Geo do
it 'responds with 500' do
expect(git_push_ssh_proxy).to receive(:info_refs).and_raise('deliberate exception raised')
post api('/geo/proxy_git_push_ssh/info_refs'), { secret_token: secret_token, data: data }
post api('/geo/proxy_git_push_ssh/info_refs'), params: { secret_token: secret_token, data: data }
expect(response).to have_gitlab_http_status(500)
expect(json_response['message']).to include('RuntimeError (deliberate exception raised)')
......@@ -348,7 +348,7 @@ describe API::Geo do
it 'responds with 200' do
expect(git_push_ssh_proxy).to receive(:info_refs).and_return(api_response)
post api('/geo/proxy_git_push_ssh/info_refs'), { secret_token: secret_token, data: data }
post api('/geo/proxy_git_push_ssh/info_refs'), params: { secret_token: secret_token, data: data }
expect(response).to have_gitlab_http_status(200)
expect(Base64.decode64(json_response['result'])).to eql('something here')
......@@ -360,7 +360,7 @@ describe API::Geo do
describe 'POST /geo/proxy_git_push_ssh/push' do
context 'with all required params missing' do
it 'responds with 400' do
post api('/geo/proxy_git_push_ssh/push'), nil
post api('/geo/proxy_git_push_ssh/push'), params: nil
expect(response).to have_gitlab_http_status(400)
expect(json_response['error']).to eql('secret_token is missing, data is missing, data[gl_id] is missing, data[primary_repo] is missing, output is missing')
......@@ -377,7 +377,7 @@ describe API::Geo do
context 'with an invalid secret_token' do
it 'responds with 401' do
post(api('/geo/proxy_git_push_ssh/push'), { secret_token: 'invalid', data: data, output: output })
post(api('/geo/proxy_git_push_ssh/push'), params: { secret_token: 'invalid', data: data, output: output })
expect(response).to have_gitlab_http_status(401)
expect(json_response['error']).to be_nil
......@@ -387,7 +387,7 @@ describe API::Geo do
context 'where an exception occurs' do
it 'responds with 500' do
expect(git_push_ssh_proxy).to receive(:push).and_raise('deliberate exception raised')
post api('/geo/proxy_git_push_ssh/push'), { secret_token: secret_token, data: data, output: output }
post api('/geo/proxy_git_push_ssh/push'), params: { secret_token: secret_token, data: data, output: output }
expect(response).to have_gitlab_http_status(500)
expect(json_response['message']).to include('RuntimeError (deliberate exception raised)')
......@@ -408,7 +408,7 @@ describe API::Geo do
it 'responds with 201' do
expect(git_push_ssh_proxy).to receive(:push).with(output).and_return(api_response)
post api('/geo/proxy_git_push_ssh/push'), { secret_token: secret_token, data: data, output: output }
post api('/geo/proxy_git_push_ssh/push'), params: { secret_token: secret_token, data: data, output: output }
expect(response).to have_gitlab_http_status(201)
expect(Base64.decode64(json_response['result'])).to eql('something here')
......
ee/spec/requests/api/groups_spec.rb
View file @ 77b85029
......@@ -10,7 +10,7 @@ describe API::Groups do
group.add_owner(user)
end
subject(:do_it) { put api("/groups/#{group.id}", user), file_template_project_id: project.id }
subject(:do_it) { put api("/groups/#{group.id}", user), params: { file_template_project_id: project.id } }
it 'does not update file_template_project_id if unlicensed' do
stub_licensed_features(custom_file_templates_for_namespace: false)
......
ee/spec/requests/api/issue_links_spec.rb
View file @ 77b85029
......@@ -39,7 +39,7 @@ describe API::IssueLinks do
target_issue = create(:issue)
post api("/projects/#{project.id}/issues/#{issue.iid}/links"),
target_project_id: target_issue.project.id, target_issue_iid: target_issue.iid
params: { target_project_id: target_issue.project.id, target_issue_iid: target_issue.iid }
expect(response).to have_gitlab_http_status(401)
end
......@@ -51,7 +51,7 @@ describe API::IssueLinks do
target_issue = create(:issue)
post api("/projects/#{project.id}/issues/#{issue.iid}/links", user),
target_project_id: 999, target_issue_iid: target_issue.iid
params: { target_project_id: 999, target_issue_iid: target_issue.iid }
expect(response).to have_gitlab_http_status(404)
expect(json_response['message']).to eq('404 Project Not Found')
......@@ -63,7 +63,7 @@ describe API::IssueLinks do
target_project = create(:project, :public)
post api("/projects/#{project.id}/issues/#{issue.iid}/links", user),
target_project_id: target_project.id, target_issue_iid: 999
params: { target_project_id: target_project.id, target_issue_iid: 999 }
expect(response).to have_gitlab_http_status(404)
expect(json_response['message']).to eq('404 Not found')
......@@ -77,7 +77,7 @@ describe API::IssueLinks do
unauthorized_project.add_guest(user)
post api("/projects/#{project.id}/issues/#{issue.iid}/links", user),
target_project_id: unauthorized_project.id, target_issue_iid: target_issue.iid
params: { target_project_id: unauthorized_project.id, target_issue_iid: target_issue.iid }
expect(response).to have_gitlab_http_status(404)
expect(json_response['message']).to eq('No Issue found for given params')
......@@ -90,7 +90,7 @@ describe API::IssueLinks do
target_issue = create(:issue, :confidential, project: project)
post api("/projects/#{project.id}/issues/#{issue.iid}/links", user),
target_project_id: project.id, target_issue_iid: target_issue.iid
params: { target_project_id: project.id, target_issue_iid: target_issue.iid }
expect(response).to have_gitlab_http_status(404)
expect(json_response['message']).to eq('404 Not found')
......@@ -103,7 +103,7 @@ describe API::IssueLinks do
target_issue = create(:issue, project: project)
post api("/projects/#{project.id}/issues/#{issue.iid}/links", user),
target_project_id: project.id, target_issue_iid: target_issue.iid
params: { target_project_id: project.id, target_issue_iid: target_issue.iid }
expect(response).to have_gitlab_http_status(404)
expect(json_response['message']).to eq('404 Project Not Found')
......@@ -116,7 +116,7 @@ describe API::IssueLinks do
project.add_reporter(user)
post api("/projects/#{project.id}/issues/#{issue.iid}/links", user),
target_project_id: project.id, target_issue_iid: target_issue.iid
params: { target_project_id: project.id, target_issue_iid: target_issue.iid }
expect(response).to have_gitlab_http_status(201)
expect(json_response).to include('source_issue', 'target_issue')
......@@ -127,7 +127,7 @@ describe API::IssueLinks do
project.add_reporter(user)
post api("/projects/#{project.id}/issues/#{issue.iid}/links", user),
target_project_id: project.to_reference(full: true), target_issue_iid: target_issue.iid
params: { target_project_id: project.to_reference(full: true), target_issue_iid: target_issue.iid }
expect(response).to have_gitlab_http_status(201)
expect(json_response).to include('source_issue', 'target_issue')
......
ee/spec/requests/api/issues_spec.rb
View file @ 77b85029
......@@ -46,21 +46,21 @@ describe API::Issues, :mailer do
let!(:issue2) { create(:issue, author: user2, project: project, weight: 5) }
it 'returns issues with specific weight' do
get api('/issues', user), weight: 5, scope: 'all'
get api('/issues', user), params: { weight: 5, scope: 'all' }
expect_paginated_array_response(size: 1)
expect(json_response.first['id']).to eq(issue2.id)
end
it 'returns issues with no weight' do
get api('/issues', user), weight: 'None', scope: 'all'
get api('/issues', user), params: { weight: 'None', scope: 'all' }
expect_paginated_array_response(size: 1)
expect(json_response.first['id']).to eq(issue.id)
end
it 'returns issues with any weight' do
get api('/issues', user), weight: 'Any', scope: 'all'
get api('/issues', user), params: { weight: 'Any', scope: 'all' }
expect_paginated_array_response(size: 3)
end
......@@ -71,8 +71,7 @@ describe API::Issues, :mailer do
describe "POST /projects/:id/issues" do
it 'creates a new project issue' do
post api("/projects/#{project.id}/issues", user),
title: 'new issue', labels: 'label, label2', weight: 101,
assignee_ids: [user2.id]
params: { title: 'new issue', labels: 'label, label2', weight: 101, assignee_ids: [user2.id] }
expect(response).to have_gitlab_http_status(201)
expect(json_response['title']).to eq('new issue')
......@@ -87,7 +86,7 @@ describe API::Issues, :mailer do
describe 'PUT /projects/:id/issues/:issue_id to update weight' do
it 'updates an issue with no weight' do
put api("/projects/#{project.id}/issues/#{issue.iid}", user), weight: 101
put api("/projects/#{project.id}/issues/#{issue.iid}", user), params: { weight: 101 }
expect(response).to have_gitlab_http_status(200)
expect(json_response['weight']).to eq(101)
......@@ -96,14 +95,14 @@ describe API::Issues, :mailer do
it 'removes a weight from an issue' do
weighted_issue = create(:issue, project: project, weight: 2)
put api("/projects/#{project.id}/issues/#{weighted_issue.iid}", user), weight: nil
put api("/projects/#{project.id}/issues/#{weighted_issue.iid}", user), params: { weight: nil }
expect(response).to have_gitlab_http_status(200)
expect(json_response['weight']).to be_nil
end
it 'returns 400 if weight is less than minimum weight' do
put api("/projects/#{project.id}/issues/#{issue.iid}", user), weight: -1
put api("/projects/#{project.id}/issues/#{issue.iid}", user), params: { weight: -1 }
expect(response).to have_gitlab_http_status(400)
expect(json_response['message']['weight']).to be_present
......@@ -111,7 +110,7 @@ describe API::Issues, :mailer do
it 'adds a note when the weight is changed' do
expect do
put api("/projects/#{project.id}/issues/#{issue.iid}", user), weight: 9
put api("/projects/#{project.id}/issues/#{issue.iid}", user), params: { weight: 9 }
end.to change { Note.count }.by(1)
expect(response).to have_gitlab_http_status(200)
......@@ -124,7 +123,7 @@ describe API::Issues, :mailer do
end
it 'ignores the update' do
put api("/projects/#{project.id}/issues/#{issue.iid}", user), weight: 5
put api("/projects/#{project.id}/issues/#{issue.iid}", user), params: { weight: 5 }
expect(response).to have_gitlab_http_status(200)
expect(json_response['weight']).to be_nil
......
ee/spec/requests/api/jobs_spec.rb
View file @ 77b85029
......@@ -41,7 +41,7 @@ describe API::Jobs do
let(:job) { create(:ci_build, :artifacts, pipeline: pipeline, user: api_user) }
before do
get api("/projects/#{project.id}/jobs/#{job.id}/artifacts"), job_token: job.token
get api("/projects/#{project.id}/jobs/#{job.id}/artifacts"), params: { job_token: job.token }
end
context 'user is developer' do
......
ee/spec/requests/api/ldap_group_links_spec.rb
View file @ 77b85029
......@@ -31,7 +31,7 @@ describe API::LdapGroupLinks, api: true do
it "does not allow less priviledged user to add LDAP group link" do
expect do
post api("/groups/#{group_with_ldap_links.id}/ldap_group_links", user),
cn: 'ldap-group4', group_access: GroupMember::GUEST, provider: 'ldap3'
params: { cn: 'ldap-group4', group_access: GroupMember::GUEST, provider: 'ldap3' }
end.not_to change { group_with_ldap_links.ldap_group_links.count }
expect(response.status).to eq(403)
......@@ -42,7 +42,7 @@ describe API::LdapGroupLinks, api: true do
it "returns ok and add ldap group link" do
expect do
post api("/groups/#{group_with_ldap_links.id}/ldap_group_links", owner),
cn: 'ldap-group3', group_access: GroupMember::GUEST, provider: 'ldap3'
params: { cn: 'ldap-group3', group_access: GroupMember::GUEST, provider: 'ldap3' }
end.to change { group_with_ldap_links.ldap_group_links.count }.by(1)
expect(response.status).to eq(201)
......@@ -55,7 +55,7 @@ describe API::LdapGroupLinks, api: true do
xit "returns ok and add ldap group link even if no provider specified" do
expect do
post api("/groups/#{group_with_ldap_links.id}/ldap_group_links", owner),
cn: 'ldap-group3', group_access: GroupMember::GUEST
params: { cn: 'ldap-group3', group_access: GroupMember::GUEST }
end.to change { group_with_ldap_links.ldap_group_links.count }.by(1)
expect(response.status).to eq(201)
......@@ -65,22 +65,22 @@ describe API::LdapGroupLinks, api: true do
end
it "returns error if LDAP group link already exists" do
post api("//groups/#{group_with_ldap_links.id}/ldap_group_links", owner), provider: 'ldap1', cn: 'ldap-group1', group_access: GroupMember::GUEST
post api("//groups/#{group_with_ldap_links.id}/ldap_group_links", owner), params: { provider: 'ldap1', cn: 'ldap-group1', group_access: GroupMember::GUEST }
expect(response.status).to eq(409)
end
it "returns a 400 error when cn is not given" do
post api("//groups/#{group_with_ldap_links.id}/ldap_group_links", owner), group_access: GroupMember::GUEST
post api("//groups/#{group_with_ldap_links.id}/ldap_group_links", owner), params: { group_access: GroupMember::GUEST }
expect(response.status).to eq(400)
end
it "returns a 400 error when group access is not given" do
post api("//groups/#{group_with_ldap_links.id}/ldap_group_links", owner), cn: 'ldap-group3'
post api("//groups/#{group_with_ldap_links.id}/ldap_group_links", owner), params: { cn: 'ldap-group3' }
expect(response.status).to eq(400)
end
it "returns a 422 error when group access is not known" do
post api("//groups/#{group_with_ldap_links.id}/ldap_group_links", owner), cn: 'ldap-group3', group_access: 11, provider: 'ldap1'
post api("//groups/#{group_with_ldap_links.id}/ldap_group_links", owner), params: { cn: 'ldap-group3', group_access: 11, provider: 'ldap1' }
expect(response.status).to eq(400)
expect(json_response['error']).to eq('group_access does not have a valid value')
......
ee/spec/requests/api/license_spec.rb
View file @ 77b85029
......@@ -28,7 +28,7 @@ describe API::License, api: true do
describe 'POST /license' do
it 'adds a new license if admin is logged in' do
post api('/license', admin), license: gl_license.export
post api('/license', admin), params: { license: gl_license.export }
expect(response.status).to eq 201
expect(json_response['user_limit']).to eq 0
......@@ -39,13 +39,13 @@ describe API::License, api: true do
end
it 'denies access if not admin' do
post api('/license', user), license: license
post api('/license', user), params: { license: license }
expect(response.status).to eq 403
end
it 'returns 400 if the license cannot be saved' do
post api('/license', admin), license: 'foo'
post api('/license', admin), params: { license: 'foo' }
expect(response.status).to eq(400)
end
......
ee/spec/requests/api/managed_licenses_spec.rb
View file @ 77b85029
......@@ -134,8 +134,10 @@ describe API::ManagedLicenses do
it 'creates managed license' do
expect do
post api("/projects/#{project.id}/managed_licenses", maintainer_user),
name: 'NEW_LICENSE_NAME',
approval_status: 'approved'
params: {
name: 'NEW_LICENSE_NAME',
approval_status: 'approved'
}
end.to change {project.software_license_policies.count}.by(1)
expect(response).to have_gitlab_http_status(201)
......@@ -147,8 +149,10 @@ describe API::ManagedLicenses do
it 'does not allow to duplicate managed license name' do
expect do
post api("/projects/#{project.id}/managed_licenses", maintainer_user),
name: software_license_policy.name,
approval_status: 'blacklisted'
params: {
name: software_license_policy.name,
approval_status: 'blacklisted'
}
end.not_to change {project.software_license_policies.count}
expect(response).to have_gitlab_http_status(400)
......@@ -158,8 +162,10 @@ describe API::ManagedLicenses do
context 'authorized user with read permissions' do
it 'does not create managed license' do
post api("/projects/#{project.id}/managed_licenses", dev_user),
name: 'NEW_LICENSE_NAME',
approval_status: 'approved'
params: {
name: 'NEW_LICENSE_NAME',
approval_status: 'approved'
}
expect(response).to have_gitlab_http_status(403)
end
......@@ -168,8 +174,10 @@ describe API::ManagedLicenses do
context 'authorized user without permissions' do
it 'does not create managed license' do
post api("/projects/#{project.id}/managed_licenses", reporter_user),
name: 'NEW_LICENSE_NAME',
approval_status: 'approved'
params: {
name: 'NEW_LICENSE_NAME',
approval_status: 'approved'
}
expect(response).to have_gitlab_http_status(403)
end
......@@ -178,8 +186,10 @@ describe API::ManagedLicenses do
context 'unauthorized user' do
it 'does not create managed license' do
post api("/projects/#{project.id}/managed_licenses"),
name: 'NEW_LICENSE_NAME',
approval_status: 'approved'
params: {
name: 'NEW_LICENSE_NAME',
approval_status: 'approved'
}
expect(response).to have_gitlab_http_status(401)
end
......@@ -194,7 +204,7 @@ describe API::ManagedLicenses do
initial_name = initial_license.name
initial_approval_status = initial_license.approval_status
patch api("/projects/#{project.id}/managed_licenses/#{software_license_policy.id}", maintainer_user),
approval_status: 'blacklisted'
params: { approval_status: 'blacklisted' }
updated_software_license_policy = project.software_license_policies.reload.first
......
ee/spec/requests/api/maven_packages_spec.rb
View file @ 77b85029
......@@ -118,7 +118,7 @@ describe API::MavenPackages do
end
def download_file(file_name, params = {}, request_headers = headers)
get api("/packages/maven/#{maven_metadatum.path}/#{file_name}"), params, request_headers
get api("/packages/maven/#{maven_metadatum.path}/#{file_name}"), params: params, headers: request_headers
end
def download_file_with_token(file_name, params = {}, request_headers = headers_with_token)
......@@ -223,7 +223,7 @@ describe API::MavenPackages do
end
def download_file(file_name, params = {}, request_headers = headers)
get api("/groups/#{group.id}/-/packages/maven/#{maven_metadatum.path}/#{file_name}"), params, request_headers
get api("/groups/#{group.id}/-/packages/maven/#{maven_metadatum.path}/#{file_name}"), params: params, headers: request_headers
end
def download_file_with_token(file_name, params = {}, request_headers = headers_with_token)
......@@ -297,7 +297,7 @@ describe API::MavenPackages do
def download_file(file_name, params = {}, request_headers = headers)
get api("/projects/#{project.id}/packages/maven/" \
"#{maven_metadatum.path}/#{file_name}"), params, request_headers
"#{maven_metadatum.path}/#{file_name}"), params: params, headers: request_headers
end
def download_file_with_token(file_name, params = {}, request_headers = headers_with_token)
......@@ -345,7 +345,7 @@ describe API::MavenPackages do
end
def authorize_upload(params = {}, request_headers = headers)
put api("/projects/#{project.id}/packages/maven/com/example/my-app/1.0-SNAPSHOT/maven-metadata.xml/authorize"), params, request_headers
put api("/projects/#{project.id}/packages/maven/com/example/my-app/1.0-SNAPSHOT/maven-metadata.xml/authorize"), params: params, headers: request_headers
end
def authorize_upload_with_token(params = {}, request_headers = headers_with_token)
......@@ -408,7 +408,7 @@ describe API::MavenPackages do
end
def upload_file(params = {}, request_headers = headers)
put api("/projects/#{project.id}/packages/maven/com/example/my-app/1.0-SNAPSHOT/maven-metadata.xml"), params, request_headers
put api("/projects/#{project.id}/packages/maven/com/example/my-app/1.0-SNAPSHOT/maven-metadata.xml"), params: params, headers: request_headers
end
def upload_file_with_token(params = {}, request_headers = headers_with_token)
......
ee/spec/requests/api/merge_request_approvals_spec.rb
View file @ 77b85029
......@@ -81,7 +81,7 @@ describe API::MergeRequestApprovals do
it 'allows you to override approvals required' do
expect do
post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approvals", current_user), approvals_required: 5
post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approvals", current_user), params: { approvals_required: 5 }
end.to change { merge_request.reload.approvals_before_merge }.from(nil).to(5)
expect(response).to have_gitlab_http_status(201)
......@@ -95,7 +95,7 @@ describe API::MergeRequestApprovals do
it 'does not include an error in the response' do
expect do
post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approvals", current_user), approvals_required: 0
post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approvals", current_user), params: { approvals_required: 0 }
end.to change {merge_request.reload.approvals_before_merge}.from(nil).to(0)
expect(json_response['message']).to eq(nil)
end
......@@ -103,7 +103,7 @@ describe API::MergeRequestApprovals do
it 'does not allow approvals required under what the project requires' do
expect do
post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approvals", current_user), approvals_required: 1
post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approvals", current_user), params: { approvals_required: 1 }
end.not_to change { merge_request.reload.approvals_before_merge }
expect(response).to have_gitlab_http_status(400)
......@@ -117,7 +117,7 @@ describe API::MergeRequestApprovals do
it 'does not allow you to override approvals required' do
expect do
post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approvals", current_user), approvals_required: 5
post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approvals", current_user), params: { approvals_required: 5 }
end.not_to change { merge_request.reload.approvals_before_merge }
expect(response).to have_gitlab_http_status(422)
......@@ -128,7 +128,7 @@ describe API::MergeRequestApprovals do
private_group = create(:group, :private)
merge_request.approver_groups.create(group: private_group)
post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approvals", current_user), approvals_required: 5
post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approvals", current_user), params: { approvals_required: 5 }
expect(response).to have_gitlab_http_status(201)
expect(json_response['approver_groups'].size).to eq(approver_groups_count)
......@@ -156,7 +156,7 @@ describe API::MergeRequestApprovals do
it 'does not allow you to override approvals required' do
expect do
post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approvals", user2), approvals_required: 5
post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approvals", user2), params: { approvals_required: 5 }
end.not_to change { merge_request.reload.approvals_before_merge }
expect(response).to have_gitlab_http_status(403)
......@@ -179,7 +179,7 @@ describe API::MergeRequestApprovals do
it 'does not allow overriding approvers' do
expect do
put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approvers", current_user),
approver_ids: [approver.id], approver_group_ids: [approver_group.id]
params: { approver_ids: [approver.id], approver_group_ids: [approver_group.id] }
end.to not_change { merge_request.approvers.count }.and not_change { merge_request.approver_groups.count }
end
end
......@@ -192,7 +192,7 @@ describe API::MergeRequestApprovals do
it 'allows overriding approvers' do
expect do
put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approvers", current_user),
approver_ids: [approver.id], approver_group_ids: [approver_group.id]
params: { approver_ids: [approver.id], approver_group_ids: [approver_group.id] }
end.to change { merge_request.approvers.count }.from(0).to(1)
.and change { merge_request.approver_groups.count }.from(0).to(1)
......@@ -207,7 +207,7 @@ describe API::MergeRequestApprovals do
expect do
put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approvers", current_user),
{ approver_ids: [], approver_group_ids: [] }.to_json, { CONTENT_TYPE: 'application/json' }
params: { approver_ids: [], approver_group_ids: [] }.to_json, headers: { CONTENT_TYPE: 'application/json' }
end.to change { merge_request.approvers.count }.from(1).to(0)
.and change { merge_request.approver_groups.count }.from(1).to(0)
......@@ -222,7 +222,7 @@ describe API::MergeRequestApprovals do
expect do
put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approvers", current_user),
approver_ids: '', approver_group_ids: ''
params: { approver_ids: '', approver_group_ids: '' }
end.to change { merge_request.approvers.count }.from(1).to(0)
.and change { merge_request.approver_groups.count }.from(1).to(0)
......@@ -237,7 +237,7 @@ describe API::MergeRequestApprovals do
merge_request.approver_groups.create(group: private_group)
put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approvers", current_user),
approver_ids: [approver.id], approver_group_ids: [private_group.id, approver_group.id]
params: { approver_ids: [approver.id], approver_group_ids: [private_group.id, approver_group.id] }
expect(response).to have_gitlab_http_status(200)
expect(json_response['approver_groups'].size).to eq(approver_groups_count)
......@@ -266,7 +266,7 @@ describe API::MergeRequestApprovals do
it 'does not allow overriding approvers' do
expect do
put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approvers", user2),
approver_ids: [approver.id], approver_group_ids: [approver_group.id]
params: { approver_ids: [approver.id], approver_group_ids: [approver_group.id] }
end.to not_change { merge_request.approvers.count }.and not_change { merge_request.approver_groups.count }
expect(response).to have_gitlab_http_status(403)
......@@ -294,7 +294,7 @@ describe API::MergeRequestApprovals do
end
def approve(extra_params = {})
post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approve", approver), extra_params
post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/approve", approver), params: extra_params
end
context 'when the sha param is not set' do
......
ee/spec/requests/api/merge_requests_spec.rb
View file @ 77b85029
......@@ -29,7 +29,7 @@ describe API::MergeRequests do
milestone_id: milestone.id
}
defaults = defaults.merge(args)
post api("/projects/#{project.id}/merge_requests", user), defaults
post api("/projects/#{project.id}/merge_requests", user), params: defaults
end
context 'between branches projects' do
it "returns merge_request" do
......
ee/spec/requests/api/namespaces_spec.rb
View file @ 77b85029
......@@ -113,7 +113,7 @@ describe API::Namespaces do
context 'when authenticated as admin' do
it 'updates namespace using full_path' do
put api("/namespaces/#{group1.full_path}", admin), plan: 'silver', shared_runners_minutes_limit: 9001
put api("/namespaces/#{group1.full_path}", admin), params: { plan: 'silver', shared_runners_minutes_limit: 9001 }
expect(response).to have_gitlab_http_status(200)
expect(json_response['plan']).to eq('silver')
......@@ -121,7 +121,7 @@ describe API::Namespaces do
end
it 'updates namespace using id' do
put api("/namespaces/#{group1.id}", admin), plan: 'silver', shared_runners_minutes_limit: 9001
put api("/namespaces/#{group1.id}", admin), params: { plan: 'silver', shared_runners_minutes_limit: 9001 }
expect(response).to have_gitlab_http_status(200)
expect(json_response['plan']).to eq('silver')
......@@ -131,7 +131,7 @@ describe API::Namespaces do
context 'when not authenticated as admin' do
it 'retuns 403' do
put api("/namespaces/#{group1.id}", user), plan: 'silver'
put api("/namespaces/#{group1.id}", user), params: { plan: 'silver' }
expect(response).to have_gitlab_http_status(403)
end
......@@ -139,7 +139,7 @@ describe API::Namespaces do
context 'when namespace not found' do
it 'returns 404' do
put api("/namespaces/12345", admin), plan: 'silver'
put api("/namespaces/12345", admin), params: { plan: 'silver' }
expect(response).to have_gitlab_http_status(404)
expect(json_response).to eq('message' => '404 Namespace Not Found')
......@@ -148,7 +148,7 @@ describe API::Namespaces do
context 'when invalid params' do
it 'returns validation error' do
put api("/namespaces/#{group1.id}", admin), plan: 'unknown'
put api("/namespaces/#{group1.id}", admin), params: { plan: 'unknown' }
expect(response).to have_gitlab_http_status(400)
expect(json_response['message']).to eq('plan' => ['is not included in the list'])
......@@ -165,7 +165,7 @@ describe API::Namespaces do
end
def do_post(current_user, payload)
post api("/namespaces/#{group1.id}/gitlab_subscription", current_user), payload
post api("/namespaces/#{group1.id}/gitlab_subscription", current_user), params: payload
end
context 'when authenticated as a regular user' do
......@@ -239,7 +239,7 @@ describe API::Namespaces do
describe 'PUT :id/gitlab_subscription' do
def do_put(namespace_id, current_user, payload)
put api("/namespaces/#{namespace_id}/gitlab_subscription", current_user), payload
put api("/namespaces/#{namespace_id}/gitlab_subscription", current_user), params: payload
end
set(:namespace) { create(:group) }
......
ee/spec/requests/api/project_approvals_spec.rb
View file @ 77b85029
......@@ -51,13 +51,13 @@ describe API::ProjectApprovals do
context 'when the request is correct' do
it 'returns 201 status' do
post api(url, current_user), approvals_before_merge: 3
post api(url, current_user), params: { approvals_before_merge: 3 }
expect(response).to have_gitlab_http_status(201)
end
it 'matches the response schema' do
post api(url, current_user), approvals_before_merge: 3
post api(url, current_user), params: { approvals_before_merge: 3 }
expect(response).to match_response_schema('public_api/v4/project_approvers', dir: 'ee')
end
......@@ -74,7 +74,7 @@ describe API::ProjectApprovals do
disable_overriding_approvers_per_merge_request: false
}
post api(url, current_user), settings
post api(url, current_user), params: settings
expect(JSON.parse(response.body).symbolize_keys).to include(settings)
end
......@@ -83,7 +83,7 @@ describe API::ProjectApprovals do
private_group = create(:group, :private)
project.approver_groups.create(group: private_group)
post api(url, current_user), approvals_before_merge: 3
post api(url, current_user), params: { approvals_before_merge: 3 }
expect(response).to match_response_schema('public_api/v4/project_approvers', dir: 'ee')
expect(json_response["approver_groups"].size).to eq(visible_approver_groups_count)
......@@ -107,7 +107,7 @@ describe API::ProjectApprovals do
context 'as a user without access' do
it 'returns 403' do
post api(url, user2), approvals_before_merge: 4
post api(url, user2), params: { approvals_before_merge: 4 }
expect(response).to have_gitlab_http_status(403)
end
......@@ -122,7 +122,7 @@ describe API::ProjectApprovals do
project.approvers.create(user: approver)
expect do
put api(url, current_user), { approver_ids: [], approver_group_ids: [] }.to_json, { CONTENT_TYPE: 'application/json' }
put api(url, current_user), params: { approver_ids: [], approver_group_ids: [] }.to_json, headers: { CONTENT_TYPE: 'application/json' }
end.to change { project.approvers.count }.from(1).to(0)
expect(response).to have_gitlab_http_status(200)
......@@ -135,7 +135,7 @@ describe API::ProjectApprovals do
project.approvers.create(user: approver)
expect do
put api(url, current_user), approver_ids: '', approver_group_ids: ''
put api(url, current_user), params: { approver_ids: '', approver_group_ids: '' }
end.to change { project.approvers.count }.from(1).to(0)
expect(response).to have_gitlab_http_status(200)
......@@ -148,7 +148,7 @@ describe API::ProjectApprovals do
project.approvers.create(user: approver)
expect do
put api(url, current_user), approver_ids: [approver.id], approver_group_ids: [group.id]
put api(url, current_user), params: { approver_ids: [approver.id], approver_group_ids: [group.id] }
end.to change { project.approvers.count }.by(0).and change { project.approver_groups.count }.from(0).to(1)
expect(project.approvers.count).to eq(1)
......@@ -165,7 +165,7 @@ describe API::ProjectApprovals do
project.approvers.create(user: approver)
expect do
put api(url, current_user), approver_ids: [approver.id], approver_group_ids: [private_group.id]
put api(url, current_user), params: { approver_ids: [approver.id], approver_group_ids: [private_group.id] }
end.to change { project.approver_groups.count }.from(0).to(1)
expect(response).to match_response_schema('public_api/v4/project_approvers', dir: 'ee')
......@@ -192,7 +192,7 @@ describe API::ProjectApprovals do
project.approvers.create(user: approver)
expect do
put api(url, user2), { approver_ids: [], approver_group_ids: [] }.to_json, { CONTENT_TYPE: 'application/json' }
put api(url, user2), params: { approver_ids: [], approver_group_ids: [] }.to_json, headers: { CONTENT_TYPE: 'application/json' }
end.not_to change { project.approvers.count }
expect(response).to have_gitlab_http_status(403)
......
ee/spec/requests/api/project_import_spec.rb
View file @ 77b85029
......@@ -24,10 +24,12 @@ describe API::ProjectImport do
Sidekiq::Testing.inline! do
post api('/projects/import', user),
path: 'test-import',
file: fixture_file_upload(file),
namespace: namespace.id,
override_params: override_params
params: {
path: 'test-import',
file: fixture_file_upload(file),
namespace: namespace.id,
override_params: override_params
}
end
import_project = Project.find(json_response['id'])
......
ee/spec/requests/api/project_mirror_spec.rb
View file @ 77b85029
This diff is collapsed.
ee/spec/requests/api/projects_spec.rb
View file @ 77b85029
This diff is collapsed.
ee/spec/requests/api/runner_spec.rb
View file @ 77b85029
This diff is collapsed.
ee/spec/requests/api/search_spec.rb
View file @ 77b85029
This diff is collapsed.
ee/spec/requests/api/settings_spec.rb
View file @ 77b85029
This diff is collapsed.
ee/spec/requests/api/unleash_spec.rb
View file @ 77b85029
This diff is collapsed.
ee/spec/requests/api/variables_spec.rb
View file @ 77b85029
This diff is collapsed.
ee/spec/requests/git_http_geo_spec.rb
View file @ 77b85029
This diff is collapsed.
ee/spec/requests/rack_attack_global_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/controllers/graphql_controller_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/controllers/groups_controller_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/controllers/health_controller_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/controllers/help_controller_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/controllers/invites_controller_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/controllers/search_controller_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/controllers/uploads_controller_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/controllers/users_controller_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/initializers/lograge_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/lib/mattermost/session_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/access_requests_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/applications_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/avatar_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/award_emoji_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/badges_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/boards_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/branches_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/commit_statuses_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/commits_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/deploy_keys_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/doorkeeper_access_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/environments_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/events_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/features_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/files_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/group_boards_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/group_variables_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/groups_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/helpers_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/internal_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/issues_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/jobs_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/labels_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/lint_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/markdown_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/members_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/merge_requests_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/notes_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/oauth_tokens_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/pages_domains_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/pipelines_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/project_export_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/project_hooks_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/project_import_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/project_snapshots_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/project_snippets_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/project_templates_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/projects_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/protected_tags_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/repositories_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/runner_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/runners_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/search_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/services_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/settings_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/snippets_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/submodules_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/suggestions_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/system_hooks_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/tags_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/todos_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/triggers_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/users_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/variables_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/api/wikis_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/git_http_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/jwt_controller_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/lfs_http_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/lfs_locks_api_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/oauth_tokens_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/openid_connect_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/rack_attack_global_spec.rb
View file @ 77b85029
This diff is collapsed.
spec/requests/request_profiler_spec.rb
View file @ 77b85029
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7