Skip to content

Commit f1889c0

Browse files
committed
Fix Rubocop offenses
1 parent 0328551 commit f1889c0

9 files changed

+9
-18
lines changed

app/controllers/codeharbor_links_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ def set_user_and_authorize
6464
end
6565

6666
def codeharbor_link_params
67-
params.require(:codeharbor_link).permit(:push_url, :check_uuid_url, :api_key)
67+
params.expect(codeharbor_link: %i[push_url check_uuid_url api_key])
6868
end
6969
end

app/controllers/comments_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ def set_comment
7575
end
7676

7777
def comment_params_for_update
78-
params.require(:comment).permit(:text)
78+
params.expect(comment: [:text])
7979
end
8080

8181
def comment_params_without_request_id
8282
comment_params.except :request_id
8383
end
8484

8585
def comment_params
86-
params.require(:comment).permit(:file_id, :row, :column, :text, :request_id).merge(user: current_user)
86+
params.expect(comment: %i[file_id row column text request_id]).merge(user: current_user)
8787
end
8888

8989
def send_mail_to_author(comment, request_for_comment)

app/controllers/internal_users_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def deliver_reset_password_instructions
112112
end
113113

114114
def internal_user_params
115-
permitted_params = params.require(:internal_user).permit(:consumer_id, :email, :name, study_group_ids: []).presence || {}
115+
permitted_params = params.expect(internal_user: [:consumer_id, :email, :name, {study_group_ids: []}]).presence || {}
116116
checked_study_group_memberships = @study_group_memberships.select {|sgm| permitted_params[:study_group_ids]&.include? sgm.study_group.id.to_s }
117117
removed_study_group_memberships = @study_group_memberships.reject {|sgm| permitted_params[:study_group_ids]&.include? sgm.study_group.id.to_s }
118118

app/controllers/programming_groups_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def authorize!
106106
end
107107

108108
def programming_group_params
109-
params.require(:programming_group).permit(:programming_partner_ids, programming_group_membership_ids: []) if params[:programming_group].present?
109+
params.expect(programming_group: [:programming_partner_ids, {programming_group_membership_ids: []}]) if params[:programming_group].present?
110110
end
111111

112112
def set_exercise_and_authorize

app/controllers/request_for_comments_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def set_request_for_comment
171171

172172
def request_for_comment_params
173173
# The study_group_id might not be present in the session (e.g. for internal users), resulting in session[:study_group_id] = nil which is intended.
174-
params.require(:request_for_comment).permit(:exercise_id, :file_id, :question, :requested_at, :solved, :submission_id).merge(user: current_user)
174+
params.expect(request_for_comment: %i[exercise_id file_id question requested_at solved submission_id]).merge(user: current_user)
175175
end
176176

177177
# The index page requires the grouping of the study groups

app/controllers/study_groups_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def destroy
3232
end
3333

3434
def study_group_params
35-
params.require(:study_group).permit(:name, study_group_membership_ids: [])
35+
params.expect(study_group: [:name, {study_group_membership_ids: []}])
3636
end
3737
private :study_group_params
3838

app/controllers/webauthn_credential_authentication_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def deny_access_for_users_without_webauthn_credentials
6565
def credential_param
6666
return @credential_param if defined? @credential_param
6767

68-
credential_param = params.require(:webauthn_credential).permit(:credential)[:credential]
68+
credential_param = params.expect(webauthn_credential: [:credential])[:credential]
6969
@credential_param = JSON.parse(credential_param.to_s)
7070
rescue JSON::ParserError
7171
@credential_param = {}

app/controllers/webauthn_credentials_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def set_webauthn_credential
121121
end
122122

123123
def webauthn_credential_params
124-
params.require(:webauthn_credential).permit(:credential, :label)
124+
params.expect(webauthn_credential: %i[credential label])
125125
end
126126

127127
def credential_param

spec/controllers/comments_controller_spec.rb

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,6 @@
4848

4949
expect_http_status(:ok)
5050
end
51-
52-
it 'still reports unpermitted parameters' do
53-
allow(ActionController::Parameters).to receive(:action_on_unpermitted_parameters).and_return(:log)
54-
ActiveSupport::Notifications.subscribe('unpermitted_parameters.action_controller') do |_name, _start, _finish, _id, payload|
55-
@unpermitted_params = payload[:keys]
56-
end
57-
perform_request.call
58-
expect(@unpermitted_params).to match_array(%w[row file_id]) # rubocop:disable RSpec/InstanceVariable
59-
end
6051
end
6152
end
6253
end

0 commit comments

Comments
 (0)