Fix Rubocop offences

.rubocop.yml

@@ -4,14 +4,21 @@ inherit_from:
 AllCops:
   Exclude:
     # Templates are really ERB which Rubocop does not parse
-    - 'lib/generators/rspec/*/templates/**/*'
+    - bin/**/*
+    - lib/generators/rspec/*/templates/**/*
+
+Bundler/DuplicatedGem:
+  Enabled: false
 
 Layout/AccessModifierIndentation:
   Enabled: false
 
 Layout/AssignmentIndentation:
   Enabled: false
 
+Layout/BlockAlignment:
+  EnforcedStyleAlignWith: start_of_block
+
 Layout/ClosingParenthesisIndentation:
   Enabled: false
 
@@ -54,13 +61,20 @@ Layout/MultilineOperationIndentation:
 Layout/ParameterAlignment:
   EnforcedStyle: with_first_parameter
 
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+  EnforcedStyleForEmptyBraces: no_space
+
 Layout/SpaceInsidePercentLiteralDelimiters:
   Enabled: false
 
 # We use spaces, so it's less of a change to stick with that.
 Layout/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: space
 
+Layout/SpaceInsideBlockBraces:
+  EnforcedStyleForEmptyBraces: space
+
 Layout/SpaceAroundBlockParameters:
   Enabled: false
 
@@ -73,9 +87,29 @@ Layout/SpaceBeforeComma:
 Layout/SpaceInsideStringInterpolation:
   Enabled: false
 
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - spec/**/*
+
+Lint/AmbiguousOperator:
+  Exclude:
+    - Rakefile
+
+Lint/AmbiguousRegexpLiteral:
+  Exclude:
+    - features/step_definitions/additional_cli_steps.rb
+
 Lint/AssignmentInCondition:
   Enabled: false
 
+Lint/DuplicateMethods:
+  Exclude:
+    - example_app_generator/no_active_record/app/models/in_memory/model.rb
+
+Lint/NonDeterministicRequireOrder:
+  Exclude:
+    - spec/spec_helper.rb
+
 Lint/EmptyExpression:
   Enabled: false
 
@@ -94,6 +128,8 @@ Lint/SuppressedException:
     # RSpec is tightly coupled to capybara right now, this should be
     # re-evaluted in the future. For now we allow the empty rescue
     - lib/rspec/rails/vendor/capybara.rb
+    - example_app_generator/generate_stuff.rb
+    - example_app_generator/spec/support/default_preview_path
 
 Metrics/AbcSize:
   Enabled: false
@@ -108,6 +144,14 @@ Metrics/ClassLength:
 Metrics/PerceivedComplexity:
   Enabled: false
 
+Metrics/ModuleLength:
+  Exclude:
+    - spec/**/*
+
+Metrics/ParameterLists:
+  Exclude:
+    - example_app_generator/spec/verify_custom_renderers_spec.rb
+
 # Who cares what we call the argument for binary operator methods?
 Naming/BinaryOperatorParameterName:
   Enabled: false
@@ -162,9 +206,16 @@ Style/BlockDelimiters:
 Style/CaseEquality:
   Enabled: false
 
+Style/ClassAndModuleChildren:
+  Enabled: false
+
 Style/ClassCheck:
   Enabled: false
 
+Style/CommentedKeyword:
+  Exclude:
+    - spec/rspec/rails/example/view_example_group_spec.rb
+
 Style/ConditionalAssignment:
   Enabled: false
 
@@ -198,9 +249,22 @@ Style/FormatStringToken:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
+Style/GlobalVars:
+  Exclude:
+    - spec/support/shared_examples.rb
+
 Style/GuardClause:
   Enabled: false
 
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
 Style/IdenticalConditionalBranches:
   Enabled: false
 
@@ -237,6 +301,13 @@ Style/NestedModifier:
 Style/NestedParenthesizedCalls:
   Enabled: false
 
