Update RuboCop/RSpec

rubocop · Oct 16, 2020 · 7f57dc4 · 7f57dc4
1 parent 13df023
commit 7f57dc4
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 13 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -118,3 +118,15 @@ RSpec/MessageSpies:
 
 RSpec/NestedGroups:
   Max: 7
+
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+
+# Buggy cop
+# See https://github.com/rubocop-hq/rubocop-rspec/pull/1018
+RSpec/EmptyExampleGroup:
+  Exclude:
+    - 'spec/rubocop/cli/cli_options_spec.rb'
+    - 'spec/rubocop/cop/lint/script_permission_spec.rb'
+    - 'spec/rubocop/cop/style/empty_else_spec.rb'
+    - 'spec/rubocop/result_cache_spec.rb'
diff --git a/Gemfile b/Gemfile
@@ -10,7 +10,7 @@ gem 'pry'
 gem 'rake', '~> 13.0'
 gem 'rspec', '~> 3.7'
 gem 'rubocop-performance', '~> 1.7.0'
-gem 'rubocop-rspec', '~> 1.39.0'
+gem 'rubocop-rspec', '~> 1.43.2'
 # Workaround for cc-test-reporter with SimpleCov 0.18.
 # Stop upgrading SimpleCov until the following issue will be resolved.
 # https://github.com/codeclimate/test-reporter/issues/418

diff --git a/spec/rubocop/cli/cli_auto_gen_config_spec.rb b/spec/rubocop/cli/cli_auto_gen_config_spec.rb
@@ -3,10 +3,10 @@
 require 'timeout'
 
 RSpec.describe RuboCop::CLI, :isolated_environment do
-  include_context 'cli spec behavior'
-
   subject(:cli) { described_class.new }
 
+  include_context 'cli spec behavior'
+
   describe '--auto-gen-config' do
     before do
       RuboCop::Formatter::DisabledConfigFormatter

diff --git a/spec/rubocop/cli/cli_autocorrect_spec.rb b/spec/rubocop/cli/cli_autocorrect_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe RuboCop::CLI, :isolated_environment do
-  include_context 'cli spec behavior'
-
   subject(:cli) { described_class.new }
 
+  include_context 'cli spec behavior'
+
   before do
     RuboCop::ConfigLoader.default_configuration = nil
   end

diff --git a/spec/rubocop/cli/cli_disable_uncorrectable_spec.rb b/spec/rubocop/cli/cli_disable_uncorrectable_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe RuboCop::CLI, :isolated_environment do
-  include_context 'cli spec behavior'
-
   subject(:cli) { described_class.new }
 
+  include_context 'cli spec behavior'
+
   describe '--disable-uncorrectable' do
     let(:exit_code) do
       cli.run(%w[--auto-correct-all --format simple --disable-uncorrectable])

diff --git a/spec/rubocop/cli/cli_options_spec.rb b/spec/rubocop/cli/cli_options_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe RuboCop::CLI, :isolated_environment do
-  include_context 'cli spec behavior'
-
   subject(:cli) { described_class.new }
 
+  include_context 'cli spec behavior'
+
   let(:rubocop) { "#{RuboCop::ConfigLoader::RUBOCOP_HOME}/exe/rubocop" }
 
   before do

diff --git a/spec/rubocop/cli_spec.rb b/spec/rubocop/cli_spec.rb
@@ -3,10 +3,10 @@
 require 'timeout'
 
 RSpec.describe RuboCop::CLI, :isolated_environment do
-  include_context 'cli spec behavior'
-
   subject(:cli) { described_class.new }
 
+  include_context 'cli spec behavior'
+
   context 'when interrupted' do
     it 'returns 130' do
       allow_any_instance_of(RuboCop::Runner)

diff --git a/spec/rubocop/runner_formatter_invocation_spec.rb b/spec/rubocop/runner_formatter_invocation_spec.rb
@@ -2,10 +2,10 @@
 
 RSpec.describe RuboCop::Runner, :isolated_environment do
   describe 'how formatter is invoked' do
-    include_context 'cli spec behavior'
-
     subject(:runner) { described_class.new({}, RuboCop::ConfigStore.new) }
 
+    include_context 'cli spec behavior'
+
     let(:formatter) do
       instance_double(RuboCop::Formatter::BaseFormatter).as_null_object
     end