Bump rubocop-rails from 2.25.1 to 2.33.4 (#5459)

* Bump rubocop-rails from 2.25.1 to 2.33.4

Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.25.1 to 2.33.4.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](rubocop/rubocop-rails@v2.25.1...v2.33.4)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-version: 2.33.4
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Fix lint failures

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Daniel Orner <[email protected]>

Author: dependabot[bot]

Gemfile

@@ -156,7 +156,7 @@ group :development, :test do
   gem "rubocop"
   # Rails add-on for static analysis.
   gem 'rubocop-performance'
-  gem "rubocop-rails", "~> 2.25.1"
+  gem "rubocop-rails", "~> 2.33.4"
   # More concise test ("should") matchers
   gem "shoulda-matchers", "~> 6.5"
   # Default rules for Rubocop.

Gemfile.lock

@@ -341,7 +341,7 @@ GEM
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.6.2)
-    json (2.16.0)
+    json (2.17.1)
     jwt (3.1.2)
       base64
     kaminari (1.2.2)
@@ -629,11 +629,12 @@ GEM
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.38.0, < 2.0)
-    rubocop-rails (2.25.1)
+    rubocop-rails (2.33.4)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
     ruby-graphviz (1.2.5)
       rexml
     ruby-progressbar (1.13.0)
@@ -702,9 +703,9 @@ GEM
     standard-performance (1.8.0)
       lint_roller (~> 1.1)
       rubocop-performance (~> 1.25.0)
-    standard-rails (1.1.0)
+    standard-rails (1.5.0)
       lint_roller (~> 1.0)
-      rubocop-rails (~> 2.25.0)
+      rubocop-rails (~> 2.33.4)
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
     stringio (3.1.9)
@@ -831,7 +832,7 @@ DEPENDENCIES
   rspec-rails (~> 8.0.2)
   rubocop
   rubocop-performance
-  rubocop-rails (~> 2.25.1)
+  rubocop-rails (~> 2.33.4)
   sass-rails
   shoulda-matchers (~> 6.5)
   simple_form

app/models/organization.rb

@@ -167,8 +167,8 @@ def ordered_requests
 
   # Computes full address string based on street, city, state, and zip, adding ', ' and ' ' separators
   def address
-    state_and_zip = [state, zipcode].select(&:present?).join(' ')
-    [street, city, state_and_zip].select(&:present?).join(', ')
+    state_and_zip = [state, zipcode].compact_blank.join(' ')
+    [street, city, state_and_zip].compact_blank.join(', ')
   end
 
   def address_changed?
@@ -298,6 +298,6 @@ def get_admin_email
   end
 
   def logo_size_check
-    errors.add(:logo, 'File size is greater than 1 MB') if logo.byte_size > 1.megabytes
+    errors.add(:logo, 'File size is greater than 1 MB') if logo.byte_size > 1.megabyte
   end
 end

spec/rails_helper.rb

@@ -31,8 +31,8 @@
 # directory. Alternatively, in the individual `*_spec.rb` files, manually
 # require only the support files necessary.
 #
-Dir[Rails.root.join("spec/support/**/*.rb")].sort.each { |f| require f }
-Dir[Rails.root.join("spec/controllers/shared_examples/*.rb")].sort.each { |f| require f }
+Rails.root.glob("spec/support/**/*.rb").sort.each { |f| require f }
+Rails.root.glob("spec/controllers/shared_examples/*.rb").sort.each { |f| require f }
 
 # Checks for pending migration and applies them before tests are run.
 # If you are not using ActiveRecord, you can remove this line.

spec/system/storage_location_system_spec.rb

@@ -185,8 +185,8 @@
       create(:storage_location, :with_items, item: item3, item_quantity: 10, name: "Baz")
       visit subject
 
-      expect(page.all('select[name="filters[containing]"] option').map(&:text).select(&:present?)).to eq(expected_order)
-      expect(page.all('select[name="filters[containing]"] option').map(&:text).select(&:present?)).not_to eq(expected_order.reverse)
+      expect(page.all('select[name="filters[containing]"] option').map(&:text).compact_blank).to eq(expected_order)
+      expect(page.all('select[name="filters[containing]"] option').map(&:text).compact_blank).not_to eq(expected_order.reverse)
     end
   end