+Style/NumericLiterals:
+  Exclude:
+    - spec/rspec/rails/matchers/action_cable/have_stream_spec.rb
+
+Style/NumericLiteralPrefix:
+  EnforcedOctalStyle: zero_only
+
 Style/NumericPredicate:
   Enabled: false
 
@@ -258,6 +329,13 @@ Style/PercentLiteralDelimiters:
     '%W': '[]'    # array of double-quoted strings
     '%x': ()      # a shell command as a string
 
+Style/RaiseArgs:
+  Exclude:
+    - spec/rspec/rails/matchers/be_routable_spec.rb
+    - spec/rspec/rails/matchers/have_rendered_spec.rb
+    - spec/rspec/rails/matchers/redirect_to_spec.rb
+    - spec/rspec/rails/matchers/route_to_spec.rb
+
 Style/RegexpLiteral:
   Enabled: false
 
@@ -274,6 +352,16 @@ Style/RescueStandardError:
 Style/SignalException:
   Enabled: false
 
+Style/SingleLineMethods:
+  Exclude:
+    - spec/rspec/rails/example/controller_example_group_spec.rb
+    - spec/rspec/rails/matchers/active_job_spec.rb
+    - spec/rspec/rails/matchers/be_a_new_spec.rb
+    - spec/rspec/rails/matchers/has_spec.rb
+    - spec/rspec/rails/matchers/have_enqueued_mail_spec.rb
+    - spec/rspec/rails/matchers/have_rendered_spec.rb
+    - spec/rspec/rails/setup_and_teardown_adapter_spec.rb
+
 # This rule favors constant names from the English standard library which we don't load.
 Style/SpecialGlobalVars:
   Enabled: false

.rubocop_todo.yml

@@ -1,7 +1,3 @@
-# ruby 1.8.7 required trailing dots
-Layout/DotPosition:
-  EnforcedStyle: trailing
-
 # Over time we'd like to get this down, but this is what we're at now.
 Metrics/CyclomaticComplexity:
   Max: 9 # default: 6
@@ -13,22 +9,3 @@ Layout/LineLength:
 # Over time we'd like to get this down, but this is what we're at now.
 Metrics/MethodLength:
   Max: 43 # default: 10
-
-# each_with_object was unavailable on ruby 1.8.7
-Style/EachWithObject:
-  Enabled: false
-
-# the new lambda syntax was not supported in ruby 1.8.7
-Style/Lambda:
-  Enabled: false
-
-# we couldn't use named matches in ruby 1.8.7
-Style/PerlBackrefs:
-  Exclude:
-    - lib/generators/rspec/scaffold/scaffold_generator.rb
-
-# On 1.8 `proc` was `lambda`, so we used `Proc.new` to ensure we got real procs
-# on all supported versions.
-# http://batsov.com/articles/2014/02/04/the-elements-of-style-in-ruby-number-12-proc-vs-proc-dot-new/
-Style/Proc:
-  Enabled: false

BUILD_DETAIL.md

@@ -99,15 +99,15 @@ $ bin/yard doc --no-cache
 
 ## Rubocop
 
