rubocop-rspec 1.26.0 → 1.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25c78adb48d8a15bb6229d1d8140abcd3f2e455c846288276ad01cedba024b4a
-  data.tar.gz: 0e2fbf154570fca1aaf0a32cf7866902424bab10da2854038f5674c8664a2d11
+  metadata.gz: 2cb62faf05dbb3d997032a8fbac1d3d1897542d7a98b1540c54afebc10a6a294
+  data.tar.gz: 6b1fae2d79e473c5e8295fe6ccb5e843e8801b2ec6ea3c54625e8ba16e7c522d
 SHA512:
-  metadata.gz: 7cc9ec95f341241d6c02083673e09ebd861929d846baae085c927a185998da95f573a18f0e7f3b9e7cdaba7f62812d7b80338534742fb2bde205df2fe29e0f3b
-  data.tar.gz: 891e9714f685e8a3b1bee0ef80395cc11fe87eccb3226cd1bef201a90379e4424cbc5bd937cc632ba11efb7463f0654d756450e4ba44556e93dde7ef0838ab1a
+  metadata.gz: 2136057006988a3e05ab8be06f16125e76c520d1e46d656dd8aee9d7ae0c841fbc55d07e247e332120ab32b1f0a41e5b24827012104c8c3b75ac7e15de7e9395
+  data.tar.gz: 6a55cfcf03e4c2b15157e3292a89e161b3a25dc10ee45325912e9bf0fd4a13705b7d9b1e7c5f309c9a5ea9fc608a333af144a36844e95d6f20658cde5d290fd5

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## Master (Unreleased)
 
+## 1.27.0 (2018-06-14)
+
+* `RSpec/LeadingSubject` now enforces subject to be before any examples, hooks or let declarations. ([@Darhazer][])
+* Fix `RSpec/NotToNot` to highlight only the selector (`not_to` or `to_not`), so it works also on `expect { ... }` blocks. ([@bquorning][])
+* Add `RSpec/EmptyLineAfterHook` cop. ([@bquorning][])
+* Add `RSpec/EmptyLineAfterExampleGroup` cop to check that there is an empty line after example group blocks. ([@bquorning][])
+* Fix `RSpec/DescribeClass` crashing on `RSpec.describe` without arguments. ([@Darhazer][])
+* Bump RuboCop requirement to v0.56.0. ([@bquorning][])
+* Fix `RSpec/OverwritingSetup` crashing if a variable is used as an argument for `let`. ([@Darhazer][])
+
 ## 1.26.0 (2018-06-06)
 
 * Fix false positive in `RSpec/EmptyExampleGroup` cop when methods named like a RSpec method are used.  ([@Darhazer][])

data/Gemfile

@@ -2,10 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-group :test do
-  gem 'simplecov', require: false
-end
-
 local_gemfile = 'Gemfile.local'
 
 if File.exist?(local_gemfile)

data/Rakefile

@@ -51,7 +51,8 @@ task confirm_documentation: :generate_cops_documentation do
     Open3.popen3('git diff --exit-code manual/')
 
   unless process.value.success?
-    raise 'manual is out of sync, please add manual/ to the commit'
+    raise 'Please run `rake generate_cops_documentation` ' \
+          'and add manual/ to the commit.'
   end
 end
 
@@ -70,7 +71,10 @@ task :new_cop, [:cop] do |_task, args|
     exit!
   end
 
-  generator = RuboCop::Cop::Generator.new(cop_name)
+  github_user = `git config github.user`.chop
+  github_user = 'your_id' if github_user.empty?
+
+  generator = RuboCop::Cop::Generator.new(cop_name, github_user)
 
   generator.write_source
   generator.write_spec

data/config/default.yml

@@ -93,11 +93,21 @@ RSpec/EmptyExampleGroup:
   CustomIncludeMethods: []
   StyleGuide: http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/EmptyExampleGroup
 
+RSpec/EmptyLineAfterExampleGroup:
+  Description: Checks if there is an empty line after example group blocks.
+  Enabled: true
+  StyleGuide: http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/EmptyLineAfterExampleGroup
+
 RSpec/EmptyLineAfterFinalLet:
   Description: Checks if there is an empty line after the last let block.
   Enabled: true
   StyleGuide: http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/EmptyLineAfterFinalLet
 
