Add support for multiline offenses

rubocop · Oct 21, 2022 · db3f827 · db3f827
1 parent 7dd4917
commit db3f827
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/lib/rubocop/cop/rspec/sort_metadata.rb b/lib/rubocop/cop/rspec/sort_metadata.rb
@@ -57,8 +57,8 @@ def on_block(node)
 
         def investigate(symbols, pairs)
           return if sorted?(symbols, pairs)
-          return unless (crime_scene = crime_scene(symbols, pairs))
 
+          crime_scene = crime_scene(symbols, pairs)
           add_offense(crime_scene) do |corrector|
             corrector.replace(crime_scene, replacement(symbols, pairs))
           end
@@ -67,12 +67,10 @@ def investigate(symbols, pairs)
         def crime_scene(symbols, pairs)
           metadata = symbols + pairs
 
-          range = range_between(
+          range_between(
             metadata.first.loc.expression.begin_pos,
             metadata.last.loc.expression.end_pos
           )
-
-          range if range.last_line == range.first_line
         end
 
         def replacement(symbols, pairs)

diff --git a/spec/rubocop/cop/rspec/sort_metadata_spec.rb b/spec/rubocop/cop/rspec/sort_metadata_spec.rb
@@ -127,13 +127,18 @@
     RUBY
   end
 
-  it 'does not register an offense ' \
-     'when the metadata is not on one single line' do
-    expect_no_offenses(<<~RUBY)
+  it 'registers an offense also when the metadata is not on one single line' do
+    expect_offense(<<~RUBY)
       RSpec.describe 'Something', :foo, :bar,
+                                  ^^^^^^^^^^^ Sort metadata alphabetically.
                                    baz: 'goo' do
       end
     RUBY
+
+    expect_correction(<<~RUBY)
+      RSpec.describe 'Something', :bar, :foo, baz: 'goo' do
+      end
+    RUBY
   end
 
   it 'registers an offense when using only symbol metadata ' \