-We use [Rubocop](https://github.com/bbatsov/rubocop) to enforce style conventions on the project so
+We use [Rubocop](https://github.com/rubocop-hq/rubocop) to enforce style conventions on the project so
 that the code has stylistic consistency throughout. Run with:
 
 ```
-$ bundle exec rubocop lib
+$ bundle exec rubocop
 
 # or, if you installed your bundle with `--standalone --binstubs`:
 
-$ bin/rubocop lib
+$ bin/rubocop
 ```
 
 Our Rubocop configuration is a work-in-progress, so if you get a failure

DEVELOPMENT.md

@@ -108,7 +108,7 @@ Here's a short, non-exhaustive checklist of things we typically ask contributors
 - [ ] New behavior is covered by tests and all tests are passing.
 - [ ] No Ruby warnings are issued by your changes.
 - [ ] Documentation reflects changes and renders as intended.
-- [ ] Rubocop passes (e.g. `bundle exec rubocop lib`).
+- [ ] Rubocop passes (e.g. `bundle exec rubocop`).
 - [ ] Commits are squashed into a reasonable number of logical changesets that tell an easy-to-follow story.
 - [ ] No changelog entry is necessary (we'll add it as part of the merge process!)
 

Gemfile

@@ -1,13 +1,12 @@
 source "https://rubygems.org"
-version_file = File.expand_path("../.rails-version", __FILE__)
+version_file = File.expand_path('.rails-version', __dir__)
 RAILS_VERSION = ENV['RAILS_VERSION'] || (File.exist?(version_file) && File.read(version_file).chomp) || ""
 
 gemspec
 
-rspec_dependencies_gemfile = File.expand_path("../Gemfile-rspec-dependencies", __FILE__)
-eval_gemfile rspec_dependencies_gemfile
+eval_gemfile 'Gemfile-rspec-dependencies'
 
-gem 'yard', '~> 0.9.24', :require => false
+gem 'yard', '~> 0.9.24', require: false
 
 group :documentation do
   gem 'github-markup', '~> 3.0.3'
@@ -57,10 +56,9 @@ end
 
 gem "rubyzip", '~> 1.2'
 
-gem 'rubocop', '~> 0.79.0'
+gem 'rubocop', '~> 0.80.1'
 
-custom_gemfile = File.expand_path("../Gemfile-custom", __FILE__)
+custom_gemfile = File.expand_path('Gemfile-custom', __dir__)
 eval_gemfile custom_gemfile if File.exist?(custom_gemfile)
 
-rails_dependencies_gemfile = File.expand_path("../Gemfile-rails-dependencies", __FILE__)
-eval_gemfile rails_dependencies_gemfile
+eval_gemfile 'Gemfile-rails-dependencies'

Rakefile

@@ -62,7 +62,8 @@ namespace :generate do
 
       # Rails 4+ cannot use a `rails` binstub generated by Bundler
       sh "rm -f #{bindir}/rails"
-      sh "bundle exec rails new ./tmp/example_app --no-rc --skip-javascript --skip-bootsnap -skip-sprockets --skip-git --skip-test-unit --skip-listen --skip-bundle --template=example_app_generator/generate_app.rb"
+      sh "bundle exec rails new ./tmp/example_app --no-rc --skip-javascript --skip-bootsnap --skip-sprockets " \
+         "--skip-git --skip-test-unit --skip-listen --skip-bundle --template=example_app_generator/generate_app.rb"
 
       in_example_app do
         sh "./travis_retry_bundle_install.sh 2>&1"
@@ -122,7 +123,7 @@ end
 
 namespace :smoke do
   desc "create a new example app with generated specs and run them"
-  task :app => ["clobber:app", "generate:app", "generate:stuff", :smoke]
+  task app: ["clobber:app", "generate:app", "generate:stuff", :smoke]
 end
 
 desc 'clobber generated files'
@@ -143,6 +144,7 @@ end
 desc "Push docs/cukes to relishapp using the relish-client-gem"
 task :relish, :version do |_t, args|
   raise "rake relish[VERSION]" unless args[:version]
+
   sh "cp Changelog.md features/"
   if `relish versions rspec/rspec-rails`.split.map(&:strip).include? args[:version]
     puts "Version #{args[:version]} already exists"
@@ -159,12 +161,12 @@ namespace :no_active_record do
   desc "run a variety of specs against a non-ActiveRecord generated app"
   task :smoke do
     in_example_app "LOCATION='../../example_app_generator/run_specs.rb' bin/rake #{rails_template_command} --backtrace",
-                   :app_dir => example_app_dir
+                   app_dir: example_app_dir
   end
 
   namespace :smoke do
     desc "create a new example app without active record including generated specs and run them"
-    task :app => [
+    task app: [
       "no_active_record:clobber",
       "no_active_record:generate:app",
       "no_active_record:generate:stuff",
@@ -185,17 +187,18 @@ namespace :no_active_record do
 
         # Rails 4+ cannot use a `rails` binstub generated by Bundler
         sh "rm -f #{bindir}/rails"
-        sh "bundle exec rails new #{example_app_dir} --no-rc --skip-active-record --skip-javascript --skip-bootsnap --skip-sprockets --skip-git --skip-test-unit --skip-listen --skip-bundle --template=example_app_generator/generate_app.rb"
+        sh "bundle exec rails new #{example_app_dir} --no-rc --skip-active-record --skip-javascript --skip-bootsnap " \
+           "--skip-sprockets --skip-git --skip-test-unit --skip-listen --skip-bundle --template=example_app_generator/generate_app.rb"
 
-        in_example_app(:app_dir => example_app_dir) do
+        in_example_app(app_dir: example_app_dir) do
           sh "./travis_retry_bundle_install.sh 2>&1"
           # Rails 4+ cannot use a `rails` binstub generated by Bundler
           sh "bundle binstubs bundler rspec-core rake --force"
           sh "bundle binstubs railties" unless File.exist?("bin/rails")
 
           application_file = File.read("config/application.rb")
           sh "rm config/application.rb"
-          File.open("config/application.rb","w") do |f|
+          File.open("config/application.rb", "w") do |f|
             f.write application_file.gsub(
               "config.assets.enabled = true",
               "config.assets.enabled = false"
@@ -207,14 +210,14 @@ namespace :no_active_record do
 
     desc "generate a bunch of stuff with generators"
     task :stuff do
-      in_example_app "bin/rake #{rails_template_command} LOCATION='../../example_app_generator/generate_stuff.rb'", :app_dir => example_app_dir
+      in_example_app "bin/rake #{rails_template_command} LOCATION='../../example_app_generator/generate_stuff.rb'", app_dir: example_app_dir
     end
   end
 end
 
-task :acceptance => ['smoke:app', 'no_active_record:smoke:app', :cucumber]
+task acceptance: ['smoke:app', 'no_active_record:smoke:app', :cucumber]
 
-task :default => [:spec, :acceptance]
+task default: [:spec, :acceptance]
 
 task :verify_private_key_present do
   private_key = File.expand_path('~/.gem/rspec-gem-private_key.pem')
@@ -223,4 +226,4 @@ task :verify_private_key_present do
   end
 end
 
-task :build => :verify_private_key_present
+task build: :verify_private_key_present

benchmarks/before_block_capture_block_vs_yield.rb

@@ -8,15 +8,15 @@ def yield_n_times(n)
   before_n_times(n) { yield }
 end
 
-def capture_block_and_yield_n_times(n, &block)
+def capture_block_and_yield_n_times(n, &block) # rubocop:disable Lint/UnusedMethodArgument
   before_n_times(n) { yield }
 end
 
 def capture_block_and_call_n_times(n, &block)
   before_n_times(n) { block.call }
 end
 
-[10, 25, 50, 100, 1000, 10000].each do |count|
+[10, 25, 50, 100, 1000, 10_000].each do |count|
   puts "\n\nInvoking the block #{count} times\n"
 
   Benchmark.ips do |x|

example_app_generator/config/initializers/sqlite3_fix.rb

@@ -1,3 +1,3 @@
-if Rails.application.config.respond_to?(:active_record) && !(RUBY_ENGINE == "jruby")
+if Rails.application.config.respond_to?(:active_record) && RUBY_ENGINE != "jruby"
   Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
 end

example_app_generator/generate_action_mailer_specs.rb

@@ -1,7 +1,7 @@
 require 'active_support'
 require 'active_support/core_ext/module'
 
-using_source_path(File.expand_path('..', __FILE__)) do
+using_source_path(File.expand_path(__dir__)) do
   # Comment out the default mailer stuff
   comment_lines 'config/environments/development.rb', /action_mailer/
   comment_lines 'config/environments/test.rb', /action_mailer/