Support ruby 3.1 (#189)

**BREAKING**: Drop support for ruby 2.4

* Upgrade rubocop to version 1.22.0
* InvalidPredicateMatcher and CustomIncludeMethods are removed
* Add dependencies on `rubocop-rails` and `rubocop-performance`

Thanks @bmulholland and @RenzoMinelli

Author: RenzoMinelli

.github/workflows/rspec_rubocop.yml

@@ -18,19 +18,16 @@ jobs:
     strategy:
       matrix:
         include: # use bundler 2.3 for ruby versions < 2.6 (https://bundler.io/compatibility.html)
-        - ruby-version: 2.4
-          bundler-version: 2.3
         - ruby-version: 2.5
           bundler-version: 2.3
         - ruby-version: 2.6
           bundler-version: latest
         - ruby-version: 2.7
           bundler-version: latest
-        # TODO: reenable tests against ruby 3.0 after upgrading base Rubocop version above 1.22.0,
-        # thus correcting the syntax errors when running the Layout/BlockAlignment cop
-        # https://github.com/airbnb/ruby/pull/189#discussion_r1101793307
-        # - ruby-version: 3.0
-        #   bundler-version: latest
+        - ruby-version: 3.0
+          bundler-version: latest
+        - ruby-version: 3.1
+          bundler-version: latest
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby

rubocop-airbnb/config/default.yml

@@ -15,14 +15,6 @@ AllCops:
     - 'vendor/**/*'
     - Vagrantfile
     - Guardfile
-  RSpec:
-    Patterns:
-    - _spec.rb
-    - "(?:^|/)spec/"
-  RSpec/FactoryBot:
-    Patterns:
-    - spec/factories/**/*.rb
-    - features/support/factories/**/*.rb
 
   # While Rubocop has released a bunch of new cops, not all of these cops have been evaluated as
   # part of this styleguide. To prevent new, unevaluated cops from imposing on this styleguide, we
@@ -33,6 +25,15 @@ AllCops:
   # https://github.com/rubocop/rubocop/blob/1e55b1aa5e4c5eaeccad5d61f08b7930ed6bc341/config/default.yml#L89-L101
   DisabledByDefault: true
 
+RSpec:
+  Include:
+  - _spec.rb
+  - "(?:^|/)spec/"
+RSpec/FactoryBot:
+  Include:
+  - spec/factories/**/*.rb
+  - features/support/factories/**/*.rb
+
 inherit_from:
   - './rubocop-airbnb.yml'
   - './rubocop-bundler.yml'

rubocop-airbnb/config/rubocop-performance.yml

@@ -1,3 +1,6 @@
+require:
+    - rubocop-performance
+
 Performance/Caller:
   Enabled: false
 

rubocop-airbnb/config/rubocop-rails.yml

@@ -1,3 +1,6 @@
+require:
+  - rubocop-rails
+
 # before_action doesn't seem to exist, so this doesn't make sense.
 Rails/ActionFilter:
   Enabled: false

rubocop-airbnb/config/rubocop-rspec.yml

@@ -56,7 +56,6 @@ RSpec/DescribedClass:
 RSpec/EmptyExampleGroup:
   Description: Checks if an example group does not include any tests.
   Enabled: true
-  CustomIncludeMethods: []
 
 RSpec/EmptyLineAfterExampleGroup:
   Description: Checks if there is an empty line after example group blocks.
@@ -155,10 +154,6 @@ RSpec/InstanceVariable:
   Description: 'Checks for the usage of instance variables.'
   Enabled: false
 
-RSpec/InvalidPredicateMatcher:
-  Description: Checks invalid usage for predicate matcher.
-  Enabled: false
-
 RSpec/ItBehavesLike:
   Description: Checks that only one `it_behaves_like` style is used.
   Enabled: false
@@ -314,18 +309,18 @@ RSpec/VoidExpect:
   Description: This cop checks void `expect()`.
   Enabled: false
 
-Capybara/CurrentPathExpectation:
+RSpec/Capybara/CurrentPathExpectation:
   Description: Checks that no expectations are set on Capybara's `current_path`.
   Enabled: false
 
-Capybara/FeatureMethods:
+RSpec/Capybara/FeatureMethods:
   Description: Checks for consistent method usage in feature specs.
   Enabled: false
 
-FactoryBot/AttributeDefinedStatically:
+RSpec/FactoryBot/AttributeDefinedStatically:
   Description: Always declare attribute values as blocks.
   Enabled: false
 
-FactoryBot/CreateList:
+RSpec/FactoryBot/CreateList:
   Description: Checks for create_list usage.
   Enabled: true

rubocop-airbnb/lib/rubocop/cop/airbnb/class_or_module_declared_in_wrong_file.rb

@@ -56,7 +56,7 @@ module Airbnb
       #     class Bar # nested class
       #     end
       #   end
-      class ClassOrModuleDeclaredInWrongFile < Cop
+      class ClassOrModuleDeclaredInWrongFile < Base
         include Inflections
         include RailsAutoloading
 

rubocop-airbnb/lib/rubocop/cop/airbnb/const_assigned_in_wrong_file.rb

@@ -22,7 +22,7 @@ module Airbnb
       #   module Foo
       #     BAZ = 42
       #   end
-      class ConstAssignedInWrongFile < Cop
+      class ConstAssignedInWrongFile < Base
         include Inflections
         include RailsAutoloading
 

rubocop-airbnb/lib/rubocop/cop/airbnb/continuation_slash.rb

@@ -1,7 +1,7 @@
 module RuboCop
   module Cop
     module Airbnb
-      class ContinuationSlash < Cop
+      class ContinuationSlash < Base
         MSG = 'Slash continuation should be reserved for closed string continuation. ' \
               'Many times it is used to get around other existing rules.'.freeze
 

rubocop-airbnb/lib/rubocop/cop/airbnb/default_scope.rb

@@ -3,7 +3,7 @@ module Cop
     module Airbnb
       # Cop to help prevent the scorge of Default Scopes from ActiveRecord.
       # Once in place they are almost impossible to remove.
-      class DefaultScope < Cop
+      class DefaultScope < Base
         MSG = 'Avoid `default_scope`.  Default scopes make it difficult to '\
               'refactor data access patterns since the scope becomes part '\
               'of every query unless explicitly excluded, even when it is '\

rubocop-airbnb/lib/rubocop/cop/airbnb/factory_attr_references_class.rb

@@ -4,7 +4,7 @@ module Airbnb
       # Cop to enforce "attr { CONST }" instead of "attr CONST" in factories,
       # because the latter forces autoload, which slows down spec startup time and
       # Zeus reload time after touching a model.
-      class FactoryAttrReferencesClass < Cop
+      class FactoryAttrReferencesClass < Base
         MSG = "Instead of attr_name MyClass::MY_CONST, use attr_name { MyClass::MY_CONST }. " \
           "This enables faster spec startup time and Zeus reload time.".freeze