+RSpec/EmptyLineAfterHook:
+  Description: Checks if there is an empty line after hook blocks.
+  Enabled: true
+  StyleGuide: http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/EmptyLineAfterHook
+
 RSpec/EmptyLineAfterSubject:
   Description: Checks if there is an empty line after subject block.
   Enabled: true
@@ -215,7 +225,7 @@ RSpec/ItBehavesLike:
   StyleGuide: http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/ItBehavesLike
 
 RSpec/LeadingSubject:
-  Description: Checks for `subject` definitions that come after `let` definitions.
+  Description: Enforce that subject is the first definition in the test.
   Enabled: true
   StyleGuide: http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/LeadingSubject
 

data/lib/rubocop-rspec.rb

@@ -20,6 +20,8 @@ require_relative 'rubocop/cop/rspec/cop'
 require_relative 'rubocop/rspec/align_let_brace'
 require_relative 'rubocop/rspec/capybara'
 require_relative 'rubocop/rspec/factory_bot'
+require_relative 'rubocop/rspec/final_end_location'
+require_relative 'rubocop/rspec/blank_line_separation'
 
 RuboCop::RSpec::Inject.defaults!
 

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

@@ -23,7 +23,10 @@ module RuboCop
               'the class or module being tested.'.freeze
 
         def_node_matcher :valid_describe?, <<-PATTERN
-          {(send {(const nil? :RSpec) nil?} :describe const ...) (send nil? :describe)}
+          {
+            (send {(const nil? :RSpec) nil?} :describe const ...)
+            (send {(const nil? :RSpec) nil?} :describe)
+          }
         PATTERN
 
         def_node_matcher :describe_with_metadata, <<-PATTERN

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module RSpec
+      # Checks if there is an empty line after example group blocks.
+      #
+      # @example
+      #   # bad
+      #   RSpec.describe Foo do
+      #     describe '#bar' do
+      #     end
+      #     describe '#baz' do
+      #     end
+      #   end
+      #
+      #   # good
+      #   RSpec.describe Foo do
+      #     describe '#bar' do
+      #     end
+      #
+      #     describe '#baz' do
+      #     end
+      #   end
+      #
+      class EmptyLineAfterExampleGroup < Cop
+        include RuboCop::RSpec::BlankLineSeparation
+
+        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)
+
+          missing_separating_line(node) do |location|
+            add_offense(
+              node,
+              location: location,
+              message: format(MSG, example_group: node.method_name)
+            )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -17,7 +17,7 @@ module RuboCop
       #
       #   it { does_something }
       class EmptyLineAfterFinalLet < Cop
-        include RangeHelp
+        include RuboCop::RSpec::BlankLineSeparation
 
         MSG = 'Add an empty line after the last `let` block.'.freeze
 
@@ -31,54 +31,10 @@ module RuboCop
           return if latest_let.nil?
           return if latest_let.equal?(node.body.children.last)
 
-          no_new_line_after(latest_let) do |location|
+          missing_separating_line(latest_let) do |location|
             add_offense(latest_let, location: location)
           end
         end
-
-        def autocorrect(node)
-          lambda do |corrector|
-            no_new_line_after(node) do |location|
-              corrector.insert_after(location.end, "\n")
-            end
-          end
-        end
-
-        private
-
-        def no_new_line_after(node)
-          loc = last_node_loc(node)
-          line = loc.line
-          line += 1 while comment_line?(processed_source[line])
-
-          return if processed_source[line].blank?
-          yield offending_loc(node, line)
-        end
-
-        def last_node_loc(node)
-          last_line = node.loc.end.line
-          heredoc_line(node) do |loc|
-            return loc if loc.line > last_line
-          end
-          node.loc.end
-        end
-
-        def heredoc_line(node, &block)
-          yield node.loc.heredoc_end if node.loc.respond_to?(:heredoc_end)
-
-          node.each_child_node { |child| heredoc_line(child, &block) }
-        end
-
-        def offending_loc(node, last_line)
-          offending_line = processed_source[last_line - 1]
-          if comment_line?(offending_line)
-            start = offending_line.index('#')
-            length = offending_line.length - start
-            source_range(processed_source.buffer, last_line, start, length)
-          else
-            node.loc.expression
-          end
-        end
       end
     end
   end

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

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module RSpec
+      # Checks if there is an empty line after hook blocks.
+      #
+      # @example
+      #   # bad
+      #   before { do_something }
+      #   it { does_something }
+      #
+      #   # bad
+      #   after { do_something }
+      #   it { does_something }
+      #
+      #   # bad
+      #   around { |test| test.run }
+      #   it { does_something }
+      #
+      #   # good
+      #   before { do_something }
+      #
+      #   it { does_something }
+      #
+      #   # good
+      #   after { do_something }
+      #
+      #   it { does_something }
+      #
+      #   # good
+      #   around { |test| test.run }
+      #
+      #   it { does_something }
+      #
+      class EmptyLineAfterHook < Cop
+        include RuboCop::RSpec::BlankLineSeparation
+
+        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)
+
+          missing_separating_line(node) do |location|
+            add_offense(
+              node,
+              location: location,
+              message: format(MSG, hook: node.method_name)
+            )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -15,6 +15,8 @@ module RuboCop
       #
       #   let(:foo) { bar }
       class EmptyLineAfterSubject < Cop
+        include RuboCop::RSpec::BlankLineSeparation
+
         MSG = 'Add empty line after `subject`.'.freeze
 
         def_node_matcher :subject?, Subject::ALL.block_pattern
@@ -23,15 +25,9 @@ module RuboCop
           return unless subject?(node) && !in_spec_block?(node)
           return if node.equal?(node.parent.children.last)
 
-          send_line = node.loc.end.line
-          next_line = processed_source[send_line]
-          return if next_line.blank?
-
-          add_offense(node, location: :expression, message: MSG)
-        end
-
-        def autocorrect(node)
-          ->(corrector) { corrector.insert_after(node.loc.end, "\n") }
+          missing_separating_line(node) do |location|
+            add_offense(node, location: location, message: MSG)
+          end
         end
 
         private

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

@@ -3,64 +3,83 @@
 module RuboCop
   module Cop
     module RSpec
-      # Checks for `subject` definitions that come after `let` definitions.
+      # Enforce that subject is the first definition in the test.
       #
       # @example
       #   # bad
-      #   RSpec.describe User do
       #     let(:params) { blah }
       #     subject { described_class.new(params) }
       #
-      #     it 'is valid' do
-      #       expect(subject.valid?).to be(true)
-      #     end
-      #   end
+      #     before { do_something }
+      #     subject { described_class.new(params) }
       #
-      #   # good
-      #   RSpec.describe User do
+      #     it { expect_something }
       #     subject { described_class.new(params) }
+      #     it { expect_something_else }
       #
+      #
+      #   # good
+      #     subject { described_class.new(params) }
       #     let(:params) { blah }
       #
-      #     it 'is valid' do
-      #       expect(subject.valid?).to be(true)
-      #     end
-      #   end
+      #   # good
+      #     subject { described_class.new(params) }
+      #     before { do_something }
+      #
+      #   # good
+      #     subject { described_class.new(params) }
+      #     it { expect_something }
+      #     it { expect_something_else }
+      #
       class LeadingSubject < Cop
         include RangeHelp
 
-        MSG = 'Declare `subject` above any other `let` declarations.'.freeze
+        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)
 
+          check_previous_nodes(node)
+        end
+
+        def check_previous_nodes(node)
           node.parent.each_child_node do |sibling|
-            break if sibling.equal?(node)
+            if offending?(sibling)
+              add_offense(
+                node,
+                location: :expression,
+                message: format(MSG, offending: sibling.method_name)
+              )
+            end
 
-            break add_offense(node, location: :expression) if let?(sibling)
+            break if offending?(sibling) || sibling.equal?(node)
           end
         end
 
         def autocorrect(node)
           lambda do |corrector|
-            first_let = find_first_let(node)
-            first_let_position = first_let.loc.expression
-            indent = "\n" + ' ' * first_let.loc.column
-            corrector.insert_before(first_let_position, node.source + indent)
+            first_node = find_first_offending_node(node)
+            first_node_position = first_node.loc.expression
+            indent = "\n" + ' ' * first_node.loc.column
+            corrector.insert_before(first_node_position, node.source + indent)
             corrector.remove(node_range(node))
           end
         end
 
         private
 
-        def let?(node)
-          %i[let let!].include?(node.method_name)
+        def offending?(node)
+          let?(node) || hook?(node) || example?(node)
         end
 
-        def find_first_let(node)
-          node.parent.children.find { |sibling| let?(sibling) }
+        def find_first_offending_node(node)
+          node.parent.children.find { |sibling| offending?(sibling) }
         end
 
         def node_range(node)

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

@@ -32,6 +32,7 @@ module RuboCop
       #   end
       class LetBeforeExamples < Cop
         include RangeHelp
+        include RuboCop::RSpec::FinalEndLocation
 
         MSG = 'Move `let` before the examples in the group.'.freeze
 
@@ -91,21 +92,10 @@ module RuboCop
         end
 
         def node_range(node)
-          range_between(node.loc.expression.begin_pos, last_node_loc(node))
-        end
-
-        def last_node_loc(node)
-          heredoc = heredoc_lines(node).last
-
-          if heredoc
-            heredoc.loc.heredoc_end.end_pos
-          else
-            node.loc.end.end_pos
-          end
-        end
-
-        def heredoc_lines(node)
-          node.body.child_nodes.select { |n| n.loc.respond_to?(:heredoc_end) }
+          range_between(
+            node.loc.expression.begin_pos,
+            final_end_location(node).end_pos
+          )
         end
       end
     end

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

@@ -22,7 +22,7 @@ module RuboCop
 
         def on_send(node)
           not_to_not_offense(node, alternative_style) do
-            add_offense(node, location: :expression)
+            add_offense(node, location: :selector)
           end
         end
 

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

@@ -22,11 +22,10 @@ module RuboCop
       #   let(:baz) { baz }
       #   let!(:other) { other }
       class OverwritingSetup < Cop
-        include RuboCop::RSpec::Util
-
         MSG = '`%<name>s` is already defined.'.freeze
 
         def_node_matcher :setup?, (Helpers::ALL + Subject::ALL).block_pattern
+        def_node_matcher :first_argument_name, '(send _ _ ({str sym} $_))'
 
         def on_block(node)
           return unless example_group_with_body?(node)
@@ -44,11 +43,11 @@ module RuboCop
 
         def find_duplicates(node)
           setup_expressions = Set.new
-          node.each_child_node do |child|
-            next unless setup?(child)
+          node.each_child_node(:block) do |child|
+            next unless common_setup?(child)
 
             name = if child.send_node.arguments?
-                     child.send_node.first_argument.value
+                     first_argument_name(child.send_node).to_sym
                    else
                      :subject
                    end
@@ -56,6 +55,13 @@ module RuboCop
             yield child, name unless setup_expressions.add?(name)
           end
         end
+
+        def common_setup?(node)
+          return false unless setup?(node)
+          # Search only for setup with basic_literal arguments (e.g. :sym, :str)
+          # or no arguments at all.
+          node.send_node.arguments.all?(&:basic_literal?)
+        end
       end
     end
   end

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

@@ -76,7 +76,7 @@ module RuboCop
 
         def range(node, offending_node)
           range_between(
-            offending_node.loc.selector.begin_pos - 1, # match the dot as well
+            offending_node.loc.dot.begin_pos,
             node.loc.expression.end_pos
           )
         end

data/lib/rubocop/cop/rspec_cops.rb

@@ -24,7 +24,9 @@ require_relative 'rspec/described_class'
 require_relative 'rspec/describe_method'
 require_relative 'rspec/describe_symbol'
 require_relative 'rspec/empty_example_group'
+require_relative 'rspec/empty_line_after_example_group'
 require_relative 'rspec/empty_line_after_final_let'
+require_relative 'rspec/empty_line_after_hook'
 require_relative 'rspec/empty_line_after_subject'
 require_relative 'rspec/example_length'
 require_relative 'rspec/example_without_description'

data/lib/rubocop/rspec/blank_line_separation.rb

@@ -0,0 +1,37 @@
+module RuboCop
+  module RSpec
+    # Helps determine the offending location if there is not a blank line
+    # following the node. Allows comments to follow directly after.
+    module BlankLineSeparation
+      include FinalEndLocation
+      include RuboCop::Cop::RangeHelp
+
+      def missing_separating_line(node)
+        line = final_end_location(node).line
+
+        line += 1 while comment_line?(processed_source[line])
+
+        return if processed_source[line].blank?
+
+        yield offending_loc(line)
+      end
+
+      def offending_loc(last_line)
+        offending_line = processed_source[last_line - 1]
+
+        content_length = offending_line.lstrip.length
+        start          = offending_line.length - content_length
+
+        source_range(processed_source.buffer, last_line, start, content_length)
+      end
+
+      def autocorrect(node)
+        lambda do |corrector|
+          missing_separating_line(node) do |location|
+            corrector.insert_after(location.end, "\n")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/rspec/final_end_location.rb

@@ -0,0 +1,15 @@
+module RuboCop
+  module RSpec
+    # Helps find the true end location of nodes which might contain heredocs.
+    module FinalEndLocation
+      def final_end_location(start_node)
+        heredoc_endings =
+          start_node.each_node(:str, :dstr, :xstr)
+            .select(&:heredoc?)
+            .map { |node| node.loc.heredoc_end }
+
+        [start_node.loc.end, *heredoc_endings].max_by(&:line)
+      end
+    end
+  end
+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.26.0'.freeze
+      STRING = '1.27.0'.freeze
     end
   end
 end

data/rubocop-rspec.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
     'documentation_uri' => 'https://rubocop-rspec.readthedocs.io/'
   }
 
-  spec.add_runtime_dependency 'rubocop', '>= 0.53.0'
+  spec.add_runtime_dependency 'rubocop', '>= 0.56.0'
 
   spec.add_development_dependency 'rack'
   spec.add_development_dependency 'rake'

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

@@ -95,6 +95,9 @@ RSpec.describe RuboCop::Cop::RSpec::DescribeClass do
 
   it 'ignores an empty describe' do
     expect_no_offenses(<<-RUBY)
+      RSpec.describe do
+      end
+
       describe do
       end
     RUBY

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

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+RSpec.describe RuboCop::Cop::RSpec::EmptyLineAfterExampleGroup do
+  subject(:cop) { described_class.new }
+
+  it 'checks for empty line after describe' do
+    expect_offense(<<-RUBY)
+      RSpec.describe Foo do
+        describe '#bar' do
+        end
+        ^^^ Add an empty line after `describe`.
+        describe '#baz' do
+        end
+      end
+    RUBY
+  end
+
+  it 'highlights single line formulations correctly' do
+    expect_offense(<<-RUBY)
+      RSpec.describe Foo do
+        describe('#bar') { }
+        ^^^^^^^^^^^^^^^^^^^^ Add an empty line after `describe`.
+        describe '#baz' do
+        end
+      end
+    RUBY
+  end
+
+  it 'checks for empty line after context' do
+    expect_offense(<<-RUBY)
+      RSpec.context 'foo' do
+        context 'bar' do
+        end
+        ^^^ Add an empty line after `context`.
+        context 'baz' do
+        end
+      end
+    RUBY
+  end
+
+  it 'approves empty line after describe' do
+    expect_no_offenses(<<-RUBY)
+      RSpec.describe Foo do
+        describe '#bar' do
+        end
+
+        describe '#baz' do
+        end
+      end
+    RUBY
+  end
+
+  it 'approves empty line after context' do
+    expect_no_offenses(<<-RUBY)
+      RSpec.context 'foo' do
+        context 'bar' do
+        end
+
+        context 'baz' do
+        end
+      end
+    RUBY
+  end
+
+  bad_example = <<-RUBY
+    RSpec.describe Foo do
+      describe '#bar' do
+      end
+      describe '#baz' do
+      end
+    end
+  RUBY
+
+  good_example = <<-RUBY
+    RSpec.describe Foo do
+      describe '#bar' do
+      end
+
+      describe '#baz' do
+      end
+    end
+  RUBY
+
+  include_examples 'autocorrect',
+                   bad_example,
+                   good_example
+end

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

@@ -19,9 +19,9 @@ RSpec.describe RuboCop::Cop::RSpec::EmptyLineAfterFinalLet do
       RSpec.describe User do
         let(:a) { a }
         let!(:b) do
-        ^^^^^^^^^^^ Add an empty line after the last `let` block.
           b
         end
