rubocop-rspec 1.27.0 → 1.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cb62faf05dbb3d997032a8fbac1d3d1897542d7a98b1540c54afebc10a6a294
-  data.tar.gz: 6b1fae2d79e473c5e8295fe6ccb5e843e8801b2ec6ea3c54625e8ba16e7c522d
+  metadata.gz: 6138f067fde5bf88b21e56895a967a55e8bc9357dfd16d0044fd2777c5cbadc7
+  data.tar.gz: 64d630cc6a9f3d1413a8155486f002a1d524f9750ebf2c18d5c5bc485c21e438
 SHA512:
-  metadata.gz: 2136057006988a3e05ab8be06f16125e76c520d1e46d656dd8aee9d7ae0c841fbc55d07e247e332120ab32b1f0a41e5b24827012104c8c3b75ac7e15de7e9395
-  data.tar.gz: 6a55cfcf03e4c2b15157e3292a89e161b3a25dc10ee45325912e9bf0fd4a13705b7d9b1e7c5f309c9a5ea9fc608a333af144a36844e95d6f20658cde5d290fd5
+  metadata.gz: 57246fef93f5061741c542a5710c16c905ff086da1d06974473e8b6ad54a6c84e26c4d79f7f538a92bca7d53ceb4c20e9eace2d65536922168e4ca227bb5a152
+  data.tar.gz: 6940142c7e889246bab48ccd06dc35784731181b774fc047ba9359f5e5b5975b5b10cee3a2ac970e11142ed1ae9dfc004e88e30cba5470945088a23cd7506b8d

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Master (Unreleased)
 
+## 1.28.0 (2018-08-14)
+
+* Add `RSpec/ReceiveNever` cop enforcing usage of `not_to receive` instead of `never` matcher. ([@Darhazer][])
+* Fix false positive in `RSpec/EmptyLineAfterExampleGroup` cop when example is inside `if`. ([@Darhazer][])
+* Add `RSpec/MissingExampleGroupArgument` to enforce first argument for an example group. ([@geniou][])
+* Drop support for ruby `2.1`. ([@bquorning][])
+* Add `FactoryBot/AttributeDefinedStatically` cop to help FactoryBot users with the deprecation of static attributes. ([@composerinteralia][], [@seanpdoyle][])
+* Remove `FactoryBot/DynamicAttributeDefinedStatically` and `FactoryBot/StaticAttributeDefinedDynamically` cops. ([@composerinteralia][])
+
 ## 1.27.0 (2018-06-14)
 
 * `RSpec/LeadingSubject` now enforces subject to be before any examples, hooks or let declarations. ([@Darhazer][])
@@ -351,3 +360,5 @@ Compatibility release so users can upgrade RuboCop to 0.51.0. No new features.
 [@abrom]: https://github.com/abrom
 [@patrickomatic]: https://github.com/patrickomatic
 [@tdeo]: https://github.com/tdeo
+[@composerinteralia]: https://github.com/composerinteralia
+[@seanpdoyle]: https://github.com/seanpdoyle

data/README.md

@@ -7,7 +7,7 @@
 [![Maintainability](https://api.codeclimate.com/v1/badges/8ffaabf633c968c22bdd/maintainability)](https://codeclimate.com/github/rubocop-hq/rubocop-rspec/maintainability)
 
 RSpec-specific analysis for your projects, as an extension to
-[RuboCop](https://github.com/bbatsov/rubocop).
+[RuboCop](https://github.com/rubocop-hq/rubocop).
 
 ## Installation
 

data/config/default.yml

@@ -262,6 +262,11 @@ RSpec/MessageSpies:
   - receive
   StyleGuide: http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/MessageSpies
 
+RSpec/MissingExampleGroupArgument:
+  Description: Checks that the first argument to an example group is not empty.
+  Enabled: true
+  StyleGuide: http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/MissingExampleGroupArgument
+
 RSpec/MultipleDescribes:
   Description: Checks for multiple top level describes.
   Enabled: true
@@ -314,6 +319,11 @@ RSpec/ReceiveCounts:
   Description: Check for `once` and `twice` receive counts matchers usage.
   StyleGuide: http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/ReceiveCounts
 
+RSpec/ReceiveNever:
+  Enabled: true
+  Description: Prefer `not_to receive(...)` over `receive(...).never`.
+  StyleGuide: http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/ReceiveNever
+
 RSpec/RepeatedDescription:
   Enabled: true
   Description: Check for repeated description strings in example groups.
@@ -395,6 +405,11 @@ Capybara/FeatureMethods:
   EnabledMethods: []
   StyleGuide: http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/Capybara/FeatureMethods
 
+FactoryBot/AttributeDefinedStatically:
+  Description: Always declare attribute values as blocks.
+  Enabled: true
+  StyleGuide: http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/FactoryBot/AttributeDefinedStatically
+
 FactoryBot/CreateList:
   Description: Checks for create_list usage.
   Enabled: true
@@ -404,16 +419,6 @@ FactoryBot/CreateList:
   - n_times
   StyleGuide: http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/FactoryBot/CreateList
 
-FactoryBot/DynamicAttributeDefinedStatically:
-  Description: Prefer declaring dynamic attribute values in a block.
-  Enabled: true
-  StyleGuide: http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/FactoryBot/DynamicAttributeDefinedStatically
-
-FactoryBot/StaticAttributeDefinedDynamically:
-  Description: Prefer declaring static attribute values without a block.
-  Enabled: true
-  StyleGuide: http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/FactoryBot/StaticAttributeDefinedDynamically
-
 Rails/HttpStatus:
   Description: Enforces use of symbolic or numeric value to describe HTTP status.
   Enabled: true

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

@@ -27,7 +27,7 @@ module RuboCop
 
         def on_top_level_describe(_node, (_, second_arg))
           return unless second_arg && second_arg.str_type?
-          return if METHOD_STRING_MATCHER =~ one(second_arg.children)
+          return if METHOD_STRING_MATCHER =~ second_arg.str_content
 
           add_offense(second_arg, location: :expression)
         end

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

@@ -70,7 +70,7 @@ module RuboCop
         def on_block(node)
           return unless example_group?(node) && !contains_example?(node)
 
-          add_offense(node.children.first, location: :expression)
+          add_offense(node.send_node, location: :expression)
         end
 
         private

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

@@ -28,11 +28,9 @@ module RuboCop
 
         MSG = 'Add an empty line after `%<example_group>s`.'.freeze
 
-        def_node_matcher :example_group, ExampleGroups::ALL.block_pattern
-
         def on_block(node)
-          return unless example_group(node)
-          return if node.parent && node.equal?(node.parent.children.last)
+          return unless example_group?(node)
+          return if last_child?(node)
 
           missing_separating_line(node) do |location|
             add_offense(

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

@@ -21,15 +21,13 @@ module RuboCop
 
         MSG = 'Add an empty line after the last `let` block.'.freeze
 
-        def_node_matcher :let?, Helpers::ALL.block_pattern
-
         def on_block(node)
           return unless example_group_with_body?(node)
 
           latest_let = node.body.child_nodes.select { |child| let?(child) }.last
 
           return if latest_let.nil?
-          return if latest_let.equal?(node.body.children.last)
+          return if last_child?(latest_let)
 
           missing_separating_line(latest_let) do |location|
             add_offense(latest_let, location: location)

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

@@ -38,11 +38,9 @@ module RuboCop
 
         MSG = 'Add an empty line after `%<hook>s`.'.freeze
 
-        def_node_matcher :hook?, Hooks::ALL.block_pattern
-
         def on_block(node)
           return unless hook?(node)
-          return if node.equal?(node.parent.children.last)
+          return if last_child?(node)
 
           missing_separating_line(node) do |location|
             add_offense(

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

@@ -19,11 +19,9 @@ module RuboCop
 
         MSG = 'Add empty line after `subject`.'.freeze
 
-        def_node_matcher :subject?, Subject::ALL.block_pattern
-
         def on_block(node)
           return unless subject?(node) && !in_spec_block?(node)
-          return if node.equal?(node.parent.children.last)
+          return if last_child?(node)
 
           missing_separating_line(node) do |location|
             add_offense(node, location: location, message: MSG)

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

@@ -54,15 +54,14 @@ module RuboCop
                                'have auto-generated description.'.freeze
         MSG_ADD_DESCRIPTION  = 'Add a description.'.freeze
 
-        def_node_matcher :example?, Examples::ALL.send_pattern
         def_node_matcher :example_description, '(send nil? _ $(str $_))'
 
-        def on_send(node)
+        def on_block(node)
           return unless example?(node)
 
-          check_example_without_description(node)
+          check_example_without_description(node.send_node)
 
-          example_description(node) do |message_node, message|
+          example_description(node.send_node) do |message_node, message|
             return unless message.to_s.empty?
 
             add_offense(message_node, message: MSG_DEFAULT_ARGUMENT)

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

@@ -22,38 +22,23 @@ module RuboCop
       #   end
       class ExpectInHook < Cop
         MSG = 'Do not use `%<expect>s` in `%<hook>s` hook'.freeze
-        HOOKS = Hooks::ALL.node_pattern_union.freeze
 
-        def_node_matcher :hook, <<-PATTERN
-          (block (send _ $#{HOOKS} ...) _ $!nil?)
-        PATTERN
-
-        def_node_search :expect, <<-PATTERN
-          {
-            #{Expectations::ALL.send_pattern}
-            #{Expectations::ALL.block_pattern}
-          }
-        PATTERN
+        def_node_search :expectation, Expectations::ALL.send_pattern
 
         def on_block(node)
-          hook(node) do |hook_name, body|
-            expect(body) do |expect|
-              method = send_node(expect)
-              add_offense(method, location: :selector,
-                                  message: message(method, hook_name))
-            end
+          return unless hook?(node)
+          return if node.body.nil?
+
+          expectation(node.body) do |expect|
+            add_offense(expect, location: :selector,
+                                message: message(expect, node))
           end
         end
 
         private
 
         def message(expect, hook)
-          format(MSG, expect: expect.method_name, hook: hook)
-        end
-
-        def send_node(node)
-          return node if node.send_type?
-          node.children.first
+          format(MSG, expect: expect.method_name, hook: hook.method_name)
         end
       end
     end

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

@@ -18,8 +18,6 @@ module RuboCop
         MSG = 'Use `expect { ... }.to output(...).to_%<name>s` '\
               'instead of mutating $%<name>s.'.freeze
 
-        def_node_matcher :hook?, Hooks::ALL.block_pattern
-
         def on_gvasgn(node)
           return unless inside_example_scope?(node)
 

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

@@ -0,0 +1,146 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module RSpec
+      module FactoryBot
+        # Always declare attribute values as blocks.
+        #
+        # @example
+        #   # bad
+        #   kind [:active, :rejected].sample
+        #
+        #   # good
+        #   kind { [:active, :rejected].sample }
+        #
+        #   # bad
+        #   closed_at 1.day.from_now
+        #
+        #   # good
+        #   closed_at { 1.day.from_now }
+        #
+        #   # bad
+        #   count 1
+        #
+        #   # good
+        #   count { 1 }
+        class AttributeDefinedStatically < Cop
+          MSG = 'Use a block to declare attribute values.'.freeze
+
+          ATTRIBUTE_DEFINING_METHODS = %i[factory trait transient ignore].freeze
+
+          UNPROXIED_METHODS = %i[
+            __send__
+            __id__
+            nil?
+            send
+            object_id
+            extend
+            instance_eval
+            initialize
+            block_given?
+            raise
+            caller
+            method
+          ].freeze
+
+          DEFINITION_PROXY_METHODS = %i[
+            add_attribute
+            after
+            association
+            before
+            callback
+            ignore
+            initialize_with
+            sequence
+            skip_create
+            to_create
+          ].freeze
+
+          RESERVED_METHODS =
+            DEFINITION_PROXY_METHODS +
+            UNPROXIED_METHODS +
+            ATTRIBUTE_DEFINING_METHODS
+
+          def_node_matcher :value_matcher, <<-PATTERN
+            (send nil? !#reserved_method? $...)
+          PATTERN
+
+          def_node_search :factory_attributes, <<-PATTERN
+            (block (send nil? #attribute_defining_method? ...) _ { (begin $...) $(send ...) } )
+          PATTERN
+
+          def on_block(node)
+            factory_attributes(node).to_a.flatten.each do |attribute|
+              next if proc?(attribute) || association?(attribute)
+              add_offense(attribute, location: :expression)
+            end
+          end
+
+          def autocorrect(node)
+            if node.parenthesized?
+              autocorrect_replacing_parens(node)
+            else
+              autocorrect_without_parens(node)
+            end
+          end
+
+          private
+
+          def proc?(attribute)
+            value_matcher(attribute).to_a.all?(&:block_pass_type?)
+          end
+
+          def association?(attribute)
+            argument = attribute.first_argument
+            argument.hash_type? && factory_key?(argument)
+          end
+
+          def factory_key?(hash_node)
+            hash_node.keys.any? { |key| key.value == :factory }
+          end
+
+          def autocorrect_replacing_parens(node)
+            left_braces, right_braces = braces(node)
+
+            lambda do |corrector|
+              corrector.replace(node.location.begin, ' ' + left_braces)
+              corrector.replace(node.location.end, right_braces)
+            end
+          end
+
+          def autocorrect_without_parens(node)
+            left_braces, right_braces = braces(node)
+
+            lambda do |corrector|
+              argument = node.first_argument
+              expression = argument.location.expression
+              corrector.insert_before(expression, left_braces)
+              corrector.insert_after(expression, right_braces)
+            end
+          end
+
+          def braces(node)
+            if value_hash_without_braces?(node.first_argument)
+              ['{ { ', ' } }']
+            else
+              ['{ ', ' }']
+            end
+          end
+
+          def value_hash_without_braces?(node)
+            node.hash_type? && !node.braces?
+          end
+
+          def reserved_method?(method_name)
+            RESERVED_METHODS.include?(method_name)
+          end
+
+          def attribute_defining_method?(method_name)
+            ATTRIBUTE_DEFINING_METHODS.include?(method_name)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -22,8 +22,6 @@ module RuboCop
         MSG = 'Use `instance_spy` when you check your double '\
               'with `have_received`.'.freeze
 
-        def_node_matcher :example?, Examples::ALL.block_pattern
-
         def_node_search :null_double, <<-PATTERN
           (lvasgn $_
             (send

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

@@ -32,7 +32,7 @@ module RuboCop
         def on_block(node)
           each?(node) do |arg, body|
             if single_expectation?(body, arg) || only_expectations?(body, arg)
-              add_offense(node.children.first, location: :expression)
+              add_offense(node.send_node, location: :expression)
             end
           end
         end

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

@@ -37,11 +37,6 @@ module RuboCop
         MSG = 'Declare `subject` above any other `%<offending>s` ' \
           'declarations.'.freeze
 
-        def_node_matcher :subject?, Subject::ALL.block_pattern
-        def_node_matcher :let?, Helpers::ALL.block_pattern
-        def_node_matcher :hook?, Hooks::ALL.block_pattern
-        def_node_matcher :example?, Examples::ALL.block_pattern
-
         def on_block(node)
           return unless subject?(node) && !in_spec_block?(node)
 
@@ -88,7 +83,7 @@ module RuboCop
 
         def in_spec_block?(node)
           node.each_ancestor(:block).any? do |ancestor|
-            Examples::ALL.include?(ancestor.method_name)
+            example?(ancestor)
           end
         end
       end

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

@@ -36,8 +36,6 @@ module RuboCop
 
         MSG = 'Move `let` before the examples in the group.'.freeze
 
-        def_node_matcher :let?, Helpers::ALL.block_pattern
-
         def_node_matcher :example_or_group?, <<-PATTERN
           {
             #{(Examples::ALL + ExampleGroups::ALL).block_pattern}