diff --git a/Gemfile b/Gemfile index 249fd59b61e..e6fe3a4fb72 100644 --- a/Gemfile +++ b/Gemfile @@ -83,7 +83,7 @@ group :test do gem 'rspec-its' gem 'rspec-rails', '~> 7.1.1' gem 'rspec-wait' - gem 'rubocop', '~> 1.72.2' + gem 'rubocop', '~> 1.75.2' gem 'rubocop-capybara' gem 'rubocop-factory_bot' gem 'rubocop-rails', '~> 2.29' diff --git a/Gemfile.lock b/Gemfile.lock index 3c1e898011b..f50b6dc1119 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -469,7 +469,7 @@ GEM activesupport (>= 3.0.0) mustache (~> 1.0, >= 0.99.4) rspec (~> 3.0) - rubocop (1.72.2) + rubocop (1.75.2) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -477,7 +477,7 @@ GEM parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.38.0, < 2.0) + rubocop-ast (>= 1.44.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) rubocop-ast (1.44.1) @@ -670,7 +670,7 @@ DEPENDENCIES rspec-rails (~> 7.1.1) rspec-wait rspec_api_documentation (>= 6.1.0) - rubocop (~> 1.72.2) + rubocop (~> 1.75.2) rubocop-capybara rubocop-factory_bot rubocop-rails (~> 2.29) diff --git a/lib/cloud_controller/diego/staging_action_builder.rb b/lib/cloud_controller/diego/staging_action_builder.rb index 8d151f97011..d1dbdff9522 100644 --- a/lib/cloud_controller/diego/staging_action_builder.rb +++ b/lib/cloud_controller/diego/staging_action_builder.rb @@ -109,7 +109,7 @@ def download_actions end if !@config.get(:diego, - :enable_declarative_asset_downloads) && (lifecycle_data[:build_artifacts_cache_download_uri] && lifecycle_data[:buildpack_cache_checksum].present?) + :enable_declarative_asset_downloads) && lifecycle_data[:build_artifacts_cache_download_uri] && lifecycle_data[:buildpack_cache_checksum].present? result << try_action(::Diego::Bbs::Models::DownloadAction.new({ artifact: 'build artifacts cache', from: lifecycle_data[:build_artifacts_cache_download_uri], diff --git a/lib/cloud_controller/paging/sequel_paginator.rb b/lib/cloud_controller/paging/sequel_paginator.rb index 2cccc8481ac..46d8acf933c 100644 --- a/lib/cloud_controller/paging/sequel_paginator.rb +++ b/lib/cloud_controller/paging/sequel_paginator.rb @@ -37,7 +37,7 @@ def get_page(dataset, pagination_options) end def can_paginate_with_window_function?(dataset) - enable_paginate_window = Config.config.get(:db, :enable_paginate_window).nil? ? true : Config.config.get(:db, :enable_paginate_window) + enable_paginate_window = Config.config.get(:db, :enable_paginate_window).nil? || Config.config.get(:db, :enable_paginate_window) enable_paginate_window && dataset.supports_window_functions? && (!dataset.opts[:distinct] || !dataset.requires_unique_column_names_in_subquery_select_list?) end diff --git a/lib/services/service_brokers/v2/catalog_plan.rb b/lib/services/service_brokers/v2/catalog_plan.rb index 1879ede372b..c09779d60d8 100644 --- a/lib/services/service_brokers/v2/catalog_plan.rb +++ b/lib/services/service_brokers/v2/catalog_plan.rb @@ -14,7 +14,7 @@ def initialize(catalog_service, attrs) @name = attrs['name'] @description = attrs['description'] @errors = VCAP::Services::ValidationErrors.new - @free = attrs['free'].nil? ? true : attrs['free'] + @free = attrs['free'].nil? || attrs['free'] @bindable = attrs['bindable'] @plan_updateable = attrs['plan_updateable'] @maximum_polling_duration = attrs['maximum_polling_duration']