rubocop-rspec 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33cc3eb121d9cb56164a721c6856c1b640f7bed6
-  data.tar.gz: 668538c6096e0beee8e9acbffc0b7639c3a50c22
+  metadata.gz: 885b88b3cfe9f4d470eed5daccc1071135e59e11
+  data.tar.gz: 0d91a813ca891c4b7b90227188a87d24250088cf
 SHA512:
-  metadata.gz: 80ae0ce41af162ecbf52082e626a9921daf66b1f2e2b3b907105a6d247b611c548ba60228055e777a6fc06ac22e0702ce57b5a2afdc1c5eaac10ef7d8979cb8e
-  data.tar.gz: c10dc7627d94f250ffb294a62db891c8a9854208cfe4f40856653759858f0c6079bc38e3e6b3b573b904eefaf0d17f48fbacd9e1d3dc87f30e2bcea5e571da51
+  metadata.gz: 8f100ef7123bf5a9df50d45dae99592e1704cab30aa12e24f4d1d8d58e851b88c0db6f9efc46b531743fdcf487f295a75fd1033b0a05e8c2de2d4cf25c9499bd
+  data.tar.gz: d9ec52c5ac1aebb71bd8e16303ecc479f4fdde51d1ff9fa27dc1f1bf95d4b9f80d8e7389aa472f400d91a532e4aff8d6168c9b4b7761aa32fab560845591b5d6

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change log
 
+# 1.3.0
+
+* Ignore non string arguments for FilePathCop - thanks to @deivid-rodriguez. ([@geniou][])
+* Skip DescribeMethod cop for tagged specs. ([@deivid-rodriguez][])
+* Skip DescribeClass cop for feature/request specs. ([@deivid-rodriguez][])
+
 # 1.2.2
 
 * Make `RSpec::ExampleWording` case insensitive. ([@geniou][])
@@ -48,6 +54,7 @@
 <!-- Contributors -->
 
 [@andyw8]: https://github.com/andyw8
+[@deivid-rodriguez]: https://github.com/deivid-rodriguez
 [@geniou]: https://github.com/geniou
 [@nevir]: https://github.com/nevir
 [@pstengel]: https://github.com/pstengel

data/lib/rubocop/cop/rspec/describe_class.rb

@@ -14,15 +14,29 @@ module RuboCop
       #   # good
       #   describe TestedClass do
       #   end
+      #
+      #   describe "A feature example", type: :feature do
+      #   end
       class DescribeClass < Cop
         include RuboCop::RSpec::TopLevelDescribe
 
+        REQUEST_PAIR = s(:pair, s(:sym, :type), s(:sym, :request))
+        FEATURE_PAIR = s(:pair, s(:sym, :type), s(:sym, :feature))
+
         MESSAGE = 'The first argument to describe should be the class or ' \
                   'module being tested.'
 
         def on_top_level_describe(_node, args)
-          return if args.first && args.first.type == :const
-          add_offense(args.first, :expression, MESSAGE)
+          return if args[0] && args[0].type == :const
+
+          return if args[1..-1].any? do |arg|
+            next unless arg.hash_type?
+            arg.children.any? do |n|
+              [REQUEST_PAIR, FEATURE_PAIR].include?(n)
+            end
+          end
+
+          add_offense(args[0], :expression, MESSAGE)
         end
       end
     end

data/lib/rubocop/cop/rspec/describe_method.rb

@@ -26,7 +26,7 @@ module RuboCop
 
         def on_top_level_describe(_node, args)
           second_arg = args[1]
-          return unless second_arg
+          return unless second_arg && second_arg.type == :str
           return if METHOD_STRING_MATCHER =~ second_arg.children.first
 
           add_offense(second_arg, :expression, MESSAGE)

data/lib/rubocop/cop/rspec/file_path.rb

@@ -35,7 +35,9 @@ module RuboCop
 
         def matcher(object, method)
           path = File.join(parts(object))
-          path += '*' + method.children.first.gsub(/\W+/, '') if method
+          if method && method.type == :str
+            path += '*' + method.children.first.gsub(/\W+/, '')
+          end
 
           "#{path}*_spec.rb"
         end

data/lib/rubocop/rspec/top_level_describe.rb

@@ -9,8 +9,6 @@ module RuboCop
         return unless top_level_describe?(node)
 
         _receiver, _method_name, *args = *node
-        # Ignore non-string args (RSpec metadata)
-        args = [args.first] + args[1..-1].select { |a| a.type == :str }
 
         on_top_level_describe(node, args)
       end

data/lib/rubocop/rspec/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module RSpec
     # Version information for the RSpec RuboCop plugin.
     module Version
-      STRING = '1.2.2'
+      STRING = '1.3.0'
     end
   end
 end

data/spec/rubocop/cop/rspec/describe_class_spec.rb

@@ -27,6 +27,23 @@ describe RuboCop::Cop::RSpec::DescribeClass do
     expect(cop.offenses).to be_empty
   end
 
+  it 'ignores request specs' do
+    inspect_source(cop, "describe 'my new feature', type: :request do; end")
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'ignores feature specs' do
+    inspect_source(cop, "describe 'my new feature', type: :feature do; end")
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'ignores feature specs - also with complex options' do
+    inspect_source(cop, ["describe 'my new feature',",
+                         '  :test, :type => :feature, :foo => :bar do;',
+                         'end'])
+    expect(cop.offenses).to be_empty
+  end
+
   it "doesn't blow up on single-line describes" do
     inspect_source(cop, 'describe Some::Class')
     expect(cop.offenses).to be_empty

data/spec/rubocop/cop/rspec/describe_method_spec.rb

@@ -17,4 +17,10 @@ describe RuboCop::Cop::RSpec::DescribeMethod do
                          "describe Some::Class, '#fdsa' do; end"])
     expect(cop.offenses).to be_empty
   end
+
+  it 'skips specs not having a string second argument' do
+    inspect_source(cop, 'describe Some::Class, :config do; end')
+
+    expect(cop.offenses).to be_empty
+  end
 end

data/spec/rubocop/cop/rspec/file_path_spec.rb

@@ -49,6 +49,16 @@ describe RuboCop::Cop::RSpec::FilePath, :config do
     expect(cop.offenses).to be_empty
   end
 
+  it 'ignores second argument if is not a string' do
+    inspect_source(cop,
+                   'describe MyClass, :foo do; end',
+                   'wrong_class_spec.rb')
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.offenses.map(&:line).sort).to eq([1])
+    expect(cop.messages)
+      .to eq(['Spec path should end with `my_class*_spec.rb`'])
+  end
+
   it 'checks class specs' do
     inspect_source(cop,
                    'describe Some::Class do; end',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rspec
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Ian MacLeod
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop