rubocop-rspec 1.23.0 → 1.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b88289ae95383f02044f1bf61e01950e5637c1b7d5b454a58e025a31f7562c7
-  data.tar.gz: 066a150e7e974240b6678f29c6104e157a634b753602c9f41b746fa2a3f0733b
+  metadata.gz: fa8c9ef29194d2c818e26ab7304672b410755e182a6ff7476f58f933be307102
+  data.tar.gz: 6bd4ae51e5e90ea1dcb4217a4f741fa67b4a503dfd350205a6950b0cd2305397
 SHA512:
-  metadata.gz: 2cf65077bc9fa485cf1b734918a0279f7925185ecc21196488d24740e5f0d9151672a87521abde59429a5306c7148cd489309c40f6999dedfff0e26972f5e724
-  data.tar.gz: 1173b7e16b85c33f08df3998b70f8accfd39da5f40b61c4bdf8c988c5a6169a26761395035de4919808078a3c26976e0a9a8d67b1585cde081ee0c35c8634bf2
+  metadata.gz: 70867c1789297dc3408df72fd6a0e831afec0238de3250c5446ce3385100f52ee3cc5962b2d3d4263ce4057bda07eddfc3f365921ce1049926030d0c3b21490c
+  data.tar.gz: 9d91b68565b10ba04221e4a516359e1bbc942e6e955bc4076937ae0c45fb317780b90c9d502e4e5eff5898b47d3e3fd9324cc00beb7613a33ffcb3f5f64c733e

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Master (Unreleased)
 
+## 1.24.0 (2018-03-06)
+
+* Compatibility with RuboCop v0.53.0. ([@bquorning][])
+* The `Rails/HttpStatus` cop is unavailable if the `rack` gem cannot be loaded. ([@bquorning][])
+* Fix `Rails/HttpStatus` not working with custom HTTP status codes. ([@bquorning][])
+* Fix `FactoryBot/StaticAttributeDefinedDynamically` to handle empty block. ([@abrom][])
+* Fix false positive in `FactoryBot/DynamicAttributeDefinedStatically` when a before/after callback has a symbol proc argument. ([@abrom][])
+
 ## 1.23.0 (2018-02-23)
 
 * Add `RSpec/Rails/HttpStatus` cop to enforce consistent usage of the status format (numeric or symbolic). ([@anthony-robin][], [@jojos003][])

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

@@ -24,7 +24,7 @@ module RuboCop
           [Layout::ExtraSpacing]
         end
 
-        def investigate(_)
+        def investigate(_processed_source)
           token_aligner.offending_tokens.each do |let|
             add_offense(let, location: :begin)
           end

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

@@ -24,7 +24,7 @@ module RuboCop
           [Layout::ExtraSpacing]
         end
 
-        def investigate(_)
+        def investigate(_processed_source)
           token_aligner.offending_tokens.each do |let|
             add_offense(let, location: :end)
           end

data/lib/rubocop/cop/rspec/factory_bot/dynamic_attribute_defined_statically.rb

@@ -31,9 +31,14 @@ module RuboCop
             (block (send nil? {:factory :trait} ...) _ { (begin $...) $(send ...) } )
           PATTERN
 
+          def_node_matcher :callback_with_symbol_proc?, <<-PATTERN
+            (send nil? {:before :after} sym (block_pass sym))
+          PATTERN
+
           def on_block(node)
             factory_attributes(node).to_a.flatten.each do |attribute|
-              next if value_matcher(attribute).to_a.all? { |v| static?(v) }
+              next if callback_with_symbol_proc?(attribute) ||
+                  static?(attribute)
               add_offense(attribute, location: :expression)
             end
           end
@@ -50,8 +55,10 @@ module RuboCop
 
           private
 
-          def static?(node)
-            node.recursive_literal? || node.const_type?
+          def static?(attribute)
+            value_matcher(attribute).to_a.all? do |node|
+              node.recursive_literal? || node.const_type?
+            end
           end
 
           def value_hash_without_braces?(node)

data/lib/rubocop/cop/rspec/factory_bot/static_attribute_defined_dynamically.rb

