From e0b0b01e06b90cd3ff0feb322fb20e844b352076 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 11:38:25 +0000 Subject: [PATCH 1/3] Update rubocop-rspec_rails to version 2.30.0 --- Gemfile.lock | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index acbb799a..11f8a6c3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -485,8 +485,6 @@ GEM parser (>= 3.3.1.0) rubocop-capybara (2.21.0) rubocop (~> 1.41) - rubocop-factory_bot (2.26.1) - rubocop (~> 1.61) rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) @@ -495,13 +493,11 @@ GEM rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rspec (2.29.2) - rubocop (~> 1.40) - rubocop-capybara (~> 2.17) - rubocop-factory_bot (~> 2.22) - rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.28.3) - rubocop (~> 1.40) + rubocop-rspec (3.2.0) + rubocop (~> 1.61) + rubocop-rspec_rails (2.30.0) + rubocop (~> 1.61) + rubocop-rspec (~> 3, >= 3.0.1) ruby-oembed (0.17.0) ruby-openid (2.9.2) ruby-progressbar (1.13.0) From e1bb0102c959e2aab1bc1364d2e5267408e671ae Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Mon, 2 Dec 2024 12:49:06 +0100 Subject: [PATCH 2/3] Bundle all the rubocop plugins we supposedly use Requiring them in rubocopy.yml with them not being part of the bundle starts to fail now. --- Gemfile | 2 ++ Gemfile.lock | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Gemfile b/Gemfile index 0db8e5fa..fd24ba87 100644 --- a/Gemfile +++ b/Gemfile @@ -197,6 +197,8 @@ group :development do gem 'rubocop', require: false gem 'rubocop-rspec', require: false gem 'rubocop-rails', require: false + gem 'rubocop-rspec_rails', require: false + gem 'rubocop-factory_bot', require: false gem 'rubocop-capybara', require: false gem 'rubocop-performance', require: false gem 'haml_lint' diff --git a/Gemfile.lock b/Gemfile.lock index 11f8a6c3..e128c586 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -485,6 +485,8 @@ GEM parser (>= 3.3.1.0) rubocop-capybara (2.21.0) rubocop (~> 1.41) + rubocop-factory_bot (2.26.1) + rubocop (~> 1.61) rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) @@ -682,9 +684,11 @@ DEPENDENCIES rspec-rails rubocop rubocop-capybara + rubocop-factory_bot rubocop-performance rubocop-rails rubocop-rspec + rubocop-rspec_rails ruby-oembed sass-rails (>= 4.0.2) selectize-rails From 4a092c6be6cf02b6fb82ad5b369b3f24d3c1dee8 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Mon, 2 Dec 2024 12:50:10 +0100 Subject: [PATCH 3/3] Regenerate rubocop TODO --- .rubocop_todo.yml | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 3b48cdae..0d79098f 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,12 +1,12 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2024-06-07 15:38:52 UTC using RuboCop version 1.64.1. +# on 2024-12-02 11:47:52 UTC using RuboCop version 1.66.1. # 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 # versions of RuboCop, may require this file to be generated again. -# Offense count: 4 +# Offense count: 5 # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include. # Include: **/*.gemfile, **/Gemfile, **/gems.rb @@ -133,7 +133,7 @@ Layout/EmptyLineAfterMagicComment: Exclude: - 'spec/models/conference_spec.rb' -# Offense count: 100 +# Offense count: 101 # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: EnforcedStyle. # SupportedStyles: empty_lines, no_empty_lines @@ -526,7 +526,7 @@ Metrics/BlockLength: Max: 202 # Offense count: 1 -# Configuration parameters: CountBlocks. +# Configuration parameters: CountBlocks, CountModifierForms. Metrics/BlockNesting: Max: 4 @@ -645,17 +645,12 @@ RSpec/AnyInstance: # Offense count: 5 # This cop supports safe autocorrection (--autocorrect). +# Configuration parameters: AutoCorrect. RSpec/BeEmpty: Exclude: - 'spec/controllers/conference_registration_controller_spec.rb' - 'spec/models/conference_spec.rb' -# Offense count: 143 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: EnabledMethods. -RSpec/Capybara/FeatureMethods: - Enabled: false - # Offense count: 302 # Configuration parameters: Prefixes, AllowedPatterns. # Prefixes: when, with, without @@ -779,21 +774,6 @@ RSpec/ExpectChange: - 'spec/models/event_spec.rb' - 'spec/models/user_spec.rb' -# Offense count: 9 -# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly. -# Include: **/*_spec*rb*, **/spec/**/* -RSpec/FilePath: - Exclude: - - 'spec/controllers/conference_registration_controller_spec.rb' - - 'spec/controllers/physical_ticket_controller_spec.rb' - - 'spec/features/email_spec.rb' - - 'spec/features/omniauth_spec.rb' - - 'spec/features/proposals_spec.rb' - - 'spec/features/ticket_purchases_spec.rb' - - 'spec/features/venues_spec.rb' - - 'spec/models/comment_spec.rb' - - 'spec/models/openid.rb' - # Offense count: 166 # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: EnforcedStyle. @@ -1003,6 +983,7 @@ RSpec/ReturnFromStub: # Offense count: 18 # This cop supports safe autocorrection (--autocorrect). +# Configuration parameters: AutoCorrect. RSpec/ScatteredLet: Exclude: - 'spec/ability/ability_spec.rb' @@ -1010,6 +991,7 @@ RSpec/ScatteredLet: # Offense count: 2 # This cop supports safe autocorrection (--autocorrect). +# Configuration parameters: AutoCorrect. RSpec/ScatteredSetup: Exclude: - 'spec/models/payment_spec.rb'