Merge pull request #1176 from rubocop/fix-eager-whitespace-removal-in…

…-empty-hook

Fix excessive RSpec/EmptyHook whitespace removal

CHANGELOG.md

@@ -6,6 +6,7 @@
 * Exclude unrelated Rails directories from `RSpec/DescribeClass`. ([@MothOnMars][])
 * Add `RSpec/ExcessiveDocstringSpacing` cop. ([@G-Rath][])
 * Add `RSpec/SubjectDeclaration` cop. ([@dswij][])
+* Fix excessive whitespace removal in `RSpec/EmptyHook' autocorrection. ([@pirj][])
 
 ## 2.4.0 (2021-06-09)
 

lib/rubocop/cop/rspec/empty_hook.rb

@@ -36,7 +36,10 @@ class EmptyHook < Base
         def on_block(node)
           empty_hook?(node) do |hook|
             add_offense(hook) do |corrector|
-              range = range_with_surrounding_space(range: node.loc.expression)
+              range = range_with_surrounding_space(
+                range: node.loc.expression,
+                side: :left
+              )
               corrector.remove(range)
             end
           end

spec/rubocop/cop/rspec/empty_hook_spec.rb

@@ -8,7 +8,7 @@
         ^^^^^^ Empty hook detected.
       RUBY
 
-      expect_correction('')
+      expect_correction("\n")
     end
 
     it 'detects offense for empty `before` with :each scope' do
@@ -17,7 +17,7 @@
         ^^^^^^^^^^^^^ Empty hook detected.
       RUBY
 
-      expect_correction('')
+      expect_correction("\n")
     end
 
     it 'detects offense for empty `before` with :example scope' do
@@ -26,7 +26,7 @@
         ^^^^^^^^^^^^^^^^ Empty hook detected.
       RUBY
 
-      expect_correction('')
+      expect_correction("\n")
     end
 
     it 'detects offense for empty `before` with :context scope' do
@@ -35,7 +35,7 @@
         ^^^^^^^^^^^^^^^^ Empty hook detected.
       RUBY
 
-      expect_correction('')
+      expect_correction("\n")
     end
 
     it 'detects offense for empty `before` with :all scope' do
@@ -44,7 +44,7 @@
         ^^^^^^^^^^^^ Empty hook detected.
       RUBY
 
-      expect_correction('')
+      expect_correction("\n")
     end
 
     it 'detects offense for empty `before` with :suite scope' do
@@ -53,7 +53,7 @@
         ^^^^^^^^^^^^^^ Empty hook detected.
       RUBY
 
-      expect_correction('')
+      expect_correction("\n")
     end
 
     it 'accepts non-empty `before` hook' do
@@ -90,7 +90,7 @@
         ^^^^^ Empty hook detected.
       RUBY
 
-      expect_correction('')
+      expect_correction("\n")
     end
 
     it 'accepts non-empty `after` hook' do
@@ -116,7 +116,7 @@
         ^^^^^^ Empty hook detected.
       RUBY
 
-      expect_correction('')
+      expect_correction("\n")
     end
 
     it 'accepts non-empty `around` hook' do
@@ -142,7 +142,7 @@
         ^^^^^^^^^^^^^^ Empty hook detected.
       RUBY
 
-      expect_correction('')
+      expect_correction("\n")
     end
 
     it 'accepts non-empty `prepend_before` hook' do
@@ -168,7 +168,7 @@
         ^^^^^^^^^^^^^ Empty hook detected.
       RUBY
 
-      expect_correction('')
+      expect_correction("\n")
     end
 
     it 'accepts non-empty `append_before` hook' do
@@ -194,7 +194,7 @@
         ^^^^^^^^^^^^^ Empty hook detected.
       RUBY
 
-      expect_correction('')
+      expect_correction("\n")
     end
 
     it 'accepts non-empty `prepend_after` hook' do
@@ -220,7 +220,7 @@
         ^^^^^^^^^^^^ Empty hook detected.
       RUBY
 
-      expect_correction('')
+      expect_correction("\n")
     end
 
     it 'accepts non-empty `append_after` hook' do
@@ -238,4 +238,29 @@
       RUBY
     end
   end
+
+  context 'when the hook is between other blocks' do
+    it 'detects offense for empty `append_after`' do
+      expect_offense(<<~RUBY)
+        let(:foo) { 'bar' }
+
+        before do
+        ^^^^^^ Empty hook detected.
+          # commented out code
+        end
+
+        it do
+          expect(foo).to eq('bar')
+        end
+      RUBY
+
+      expect_correction(<<~RUBY)
+        let(:foo) { 'bar' }
+
+        it do
+          expect(foo).to eq('bar')
+        end
+      RUBY
+    end
+  end
 end