Merge pull request #141 from nevir/fix/describe_class-regression

Fix regression in DescribeClass
rubocop · Aug 1, 2016 · 4922fd6 · 4922fd6
2 parents cf185f7 + 6080375
commit 4922fd6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/lib/rubocop/cop/rspec/describe_class.rb b/lib/rubocop/cop/rspec/describe_class.rb
@@ -24,11 +24,11 @@ class DescribeClass < Cop
               'the class or module being tested.'.freeze
 
         def_node_matcher :valid_describe?, <<-PATTERN
-        {(send nil :describe const ...) (send nil :describe)}
+        {(send {(const nil :RSpec) nil} :describe const ...) (send nil :describe)}
         PATTERN
 
         def_node_matcher :describe_with_metadata, <<-PATTERN
-        (send nil :describe
+        (send {(const nil :RSpec) nil} :describe
           !const
           ...
           (hash $...))

diff --git a/spec/rubocop/cop/rspec/describe_class_spec.rb b/spec/rubocop/cop/rspec/describe_class_spec.rb
@@ -9,6 +9,11 @@
                                 'the class or module being tested.'])
   end
 
+  it 'supports RSpec.describe' do
+    inspect_source(cop, 'RSpec.describe Foo do; end')
+    expect(cop.offenses).to be_empty
+  end
+
   it 'checks describe statements after a require' do
     inspect_source(
       cop,
@@ -50,6 +55,15 @@
     expect(cop.offenses).to be_empty
   end
 
+  it 'ignores feature specs when RSpec.describe is used' do
+    inspect_source(
+      cop,
+      "RSpec.describe 'my new feature', type: :feature do; end"
+    )
+
+    expect(cop.offenses).to be_empty
+  end
+
   it 'flags specs with non :type metadata' do
     inspect_source(cop, "describe 'my new feature', foo: :feature do; end")
     expect(cop.messages).to eq(['The first argument to describe should be ' \