@@ -58,14 +58,20 @@ module RuboCop
           private
 
           def static?(node)
-            node.recursive_literal? || node.const_type?
+            node.nil? || node.recursive_literal? || node.const_type?
           end
 
           def autocorrected_source(node)
-            if node.body.hash_type?
-              "#{node.send_node.source}(#{node.body.source})"
+            "#{node.send_node.source}#{autocorrected_attribute(node.body)}"
+          end
+
+          def autocorrected_attribute(body)
+            if body.nil?
+              ' nil'
+            elsif body.hash_type?
+              "(#{body.source})"
             else
-              "#{node.send_node.source} #{node.body.source}"
+              ' ' + body.source
             end
           end
         end

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

@@ -107,7 +107,7 @@ module RuboCop
           File.fnmatch?("*#{glob}", processed_source.buffer.name)
         end
 
-        def relevant_rubocop_rspec_file?(_)
+        def relevant_rubocop_rspec_file?(_file)
           true
         end
       end

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

@@ -59,6 +59,7 @@ module RuboCop
       #   end
       class HookArgument < Cop
         include ConfigurableEnforcedStyle
+        include RangeHelp
 
         IMPLICIT_MSG = 'Omit the default `%<scope>p` ' \
                        'argument for RSpec hooks.'.freeze

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

@@ -27,6 +27,8 @@ module RuboCop
       #     end
       #   end
       class LeadingSubject < Cop
+        include RangeHelp
+
         MSG = 'Declare `subject` above any other `let` declarations.'.freeze
 
         def_node_matcher :subject?, '(block $(send nil? :subject ...) args ...)'

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

@@ -31,6 +31,8 @@ module RuboCop
       #     expect(some).to be
       #   end
       class LetBeforeExamples < Cop
+        include RangeHelp
+
         MSG = 'Move `let` before the examples in the group.'.freeze
 
         def_node_matcher :let?, '(block (send nil? {:let :let!} ...) ...)'

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

@@ -98,7 +98,7 @@ module RuboCop
 
         def_node_search :find_contexts, ExampleGroups::ALL.block_pattern
 
-        def on_top_level_describe(node, _)
+        def on_top_level_describe(node, _args)
           find_nested_contexts(node.parent) do |context, nesting|
             add_offense(
               context.children.first,

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

@@ -105,7 +105,7 @@ module RuboCop
                             to_predicate_matcher(name) + args + block)
         end
 
-        def true?(to, matcher)
+        def true?(to_symbol, matcher)
           _recv, name, arg = *matcher
           result = case name
                    when :be, :eq
@@ -115,7 +115,7 @@ module RuboCop
                    when :be_falsey, :be_falsy, :a_falsey_value, :a_falsy_value
                      false
                    end
-          to == :to ? result : !result
+          to_symbol == :to ? result : !result
         end
       end
 
@@ -199,17 +199,17 @@ module RuboCop
 
         def autocorrect_explicit_block(node)
           predicate_matcher_block?(node) do |actual, matcher|
-            to, = *node
-            corrector_explicit(to, actual, matcher, to)
+            to_node, = *node
+            corrector_explicit(to_node, actual, matcher, to_node)
           end
         end
 
-        def corrector_explicit(to, actual, matcher, block_child)
+        def corrector_explicit(to_node, actual, matcher, block_child)
           lambda do |corrector|
-            replacement_matcher = replacement_matcher(to)
+            replacement_matcher = replacement_matcher(to_node)
             corrector.replace(matcher.loc.expression, replacement_matcher)
             move_predicate(corrector, actual, matcher, block_child)
-            corrector.replace(to.loc.selector, 'to')
+            corrector.replace(to_node.loc.selector, 'to')
           end
         end
 
@@ -297,6 +297,7 @@ module RuboCop
         include ConfigurableEnforcedStyle
         include InflectedHelper
         include ExplicitHelper
+        include RangeHelp
 
         def on_send(node)
           case style

data/lib/rubocop/cop/rspec/rails/http_status.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rack/utils'
+
 module RuboCop
   module Cop
     module RSpec