+        ^^^ Add an empty line after the last `let` block.
         it { expect(a).to eq(b) }
       end
     RUBY
@@ -143,6 +143,21 @@ RSpec.describe RuboCop::Cop::RSpec::EmptyLineAfterFinalLet do
     RUBY
   end
 
+  it 'handles silly HEREDOC offense' do
+    expect_offense(<<-RUBY)
+      RSpec.describe 'silly heredoc syntax' do
+        let(:foo) { <<-BAR }
+        hello
+        world
+        BAR
+        ^^^ Add an empty line after the last `let` block.
+        it 'has tricky syntax' do
+          expect(foo).to eql("  hello\n  world\n")
+        end
+      end
+    RUBY
+  end
+
   bad_example = <<-RUBY
   RSpec.describe User do
     let(:params) { foo }
@@ -185,6 +200,31 @@ RSpec.describe RuboCop::Cop::RSpec::EmptyLineAfterFinalLet do
   end
   RUBY
 
+  include_examples 'autocorrect',
+                   bad_example,
+                   good_example
+
+  bad_example = <<-RUBY
+  RSpec.describe User do
+    let(:params) { <<-DOC }
+     I'm super annoying!
+    DOC
+    it 'has a new line' do
+    end
+  end
+  RUBY
+
+  good_example = <<-RUBY
+  RSpec.describe User do
+    let(:params) { <<-DOC }
+     I'm super annoying!
+    DOC
+
+    it 'has a new line' do
+    end
+  end
+  RUBY
+
   include_examples 'autocorrect',
                    bad_example,
                    good_example

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

@@ -0,0 +1,128 @@
+# frozen_string_literal: true
+
+RSpec.describe RuboCop::Cop::RSpec::EmptyLineAfterHook do
+  subject(:cop) { described_class.new }
+
+  it 'checks for empty line after `before` hook' do
+    expect_offense(<<-RUBY)
+      RSpec.describe User do
+        before { do_something }
+        ^^^^^^^^^^^^^^^^^^^^^^^ Add an empty line after `before`.
+        it { does_something }
+      end
+    RUBY
+  end
+
+  it 'checks for empty line after `after` hook' do
+    expect_offense(<<-RUBY)
+      RSpec.describe User do
+        after { do_something }
+        ^^^^^^^^^^^^^^^^^^^^^^ Add an empty line after `after`.
+        it { does_something }
+      end
+    RUBY
+  end
+
+  it 'checks for empty line after `around` hook' do
+    expect_offense(<<-RUBY)
+      RSpec.describe User do
+        around { |test| test.run }
+        ^^^^^^^^^^^^^^^^^^^^^^^^^^ Add an empty line after `around`.
+        it { does_something }
+      end
+    RUBY
+  end
+
+  it 'approves empty line after `before` hook' do
+    expect_no_offenses(<<-RUBY)
+      RSpec.describe User do
+        before { do_something }
+
+        it { does_something }
+      end
+    RUBY
+  end
+
+  it 'approves empty line after `after` hook' do
+    expect_no_offenses(<<-RUBY)
+      RSpec.describe User do
+        after { do_something }
+
+        it { does_something }
+      end
+    RUBY
+  end
+
+  it 'approves empty line after `around` hook' do
+    expect_no_offenses(<<-RUBY)
+      RSpec.describe User do
+        around { |test| test.run }
+
+        it { does_something }
+      end
+    RUBY
+  end
+
+  it 'handles multiline `before` block' do
+    expect_no_offenses(<<-RUBY)
+      RSpec.describe User do
+        before do
+          do_something
+        end
+
+        it { does_something }
+      end
+    RUBY
+  end
+
+  it 'handles multiline `after` block' do
+    expect_no_offenses(<<-RUBY)
+      RSpec.describe User do
+        after do
+          do_something
+        end
+
+        it { does_something }
+      end
+    RUBY
+  end
+
+  it 'handles multiline `around` block' do
+    expect_no_offenses(<<-RUBY)
+      RSpec.describe User do
+        around do |test|
+          test.run
+        end
+
+        it { does_something }
+      end
+    RUBY
+  end
+
+  it 'handles `before` being the latest node' do
+    expect_no_offenses(<<-RUBY)
+      RSpec.describe User do
+        before { do_something }
+      end
+    RUBY
+  end
+
+  bad_example = <<-RUBY
+    RSpec.describe User do
+      before { do_something }
+      it { does_something }
+    end
+  RUBY
+
+  good_example = <<-RUBY
+    RSpec.describe User do
+      before { do_something }
+
+      it { does_something }
+    end
+  RUBY
+
+  include_examples 'autocorrect',
+                   bad_example,
+                   good_example
+end

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

