v3: rubocop update

.rubocop.yml

@@ -1,6 +1,8 @@
 require:
   - rubocop-packaging
   - rubocop-performance
+  - rubocop-rails
+  - rubocop-rake
   - rubocop-rspec
 
 AllCops:
@@ -24,6 +26,10 @@ Layout/LineLength:
     - '^When'
     - '^Then'
 
+# This cop isn't relevant for our codebase
+Rails/RakeEnvironment:
+  Enabled: false
+
 # This allows us to read the chmod action in a more reproducible way
 Style/NumericLiteralPrefix:
   EnforcedOctalStyle: zero_only

CHANGELOG.md

@@ -10,6 +10,7 @@ This file is intended to be modified using the [`changelog`](github.com/cucumber
 ## [Unreleased]
 ### Changed
 - Add support for Rails 7.1 [#575](https://github.com/cucumber/cucumber-rails/pull/575)
+- Added new rubocop sub-gems (rails / rake) and updated versions to 2.6 ruby-conformance [#581](https://github.com/cucumber/cucumber-rails/pull/581)
 
 ### Fixed
 - Some of the rails 5.2 tests were installing lots of old conflicting gems ([luke-hill])

Rakefile

@@ -34,15 +34,16 @@ namespace :test do
 end
 
 namespace :gemfiles do
-  desc 'Install dependencies for all gemfiles'
+  desc 'Re-install dependencies for all gemfiles'
   task :install do
     system 'bundle exec appraisal update'
   end
 
+  desc 'Remove all generated gemfiles'
   task :clean do
     FileUtils.rm_rf('gemfiles/*')
   end
 
-  desc 'Rebuild generated gemfiles and install dependencies'
+  desc 'Remove all generated gemfiles and re-install dependencies'
   task rebuild: %i[clean install]
 end

cucumber-rails.gemspec

@@ -36,10 +36,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rails', '>= 5.2', '< 8')
   s.add_development_dependency('rake', '>= 12.0')
   s.add_development_dependency('rspec', '~> 3.6')
-  s.add_development_dependency('rubocop', '~> 1.31.0')
-  s.add_development_dependency('rubocop-packaging', '~> 0.5.1')
-  s.add_development_dependency('rubocop-performance', '~> 1.17.0')
-  s.add_development_dependency('rubocop-rspec', '~> 2.12.0')
+  s.add_development_dependency('rubocop', '~> 1.45.0')
+  s.add_development_dependency('rubocop-packaging', '~> 0.5.2')
+  s.add_development_dependency('rubocop-performance', '~> 1.17.1')
+  s.add_development_dependency('rubocop-rails', '~> 2.18.0')
+  s.add_development_dependency('rubocop-rake', '~> 0.6.0')
+  s.add_development_dependency('rubocop-rspec', '~> 2.17.0')
 
   # For Documentation:
   s.add_development_dependency('yard', '~> 0.9.10')

lib/cucumber/rails.rb

@@ -14,9 +14,12 @@
   require 'rails/test_help'
 
   unless Rails.application.config.cache_classes || defined?(Spring)
-    warn "WARNING: You have set Rails' config.cache_classes to false
-    (Spring needs cache_classes set to false). This is known to cause problems
-    with database transactions. Set config.cache_classes to true if you want to use transactions."
+    warn <<~MESSAGE
+      WARNING: You have set Rails' config.cache_classes to false (Spring needs cache_classes set to false).
+      This is known to cause problems with database transactions.
+
+      Set config.cache_classes to true if you want to use transactions.
+    MESSAGE
   end
 
   require 'cucumber/rails/world'
@@ -31,8 +34,10 @@
 
   MultiTest.disable_autorun
 else
-  warn "WARNING: Cucumber-rails required outside of env.rb.  The rest of loading is being deferred
-  until env.rb is called. To avoid this warning, move 'gem \'cucumber-rails\', require: false'
-  under only group :test in your Gemfile. If already in the :test group, be sure you are
-  specifying 'require: false'."
+  warn <<~MESSAGE
+    WARNING: Cucumber-rails has been required outside of env.rb. The rest of loading is being deferred until env.rb is called.
+
+    To avoid this warning, move `gem 'cucumber-rails', require: false` under `group :test` in your Gemfile.
+    If it is already in the `:test` group, be sure you are specifying 'require: false'.
+  MESSAGE
 end

lib/cucumber/rails/capybara/javascript_emulation.rb

@@ -108,14 +108,14 @@ class Node
 
 Before('not @no-js-emulation') do
   # Enable javascript emulation
-  ::Capybara::RackTest::Node.class_eval do
+  Capybara::RackTest::Node.class_eval do
     alias_method :click, :click_with_javascript_emulation
   end
 end
 
 Before('@no-js-emulation') do
   # Disable javascript emulation
-  ::Capybara::RackTest::Node.class_eval do
+  Capybara::RackTest::Node.class_eval do
     alias_method :click, :click_without_javascript_emulation
   end
 end

lib/cucumber/rails/capybara/select_dates_and_times.rb

@@ -70,4 +70,4 @@ def get_base_dom_id_from_label_tag(field)
   end
 end
 
-World(::Cucumber::Rails::Capybara::SelectDatesAndTimes)
+World(Cucumber::Rails::Capybara::SelectDatesAndTimes)

lib/cucumber/rails/hooks/mail.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if defined?(::ActionMailer)
+if defined?(ActionMailer)
   Before do
     ActionMailer::Base.deliveries = []
   end

lib/generators/cucumber/install_generator.rb

@@ -53,9 +53,6 @@ def create_database
 
       gsub_file 'config/database.yml', /^test:.*\n/, "test: &test\n"
       gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *test\n"
-
-      # Since gsub_file doesn't ask the user, just inform user that the file was overwritten.
-      puts '       force  config/database.yml'
     end
 
     protected

spec/generators/cucumber/install_generator_spec.rb

@@ -65,7 +65,7 @@ def create_config_files_the_generator_is_expected_to_modify
       it { is_expected.to contain 'load Cucumber::BINARY' }
     end
 
-    if ::Rails::VERSION::MAJOR >= 6
+    if Rails::VERSION::MAJOR >= 6
       %w[development test].each do |environment|
         describe "config/environments/#{environment}.rb" do
           subject { file("config/environments/#{environment}.rb") }