@@ -29,13 +31,6 @@ module RuboCop
         #   it { is_expected.to have_http_status :error }
         #
         class HttpStatus < Cop
-          begin
-            require 'rack/utils'
-            RACK_LOADED = true
-          rescue LoadError
-            RACK_LOADED = false
-          end
-
           include ConfigurableEnforcedStyle
 
           def_node_matcher :http_status, <<-PATTERN
@@ -50,10 +45,6 @@ module RuboCop
             end
           end
 
-          def support_autocorrect?
-            RACK_LOADED
-          end
-
           def autocorrect(node)
             lambda do |corrector|
               checker = checker_class.new(node)
@@ -76,8 +67,6 @@ module RuboCop
           class SymbolicStyleChecker
             MSG = 'Prefer `%<prefer>s` over `%<current>s` ' \
                   'to describe HTTP status code.'.freeze
-            DEFAULT_MSG = 'Prefer `symbolic` over `numeric` ' \
-                  'to describe HTTP status code.'.freeze
 
             attr_reader :node
             def initialize(node)
@@ -85,15 +74,11 @@ module RuboCop
             end
 
             def offensive?
-              !node.sym_type?
+              !node.sym_type? && !custom_http_status_code?
             end
 
             def message
-              if RACK_LOADED
-                format(MSG, prefer: preferred_style, current: number.to_s)
-              else
-                DEFAULT_MSG
-              end
+              format(MSG, prefer: preferred_style, current: number.to_s)
             end
 
             def preferred_style
@@ -109,14 +94,17 @@ module RuboCop
             def number
               node.source.to_i
             end
+
+            def custom_http_status_code?
+              node.int_type? &&
+                !::Rack::Utils::SYMBOL_TO_STATUS_CODE.value?(node.source.to_i)
+            end
           end
 
           # :nodoc:
           class NumericStyleChecker
             MSG = 'Prefer `%<prefer>s` over `%<current>s` ' \
                   'to describe HTTP status code.'.freeze
-            DEFAULT_MSG = 'Prefer `numeric` over `symbolic` ' \
-                  'to describe HTTP status code.'.freeze
 
             WHITELIST_STATUS = %i[error success missing redirect].freeze
 
@@ -130,11 +118,7 @@ module RuboCop
             end
 
             def message
-              if RACK_LOADED
-                format(MSG, prefer: preferred_style, current: symbol.inspect)
-              else
-                DEFAULT_MSG
-              end
+              format(MSG, prefer: preferred_style, current: symbol.inspect)
             end
 
             def preferred_style

data/lib/rubocop/cop/rspec_cops.rb

@@ -4,7 +4,11 @@ require_relative 'rspec/capybara/feature_methods'
 require_relative 'rspec/factory_bot/dynamic_attribute_defined_statically'
 require_relative 'rspec/factory_bot/static_attribute_defined_dynamically'
 
-require_relative 'rspec/rails/http_status'
+begin
+  require_relative 'rspec/rails/http_status'
+rescue LoadError # rubocop:disable Lint/HandleExceptions
+  # Rails/HttpStatus cannot be loaded if rack/utils is unavailable.
+end
 
 require_relative 'rspec/align_left_let_brace'
 require_relative 'rspec/align_right_let_brace'

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.23.0'.freeze
+      STRING = '1.24.0'.freeze
     end
   end
 end

data/rubocop-rspec.gemspec

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
 require 'rubocop/rspec/version'
 
 Gem::Specification.new do |spec|
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.test_files = spec.files.grep(%r{^spec/})
   spec.extra_rdoc_files = ['MIT-LICENSE.md', 'README.md']
 
-  spec.add_runtime_dependency 'rubocop', '>= 0.52.1'
+  spec.add_runtime_dependency 'rubocop', '>= 0.53.0'
 
   spec.add_development_dependency 'rack'
   spec.add_development_dependency 'rake'

data/spec/rubocop/cop/rspec/factory_bot/dynamic_attribute_defined_statically_spec.rb