@@ -20,7 +20,7 @@ RSpec.describe RuboCop::Cop::RSpec::LeadingSubject do
         let!(:params) { foo }
 
         subject { described_class.new }
-        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Declare `subject` above any other `let` declarations.
+        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Declare `subject` above any other `let!` declarations.
       end
     RUBY
   end
@@ -63,8 +63,31 @@ RSpec.describe RuboCop::Cop::RSpec::LeadingSubject do
     RUBY
   end
 
+  it 'checks subject below hook' do
+    expect_offense(<<-RUBY)
+      RSpec.describe User do
+        before { allow(Foo).to receive(:bar) }
+
+        subject { described_class.new }
+        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Declare `subject` above any other `before` declarations.
+      end
+    RUBY
+  end
+
+  it 'checks subject below example' do
+    expect_offense(<<-RUBY)
+      RSpec.describe User do
+        it { is_expected.to be_present }
+
+        subject { described_class.new }
+        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Declare `subject` above any other `it` declarations.
+      end
+    RUBY
+  end
+
   bad_code = <<-RUBY
     RSpec.describe User do
+      before { allow(Foo).to receive(:bar) }
       let(:params) { foo }
       let(:bar) { baz }
 
@@ -76,6 +99,7 @@ RSpec.describe RuboCop::Cop::RSpec::LeadingSubject do
   good_code = <<-RUBY
     RSpec.describe User do
       subject { described_class.new }
+      before { allow(Foo).to receive(:bar) }
       let(:params) { foo }
       let(:bar) { baz }
 

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

@@ -7,7 +7,16 @@ RSpec.describe RuboCop::Cop::RSpec::NotToNot, :config do
     it 'detects the `to_not` offense' do
       expect_offense(<<-RUBY)
         it { expect(false).to_not be_true }
-             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Prefer `not_to` over `to_not`.
+                           ^^^^^^ Prefer `not_to` over `to_not`.
+      RUBY
+    end
+
+    it 'detects the `to_not` offense on an expect block' do
+      expect_offense(<<-RUBY)
+        expect {
+          2 + 2
+        }.to_not raise_error
+          ^^^^^^ Prefer `not_to` over `to_not`.
       RUBY
     end
 
@@ -20,6 +29,18 @@ RSpec.describe RuboCop::Cop::RSpec::NotToNot, :config do
     include_examples 'autocorrect',
                      'it { expect(0).to_not equal 1 }',
                      'it { expect(0).not_to equal 1 }'
+
+    original = <<-RUBY
+      expect {
+        2 + 2
+      }.to_not raise_error
+    RUBY
+    corrected = <<-RUBY
+      expect {
+        2 + 2
+      }.not_to raise_error
+    RUBY
+    include_examples 'autocorrect', original, corrected
   end
 
   context 'when AcceptedMethod is `to_not`' do
@@ -28,7 +49,16 @@ RSpec.describe RuboCop::Cop::RSpec::NotToNot, :config do
     it 'detects the `not_to` offense' do
       expect_offense(<<-RUBY)
         it { expect(false).not_to be_true }
-             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Prefer `to_not` over `not_to`.
+                           ^^^^^^ Prefer `to_not` over `not_to`.
+      RUBY
+    end
+
+    it 'detects the `not_to` offense on an expect block' do
+      expect_offense(<<-RUBY)
+        expect {
+          2 + 2
+        }.not_to raise_error
+          ^^^^^^ Prefer `to_not` over `not_to`.
       RUBY
     end
 
@@ -41,5 +71,17 @@ RSpec.describe RuboCop::Cop::RSpec::NotToNot, :config do
     include_examples 'autocorrect',
                      'it { expect(0).not_to equal 1 }',
                      'it { expect(0).to_not equal 1 }'
