diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index a8125c26f..3ca89b264 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config --auto-gen-only-exclude --no-exclude-limit` -# on 2026-07-28 07:56:09 UTC using RuboCop version 1.88.2. +# on 2026-07-28 13:09:10 UTC using RuboCop version 1.88.2. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new @@ -18,54 +18,6 @@ Capybara/RSpec/VisibilityMatcher: Exclude: - 'spec/components/chapters_sidebar_component_spec.rb' -# Offense count: 3 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: EnforcedStyle, IndentationWidth. -# SupportedStyles: with_first_argument, with_fixed_indentation -Layout/ArgumentAlignment: - Exclude: - - 'app/controllers/admin/invitations_controller.rb' - - 'spec/features/member_portal_spec.rb' - -# Offense count: 1 -# This cop supports safe autocorrection (--autocorrect). -Layout/BlockEndNewline: - Exclude: - - 'app/models/workshop_invitation.rb' - -# Offense count: 6 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: EnforcedStyle, IndentationWidth. -# SupportedStyles: special_inside_parentheses, consistent, align_braces -Layout/FirstHashElementIndentation: - Exclude: - - 'lib/omniauth/strategies/codebar.rb' - -# Offense count: 1 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle. -# SupportedHashRocketStyles: key, separator, table -# SupportedColonStyles: key, separator, table -# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit -Layout/HashAlignment: - Exclude: - - 'app/controllers/admin/invitations_controller.rb' - -# Offense count: 1 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: EnforcedStyle, IndentationWidth. -# SupportedStyles: aligned, indented, indented_relative_to_receiver -Layout/MultilineMethodCallIndentation: - Exclude: - - 'app/controllers/dashboard_controller.rb' - -# Offense count: 1 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: AllowInHeredoc. -Layout/TrailingWhitespace: - Exclude: - - 'app/controllers/admin/invitations_controller.rb' - # Offense count: 10 # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: AllowedMethods, AllowedPatterns. @@ -327,12 +279,11 @@ RSpec/BeEmpty: Exclude: - 'spec/presenters/event_presenter_spec.rb' -# Offense count: 26 +# Offense count: 25 # This cop supports unsafe autocorrection (--autocorrect-all). RSpec/BeEq: Exclude: - 'spec/controllers/member/details_controller_spec.rb' - - 'spec/features/admin/manage_event_spec.rb' - 'spec/lib/tasks/feedback_rake_spec.rb' - 'spec/lib/tasks/mailing_list_rake_spec.rb' - 'spec/models/invitation_spec.rb' @@ -635,7 +586,7 @@ RSpec/MetadataStyle: - 'spec/features/viewing_pages_spec.rb' - 'spec/spec_helper.rb' -# Offense count: 135 +# Offense count: 136 # Configuration parameters: Max. RSpec/MultipleExpectations: Exclude: diff --git a/app/controllers/admin/invitations_controller.rb b/app/controllers/admin/invitations_controller.rb index 90678ec7d..381c811ea 100644 --- a/app/controllers/admin/invitations_controller.rb +++ b/app/controllers/admin/invitations_controller.rb @@ -10,8 +10,8 @@ def update if request.xhr? if params[:attended].present? - render partial: 'admin/workshop/attendance_row', -locals: { invitation: InvitationPresenter.new(@invitation), workshop: @workshop } + render partial: 'admin/workshop/attendance_row', + locals: { invitation: InvitationPresenter.new(@invitation), workshop: @workshop } else set_admin_workshop_data render partial: 'admin/workshops/invitation_management' diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 37b135024..90e797139 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -18,7 +18,7 @@ def show def dashboard @user = MemberPresenter.new(current_user) @ordered_events = DashboardQuery.upcoming_events_for_user(current_user) - .map.each_with_object({}) do |(key, value), hash| + .map.each_with_object({}) do |(key, value), hash| hash[key] = EventPresenter.decorate_collection(value) end @announcements = current_user.announcements.active diff --git a/app/models/workshop_invitation.rb b/app/models/workshop_invitation.rb index fc8c24d2d..df46751d6 100644 --- a/app/models/workshop_invitation.rb +++ b/app/models/workshop_invitation.rb @@ -24,7 +24,8 @@ class WorkshopInvitation < ApplicationRecord scope :not_reminded, -> { where(reminded_at: nil) } scope :on_waiting_list, -> { joins(:waiting_list) } scope :with_notes_and_their_authors, -> { - includes(member: [{ member_notes: :author }, :attendance_warnings]).includes(:overrider) } + includes(member: [{ member_notes: :author }, :attendance_warnings]).includes(:overrider) + } def waiting_list_position @waiting_list_position ||= WaitingList.by_workshop(workshop) diff --git a/lib/omniauth/strategies/codebar.rb b/lib/omniauth/strategies/codebar.rb index 9e668113d..461082207 100644 --- a/lib/omniauth/strategies/codebar.rb +++ b/lib/omniauth/strategies/codebar.rb @@ -90,17 +90,17 @@ def callback_phase provider: name, uid: email, info: { - email: email, - name: payload['name'] || email - }, + email: email, + name: payload['name'] || email + }, credentials: { - token: tokens['access_token'], - expires: tokens['expires_at'], - refresh_token: tokens['refresh_token'] - }, + token: tokens['access_token'], + expires: tokens['expires_at'], + refresh_token: tokens['refresh_token'] + }, extra: { - raw_info: payload - } + raw_info: payload + } }) call_app! diff --git a/spec/features/member_portal_spec.rb b/spec/features/member_portal_spec.rb index 510cfd4c0..79ab370a1 100644 --- a/spec/features/member_portal_spec.rb +++ b/spec/features/member_portal_spec.rb @@ -39,9 +39,9 @@ visit dashboard_path expect(page).to have_text("#{c1_workshop_presenter} at #{c1_workshop_presenter.venue.name}", - count: 1) + count: 1) expect(page).to have_text("#{c2_workshop_presenter} at #{c2_workshop_presenter.venue.name}", - count: 1) + count: 1) end end