@@ -59,6 +59,9 @@ RSpec.describe RuboCop::Cop::RSpec::FactoryBot::DynamicAttributeDefinedStaticall
               recent_statuses [:published, :draft]
               meta_tags(like_count: 2)
               other_tags({ foo: nil })
+
+              before(:create, &:initialize_something)
+              after(:create, &:rebuild_cache)
             end
           end
         RUBY

data/spec/rubocop/cop/rspec/factory_bot/static_attribute_defined_dynamically_spec.rb

@@ -26,6 +26,8 @@ RSpec.describe RuboCop::Cop::RSpec::FactoryBot::StaticAttributeDefinedDynamicall
               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Do not use a block to set a static value to an attribute.
               meta_tags { { foo: 1 } }
               ^^^^^^^^^^^^^^^^^^^^^^^^ Do not use a block to set a static value to an attribute.
+              title {}
+              ^^^^^^^^ Do not use a block to set a static value to an attribute.
             end
           end
         RUBY
@@ -58,6 +60,7 @@ RSpec.describe RuboCop::Cop::RSpec::FactoryBot::StaticAttributeDefinedDynamicall
               tag Tag::MAGIC
               recent_updates { [Time.current] }
               meta_tags { { first_like: Time.current } }
+              before(:create) { 'foo' }
             end
           end
         RUBY
@@ -78,6 +81,7 @@ RSpec.describe RuboCop::Cop::RSpec::FactoryBot::StaticAttributeDefinedDynamicall
             comments_count { 0 }
             type { User::MAGIC }
             description { nil }
+            title {}
             recent_statuses { [:published, :draft] }
             meta_tags { { foo: 1 } }
           end
@@ -90,6 +94,7 @@ RSpec.describe RuboCop::Cop::RSpec::FactoryBot::StaticAttributeDefinedDynamicall
             comments_count 0
             type User::MAGIC
             description nil
+            title nil
             recent_statuses [:published, :draft]
             meta_tags({ foo: 1 })
           end

data/spec/rubocop/cop/rspec/rails/http_status_spec.rb

@@ -19,6 +19,12 @@ RSpec.describe RuboCop::Cop::RSpec::Rails::HttpStatus, :config do
       RUBY
     end
 
+    it 'does not register an offense when using custom HTTP code' do
+      expect_no_offenses(<<-RUBY)
+        it { is_expected.to have_http_status 550 }
+      RUBY
+    end
+
     include_examples 'autocorrect',
                      'it { is_expected.to have_http_status 200 }',
                      'it { is_expected.to have_http_status :ok }'
@@ -36,17 +42,6 @@ RSpec.describe RuboCop::Cop::RSpec::Rails::HttpStatus, :config do
                        'it { is_expected.to have_http_status(404) }',
                        'it { is_expected.to have_http_status(:not_found) }'
     end
-
-    context 'when rack is not loaded' do
-      before { stub_const("#{described_class}::RACK_LOADED", false) }
-
-      it 'registers an offense when using numeric value' do
-        expect_offense(<<-RUBY)
-          it { is_expected.to have_http_status 200 }
-                                               ^^^ Prefer `symbolic` over `numeric` to describe HTTP status code.
-        RUBY
-      end
-    end
   end
 
   context 'when EnforcedStyle is `numeric`' do
@@ -91,16 +86,5 @@ RSpec.describe RuboCop::Cop::RSpec::Rails::HttpStatus, :config do
                        'it { is_expected.to have_http_status(:not_found) }',
                        'it { is_expected.to have_http_status(404) }'
     end
-
-    context 'when rack is not loaded' do
-      before { stub_const("#{described_class}::RACK_LOADED", false) }
-
-      it 'registers an offense when using numeric value' do
-        expect_offense(<<-RUBY)
-          it { is_expected.to have_http_status :ok }
-                                               ^^^ Prefer `numeric` over `symbolic` to describe HTTP status code.
-        RUBY
-      end
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rspec
 version: !ruby/object:Gem::Version
-  version: 1.23.0
+  version: 1.24.0
 platform: ruby
 authors:
 - John Backus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.53.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.53.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement