Merge pull request #386 from backus/fix/empty-describe-bugs

Fix error when handling empty describe

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Master (Unreleased)
 
 * Add `RSpec/DescribeSymbol` cop. ([@tsigo][])
+* Fix error when `RSpec/OverwritingSetup` and `RSpec/ScatteredLet` analyzed empty example groups. ([@backus][])
 
 ## 1.14.0 (2017-03-24)
 

lib/rubocop/cop/rspec/overwriting_setup.rb

@@ -29,7 +29,7 @@ class OverwritingSetup < Cop
         PATTERN
 
         def on_block(node)
-          return unless example_group?(node)
+          return unless example_group_with_body?(node)
 
           _describe, _args, body = *node
 

lib/rubocop/cop/rspec/scattered_let.rb

@@ -32,7 +32,7 @@ class ScatteredLet < Cop
         def_node_matcher :let?, '(block (send nil {:let :let!} ...) ...)'
 
         def on_block(node)
-          return unless example_group?(node)
+          return unless example_group_with_body?(node)
 
           _describe, _args, body = *node
 

lib/rubocop/rspec/language/node_pattern.rb

@@ -8,6 +8,11 @@ module NodePattern
         extend RuboCop::NodePattern::Macros
 
         def_node_matcher :example_group?, ExampleGroups::ALL.block_pattern
+
+        def_node_matcher :example_group_with_body?, <<-PATTERN
+          (block #{ExampleGroups::ALL.send_pattern} args [!nil])
+        PATTERN
+
         def_node_matcher :example?, Examples::ALL.block_pattern
       end
     end

spec/rubocop/cop/rspec/overwriting_setup_spec.rb

@@ -43,4 +43,9 @@
       end
     RUBY
   end
+
+  it 'does not encounter an error when handling an empty describe' do
+    expect { inspect_source(cop, 'RSpec.describe(User) do end', 'a_spec.rb') }
+      .not_to raise_error
+  end
 end

spec/rubocop/cop/rspec/scattered_let_spec.rb

@@ -23,4 +23,9 @@
       end
     RUBY
   end
+
+  it 'does not encounter an error when handling an empty describe' do
+    expect { inspect_source(cop, 'RSpec.describe(User) do end', 'a_spec.rb') }
+      .not_to raise_error
+  end
 end