diff --git a/Gemfile b/Gemfile index 249fd59b61e..7f533f96294 100644 --- a/Gemfile +++ b/Gemfile @@ -86,7 +86,7 @@ group :test do gem 'rubocop', '~> 1.72.2' gem 'rubocop-capybara' gem 'rubocop-factory_bot' - gem 'rubocop-rails', '~> 2.29' + gem 'rubocop-rails', '~> 2.30' gem 'rubocop-rspec', '~> 3.4' gem 'rubocop-rspec_rails' gem 'rubocop-sequel', '~> 0.4.1' diff --git a/Gemfile.lock b/Gemfile.lock index 291bf830568..e6e73dd0af6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -311,7 +311,7 @@ GEM mime-types-data (3.2025.0318) mini_mime (1.1.5) mini_portile2 (2.8.8) - minitest (5.25.4) + minitest (5.25.5) mock_redis (0.49.0) redis (~> 5) ms_rest (0.6.4) @@ -489,11 +489,12 @@ GEM rubocop-factory_bot (2.27.1) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) - rubocop-rails (2.29.1) + rubocop-rails (2.30.3) activesupport (>= 4.2.0) + lint_roller (~> 1.1) rack (>= 1.1) - rubocop (>= 1.52.0, < 2.0) - rubocop-ast (>= 1.31.1, < 2.0) + rubocop (>= 1.72.1, < 2.0) + rubocop-ast (>= 1.38.0, < 2.0) rubocop-rspec (3.5.0) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) @@ -673,7 +674,7 @@ DEPENDENCIES rubocop (~> 1.72.2) rubocop-capybara rubocop-factory_bot - rubocop-rails (~> 2.29) + rubocop-rails (~> 2.30) rubocop-rspec (~> 3.4) rubocop-rspec_rails rubocop-sequel (~> 0.4.1) diff --git a/app/presenters/error_presenter.rb b/app/presenters/error_presenter.rb index 6b58f7ee616..5dcb71abf36 100644 --- a/app/presenters/error_presenter.rb +++ b/app/presenters/error_presenter.rb @@ -29,9 +29,7 @@ def to_hash end end - def api_error? - @error_hasher.api_error? - end + delegate :api_error?, to: :@error_hasher private diff --git a/app/presenters/system_environment/service_instance_presenter.rb b/app/presenters/system_environment/service_instance_presenter.rb index ed72363f8d9..f4115e3393b 100644 --- a/app/presenters/system_environment/service_instance_presenter.rb +++ b/app/presenters/system_environment/service_instance_presenter.rb @@ -7,9 +7,7 @@ def initialize(service_instance) end end - def to_hash - @presenter.to_hash - end + delegate :to_hash, to: :@presenter class ProvidedPresenter def initialize(service_instance) diff --git a/lib/cloud_controller/errors/instances_unavailable.rb b/lib/cloud_controller/errors/instances_unavailable.rb index b0469bf4515..5ca7c2661dc 100644 --- a/lib/cloud_controller/errors/instances_unavailable.rb +++ b/lib/cloud_controller/errors/instances_unavailable.rb @@ -5,9 +5,7 @@ def initialize(wrapped_exception) @wrapped_exception = wrapped_exception end - def to_s - @wrapped_exception.to_s - end + delegate :to_s, to: :@wrapped_exception end end end diff --git a/lib/cloud_controller/errors/no_running_instances.rb b/lib/cloud_controller/errors/no_running_instances.rb index e9a233d8f42..2247bcb8770 100644 --- a/lib/cloud_controller/errors/no_running_instances.rb +++ b/lib/cloud_controller/errors/no_running_instances.rb @@ -5,9 +5,7 @@ def initialize(wrapped_exception) @wrapped_exception = wrapped_exception end - def to_s - @wrapped_exception.to_s - end + delegate :to_s, to: :@wrapped_exception end end end diff --git a/lib/cloud_controller/security/access_context.rb b/lib/cloud_controller/security/access_context.rb index c94137a6ffb..d8882b61c15 100644 --- a/lib/cloud_controller/security/access_context.rb +++ b/lib/cloud_controller/security/access_context.rb @@ -15,9 +15,7 @@ def admin_override VCAP::CloudController::SecurityContext.admin? || VCAP::CloudController::SecurityContext.admin_read_only? || VCAP::CloudController::SecurityContext.global_auditor? end - def roles - VCAP::CloudController::SecurityContext.roles - end + delegate :roles, to: :'VCAP::CloudController::SecurityContext' def user_email VCAP::CloudController::SecurityContext.current_user_email diff --git a/lib/sequel_plugins/vcap_serialization.rb b/lib/sequel_plugins/vcap_serialization.rb index f7d4e9300b2..02b675a24bf 100644 --- a/lib/sequel_plugins/vcap_serialization.rb +++ b/lib/sequel_plugins/vcap_serialization.rb @@ -37,9 +37,7 @@ def export_attrs self.class.export_attrs || [] end - def export_attrs_from_methods - self.class.export_attrs_from_methods - end + delegate :export_attrs_from_methods, to: :class # Update the model instance from the supplied json string. Only update # attributes specified by import_attributes. diff --git a/lib/services/sso/uaa/uaa_client_manager.rb b/lib/services/sso/uaa/uaa_client_manager.rb index 939551f8977..b339c02dce4 100644 --- a/lib/services/sso/uaa/uaa_client_manager.rb +++ b/lib/services/sso/uaa/uaa_client_manager.rb @@ -10,9 +10,7 @@ def initialize(opts={}) @uaa_client = create_uaa_client end - def get_clients(client_ids) - @uaa_client.get_clients(client_ids) - end + delegate :get_clients, to: :@uaa_client def modify_transaction(changeset) return if changeset.empty?