+
+    original = <<-RUBY
+      expect {
+        2 + 2
+      }.not_to raise_error
+    RUBY
+    corrected = <<-RUBY
+      expect {
+        2 + 2
+      }.to_not raise_error
+    RUBY
+    include_examples 'autocorrect', original, corrected
   end
 end

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

@@ -66,6 +66,27 @@ RSpec.describe RuboCop::Cop::RSpec::OverwritingSetup do
     RUBY
   end
 
+  it 'handles dynamic names for `let`' do
+    expect_no_offenses(<<-RUBY)
+      RSpec.describe User do
+        subject(:name) { a }
+
+        let(name) { b }
+      end
+    RUBY
+  end
+
+  it 'handles string arguments' do
+    expect_offense(<<-RUBY)
+      RSpec.describe User do
+        subject(:name) { a }
+
+        let("name") { b }
+        ^^^^^^^^^^^^^^^^^ `name` is already defined.
+      end
+    RUBY
+  end
+
   it 'does not encounter an error when handling an empty describe' do
     expect { inspect_source('RSpec.describe(User) do end', 'a_spec.rb') }
       .not_to raise_error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rspec
 version: !ruby/object:Gem::Version
-  version: 1.26.0
+  version: 1.27.0
 platform: ruby
 authors:
 - John Backus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 0.56.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 0.56.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +132,9 @@ files:
 - lib/rubocop/cop/rspec/describe_symbol.rb
 - lib/rubocop/cop/rspec/described_class.rb
 - lib/rubocop/cop/rspec/empty_example_group.rb
+- lib/rubocop/cop/rspec/empty_line_after_example_group.rb
 - lib/rubocop/cop/rspec/empty_line_after_final_let.rb
+- lib/rubocop/cop/rspec/empty_line_after_hook.rb
 - lib/rubocop/cop/rspec/empty_line_after_subject.rb
 - lib/rubocop/cop/rspec/example_length.rb
 - lib/rubocop/cop/rspec/example_without_description.rb
@@ -184,6 +186,7 @@ files:
 - lib/rubocop/cop/rspec_cops.rb
 - lib/rubocop/rspec.rb
 - lib/rubocop/rspec/align_let_brace.rb
+- lib/rubocop/rspec/blank_line_separation.rb
 - lib/rubocop/rspec/capybara.rb
 - lib/rubocop/rspec/concept.rb
 - lib/rubocop/rspec/config_formatter.rb
@@ -191,6 +194,7 @@ files:
 - lib/rubocop/rspec/example.rb
 - lib/rubocop/rspec/example_group.rb
 - lib/rubocop/rspec/factory_bot.rb
+- lib/rubocop/rspec/final_end_location.rb
 - lib/rubocop/rspec/hook.rb
 - lib/rubocop/rspec/inject.rb
 - lib/rubocop/rspec/language.rb
@@ -220,7 +224,9 @@ files:
 - spec/rubocop/cop/rspec/describe_symbol_spec.rb
 - spec/rubocop/cop/rspec/described_class_spec.rb
 - spec/rubocop/cop/rspec/empty_example_group_spec.rb
+- spec/rubocop/cop/rspec/empty_line_after_example_group_spec.rb
 - spec/rubocop/cop/rspec/empty_line_after_final_let_spec.rb
+- spec/rubocop/cop/rspec/empty_line_after_hook_spec.rb
 - spec/rubocop/cop/rspec/empty_line_after_subject_spec.rb
 - spec/rubocop/cop/rspec/example_length_spec.rb
 - spec/rubocop/cop/rspec/example_without_description_spec.rb
@@ -327,7 +333,9 @@ test_files:
 - spec/rubocop/cop/rspec/describe_symbol_spec.rb
 - spec/rubocop/cop/rspec/described_class_spec.rb
 - spec/rubocop/cop/rspec/empty_example_group_spec.rb
+- spec/rubocop/cop/rspec/empty_line_after_example_group_spec.rb
 - spec/rubocop/cop/rspec/empty_line_after_final_let_spec.rb
+- spec/rubocop/cop/rspec/empty_line_after_hook_spec.rb
 - spec/rubocop/cop/rspec/empty_line_after_subject_spec.rb
 - spec/rubocop/cop/rspec/example_length_spec.rb
 - spec/rubocop/cop/rspec/example_without_description_spec.rb