rubocop-rspec 1.25.1 → 1.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aa1fc65d7a5b5430ef4c5a88fa0daa56e09d330dd243225f3ef9b6332b076b3
-  data.tar.gz: 2e56f9dfd5b0b4f11ba040b032bd75ea366a10f15ac7255144971ddfd56027f3
+  metadata.gz: 25c78adb48d8a15bb6229d1d8140abcd3f2e455c846288276ad01cedba024b4a
+  data.tar.gz: 0e2fbf154570fca1aaf0a32cf7866902424bab10da2854038f5674c8664a2d11
 SHA512:
-  metadata.gz: a6066bc29073c219f495824ddce3c3b7d2237d1d06c28605ce536c46b2ec11d0240f05438d7ff8d4a03fde39d484816eb479122617cf411dcf91caba0b2d2cad
-  data.tar.gz: f1d974b0e62efee91acc48eef293fee4237ebb7ec3eb25eb210808e10432be9a010867818410e99b9986e518d24d237d77709c8acea41a35b3dab225412168d8
+  metadata.gz: 7cc9ec95f341241d6c02083673e09ebd861929d846baae085c927a185998da95f573a18f0e7f3b9e7cdaba7f62812d7b80338534742fb2bde205df2fe29e0f3b
+  data.tar.gz: 891e9714f685e8a3b1bee0ef80395cc11fe87eccb3226cd1bef201a90379e4424cbc5bd937cc632ba11efb7463f0654d756450e4ba44556e93dde7ef0838ab1a

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Master (Unreleased)
 
+## 1.26.0 (2018-06-06)
+
+* Fix false positive in `RSpec/EmptyExampleGroup` cop when methods named like a RSpec method are used.  ([@Darhazer][])
+* Fix `Capybara/FeatureMethods` not working when there is require before the spec. ([@Darhazer][])
+* Fix `RSpec/EmptyLineAfterFinalLet`: allow a comment to be placed after latest let, requiring empty line after the comment. ([@Darhazer][])
+* Add `RSpec/ReceiveCounts` cop to enforce usage of :once and :twice matchers. ([@Darhazer][])
+
 ## 1.25.1 (2018-04-10)
 
 * Fix false positive in `RSpec/Pending` cop when pending is used as a method name.  ([@Darhazer][])

data/README.md

@@ -2,14 +2,13 @@
 
 [![Join the chat at https://gitter.im/rubocop-rspec/Lobby](https://badges.gitter.im/rubocop-rspec/Lobby.svg)](https://gitter.im/rubocop-rspec/Lobby)
 [![Gem Version](https://badge.fury.io/rb/rubocop-rspec.svg)](https://rubygems.org/gems/rubocop-rspec)
-[![CircleCI](https://circleci.com/gh/rubocop-rspec/rubocop-rspec.svg?style=svg)](https://circleci.com/gh/rubocop-rspec/rubocop-rspec)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/f6254deb61671e357f30/test_coverage)](https://codeclimate.com/github/rubocop-rspec/rubocop-rspec/test_coverage)
-[![Maintainability](https://api.codeclimate.com/v1/badges/f6254deb61671e357f30/maintainability)](https://codeclimate.com/github/rubocop-rspec/rubocop-rspec/maintainability)
+[![CircleCI](https://circleci.com/gh/rubocop-hq/rubocop-rspec.svg?style=svg)](https://circleci.com/gh/rubocop-hq/rubocop-rspec)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/8ffaabf633c968c22bdd/test_coverage)](https://codeclimate.com/github/rubocop-hq/rubocop-rspec/test_coverage)
+[![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).
 
-
 ## Installation
 
 Just install the `rubocop-rspec` gem
@@ -24,7 +23,6 @@ or if you use bundler put this in your `Gemfile`
 gem 'rubocop-rspec'
 ```
 
-
 ## Usage
 
 You need to tell RuboCop to load the RSpec extension. There are three
@@ -98,10 +96,49 @@ RSpec/FilePath:
     - spec/my_poorly_named_spec_file.rb
 ```
 
+## Non-goals of RuboCop RSpec
+
+### Enforcing `should` vs. `expect` syntax
+
+Enforcing
+
+```ruby
+expect(calculator.compute(line_item)).to eq(5)
+```
+
+over
+
+```ruby
+calculator.compute(line_item).should == 5
+```
+
+is a feature of RSpec itself – you can read about it in the [RSpec Documentation](https://relishapp.com/rspec/rspec-expectations/docs/syntax-configuration#disable-should-syntax)
+
+### Enforcing an explicit RSpec receiver for top-level methods (disabling monkey patching)
+
+Enforcing
+
+```ruby
+Rspec.describe MyClass do
+  ...
+end
+```
+
+over
+
+```ruby
+describe MyClass do
+  ...
+end
+```
+
+can be achieved using RSpec's `disable_monkey_patching!` method, which you can read more about in the [RSpec Documentation](https://relishapp.com/rspec/rspec-core/v/3-7/docs/configuration/zero-monkey-patching-mode#monkey-patched-methods-are-undefined-with-%60disable-monkey-patching!%60). This will also prevent `should` from being defined on every object in your system.
+
+Before disabling `should` you will need all your specs to use the `expect` syntax. You can use [Transpec](http://yujinakayama.me/transpec/), which will do the conversion for you.
 
 ## Contributing
 
-Checkout the [contribution guidelines](.github/CONTRIBUTING.md)
+Checkout the [contribution guidelines](.github/CONTRIBUTING.md).
 
 ## License
 

data/config/default.yml

@@ -299,6 +299,11 @@ RSpec/Pending:
   Description: Checks for any pending or skipped examples.
   StyleGuide: http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/Pending
 
+RSpec/ReceiveCounts:
+  Enabled: true
+  Description: Check for `once` and `twice` receive counts matchers usage.
+  StyleGuide: http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/ReceiveCounts
+
 RSpec/RepeatedDescription:
   Enabled: true
   Description: Check for repeated description strings in example groups.

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

@@ -25,6 +25,8 @@ module RuboCop
         end
 
         def investigate(_processed_source)
+          return if processed_source.blank?
+
           token_aligner.offending_tokens.each do |let|
             add_offense(let, location: :begin)
           end

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

@@ -25,6 +25,8 @@ module RuboCop
         end
 
         def investigate(_processed_source)
+          return if processed_source.blank?
+
           token_aligner.offending_tokens.each do |let|
             add_offense(let, location: :end)
           end

data/lib/rubocop/cop/rspec/capybara/feature_methods.rb

@@ -66,7 +66,7 @@ module RuboCop
           PATTERN
 
           def on_block(node)
-            return unless spec?(root_node)
+            return unless inside_spec?(node)
 
             feature_method(node) do |send_node, match|
               next if enabled?(match)
@@ -87,8 +87,19 @@ module RuboCop
 
           private
 
-          def root_node
-            processed_source.ast
+          def inside_spec?(node)
+            return spec?(node) if root_node?(node)
+
+            root = node.ancestors.find { |parent| root_node?(parent) }
+            spec?(root)
+          end
+
+          def root_node?(node)
+            node.parent.nil? || root_with_siblings?(node.parent)
+          end
+
+          def root_with_siblings?(node)
+            node.begin_type? && node.parent.nil?
           end
 
           def enabled?(method_name)

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

@@ -39,9 +39,7 @@ module RuboCop
             (sym {:request :feature :system :routing :view}))
         PATTERN
 
-        def_node_matcher :shared_group?, <<-PATTERN
-          (block (send {(const nil? :RSpec) nil?} #{SharedGroups::ALL.node_pattern_union} ...) ...)
-        PATTERN
+        def_node_matcher :shared_group?, SharedGroups::ALL.block_pattern
 
         def on_top_level_describe(node, args)
           return if shared_group?(root_node)

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

@@ -17,9 +17,11 @@ module RuboCop
       #
       #   it { does_something }
       class EmptyLineAfterFinalLet < Cop
+        include RangeHelp
+
         MSG = 'Add an empty line after the last `let` block.'.freeze
 
-        def_node_matcher :let?, '(block $(send nil? {:let :let!} ...) args ...)'
+        def_node_matcher :let?, Helpers::ALL.block_pattern
 
         def on_block(node)
           return unless example_group_with_body?(node)
@@ -29,24 +31,28 @@ module RuboCop
           return if latest_let.nil?
           return if latest_let.equal?(node.body.children.last)
 
-          no_new_line_after(latest_let) do
-            add_offense(latest_let, location: :expression)
+          no_new_line_after(latest_let) do |location|
+            add_offense(latest_let, location: location)
           end
         end
 
         def autocorrect(node)
-          loc = last_node_loc(node)
-          ->(corrector) { corrector.insert_after(loc.end, "\n") }
+          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])
 
-          next_line = processed_source[loc.line]
-
-          yield unless next_line.blank?
+          return if processed_source[line].blank?
+          yield offending_loc(node, line)
         end
 
         def last_node_loc(node)
@@ -62,6 +68,17 @@ module RuboCop
 
           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_subject.rb

@@ -17,7 +17,7 @@ module RuboCop
       class EmptyLineAfterSubject < Cop
         MSG = 'Add empty line after `subject`.'.freeze
 
-        def_node_matcher :subject?, '(block $(send nil? :subject ...) args ...)'
+        def_node_matcher :subject?, Subject::ALL.block_pattern
 
         def on_block(node)
           return unless subject?(node) && !in_spec_block?(node)

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

@@ -22,9 +22,7 @@ module RuboCop
         MSG = 'Use `instance_spy` when you check your double '\
               'with `have_received`.'.freeze
 
-        EXAMPLES = Examples::ALL.node_pattern_union.freeze
-
-        def_node_matcher :example?, "(block $(send nil? #{EXAMPLES}) ...)"
+        def_node_matcher :example?, Examples::ALL.block_pattern
 
         def_node_search :null_double, <<-PATTERN
           (lvasgn $_

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

@@ -31,7 +31,7 @@ module RuboCop
 
         MSG = 'Declare `subject` above any other `let` declarations.'.freeze
 
-        def_node_matcher :subject?, '(block $(send nil? :subject ...) args ...)'
+        def_node_matcher :subject?, Subject::ALL.block_pattern
 
         def on_block(node)
           return unless subject?(node) && !in_spec_block?(node)

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

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

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

@@ -14,7 +14,9 @@ module RuboCop
       class MessageChain < Cop
         MSG = 'Avoid stubbing using `%<method>s`.'.freeze
 
-        def_node_matcher :message_chain, Matchers::MESSAGE_CHAIN.send_pattern
+        def_node_matcher :message_chain, <<-PATTERN
+          (send _ {:receive_message_chain :stub_chain} ...)
+        PATTERN
 
         def on_send(node)
           message_chain(node) { add_offense(node, location: :selector) }

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

@@ -48,7 +48,7 @@ module RuboCop
           }
         PATTERN
 
-        def_node_matcher :unnamed_subject, '$(send nil? :subject)'
+        def_node_search :subject_usage, '$(send nil? :subject)'
 
         def on_block(node)
           return unless rspec_block?(node)
@@ -57,16 +57,6 @@ module RuboCop
             add_offense(subject_node, location: :selector)
           end
         end
-
-        private
-
-        def subject_usage(node, &block)
-          unnamed_subject(node, &block)
-
-          node.each_child_node do |child|
-            subject_usage(child, &block)
-          end
-        end
       end
     end
   end

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

@@ -22,11 +22,11 @@ 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?, <<-PATTERN
-          (block (send nil? {:let :let! :subject} (sym $_)) ...)
-        PATTERN
+        def_node_matcher :setup?, (Helpers::ALL + Subject::ALL).block_pattern
 
         def on_block(node)
           return unless example_group_with_body?(node)
@@ -45,9 +45,15 @@ module RuboCop
         def find_duplicates(node)
           setup_expressions = Set.new
           node.each_child_node do |child|
-            setup?(child) do |name|
-              yield child, name unless setup_expressions.add?(name)
-            end
+            next unless setup?(child)
+
+            name = if child.send_node.arguments?
+                     child.send_node.first_argument.value
+                   else
+                     :subject
+                   end
+
+            yield child, name unless setup_expressions.add?(name)
           end
         end
       end

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

@@ -43,11 +43,8 @@ module RuboCop
 
         def_node_matcher :pending_block?, PENDING_EXAMPLES.send_pattern
 
-        def_node_matcher :rspec?, '(send {(const nil? :RSpec) nil?} ...)'
-
         def on_send(node)
           return unless pending_block?(node) || skipped_from_metadata?(node)
-          return unless rspec?(node)
 
           add_offense(node, location: :expression)
         end

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

@@ -0,0 +1,86 @@
+module RuboCop
+  module Cop
+    module RSpec
+      # Check for `once` and `twice` receive counts matchers usage.
+      #
+      # @example
+      #
+      #     # bad
+      #     expect(foo).to receive(:bar).exactly(1).times
+      #     expect(foo).to receive(:bar).exactly(2).times
+      #     expect(foo).to receive(:bar).at_least(1).times
+      #     expect(foo).to receive(:bar).at_least(2).times
+      #     expect(foo).to receive(:bar).at_most(1).times
+      #     expect(foo).to receive(:bar).at_most(2).times
+      #
+      #     # good
+      #     expect(foo).to receive(:bar).once
+      #     expect(foo).to receive(:bar).twice
+      #     expect(foo).to receive(:bar).at_least(:once)
+      #     expect(foo).to receive(:bar).at_least(:twice)
+      #     expect(foo).to receive(:bar).at_most(:once)
+      #     expect(foo).to receive(:bar).at_most(:twice).times
+      #
+      class ReceiveCounts < Cop
+        include RangeHelp
+
+        MSG = 'Use `%<alternative>s` instead of `%<original>s`.'.freeze
+
+        def_node_matcher :receive_counts, <<-PATTERN
+          (send $(send _ {:exactly :at_least :at_most} (int {1 2})) :times)
+        PATTERN
+
+        def on_send(node)
+          receive_counts(node) do |offending_node|
+            offending_range = range(node, offending_node)
+
+            add_offense(
+              offending_node,
+              message: message_for(offending_node, offending_range.source),
+              location: offending_range
+            )
+          end
+        end
+
+        def autocorrect(node)
+          lambda do |corrector|
+            replacement = matcher_for(
+              node.method_name,
+              node.first_argument.source.to_i
+            )
+            corrector.replace(
+              range(node.parent, node),
+              replacement
+            )
+          end
+        end
+
+        private
+
+        def message_for(node, source)
+          alternative = matcher_for(
+            node.method_name,
+            node.first_argument.source.to_i
+          )
+          format(MSG, alternative: alternative, original: source)
+        end
+
+        def matcher_for(method, count)
+          matcher = count == 1 ? 'once' : 'twice'
+          if method == :exactly
+            ".#{matcher}"
+          else
+            ".#{method}(:#{matcher})"
+          end
+        end
+
+        def range(node, offending_node)
+          range_between(
+            offending_node.loc.selector.begin_pos - 1, # match the dot as well
+            node.loc.expression.end_pos
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -29,7 +29,7 @@ module RuboCop
       class ScatteredLet < Cop
         MSG = 'Group all let/let! blocks in the example group together.'.freeze
 
-        def_node_matcher :let?, '(block (send nil? {:let :let!} ...) ...)'
+        def_node_matcher :let?, Helpers::ALL.block_pattern
 
         def on_block(node)
           return unless example_group_with_body?(node)

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

@@ -19,7 +19,7 @@ module RuboCop
               '`%<called>s` with a single argument.'.freeze
 
         def_node_matcher :message_chain, <<-PATTERN
-          (send _ #{Matchers::MESSAGE_CHAIN.node_pattern_union} $_)
+          (send _ {:receive_message_chain :stub_chain} $_)
         PATTERN
 
         def_node_matcher :single_key_hash?, '(hash pair)'

data/lib/rubocop/cop/rspec_cops.rb

@@ -57,6 +57,7 @@ require_relative 'rspec/not_to_not'
 require_relative 'rspec/overwriting_setup'
 require_relative 'rspec/pending'
 require_relative 'rspec/predicate_matcher'
+require_relative 'rspec/receive_counts'
 require_relative 'rspec/repeated_description'
 require_relative 'rspec/repeated_example'
 require_relative 'rspec/return_from_stub'

data/lib/rubocop/rspec/align_let_brace.rb

@@ -6,7 +6,7 @@ module RuboCop
     class AlignLetBrace
       extend NodePattern::Macros
 
-      def_node_matcher :let?, Language::Helpers::ALL.block_pattern.freeze
+      def_node_matcher :let?, Language::Helpers::ALL.block_pattern
 
       def initialize(root, token)
         @root  = root

data/lib/rubocop/rspec/example_group.rb

@@ -14,14 +14,12 @@ module RuboCop
         ExampleGroups::ALL + SharedGroups::ALL + Includes::ALL
       ).block_pattern
 
-      # @!method hook(node)
+      # @!method hook?(node)
       #
       #   Detect if node is `before`, `after`, `around`
-      def_node_matcher :hook, <<-PATTERN
-        (block {$(send nil? #{Hooks::ALL.node_pattern_union} ...)} ...)
-      PATTERN
+      def_node_matcher :hook?, Hooks::ALL.block_pattern
 
-      def_node_matcher :subject, Subject::ALL.block_pattern
+      def_node_matcher :subject?, Subject::ALL.block_pattern
 
       def subjects
         subjects_in_scope(node)
@@ -46,7 +44,7 @@ module RuboCop
       def find_subjects(node)
         return [] if scope_change?(node)
 
-        if subject(node)
+        if subject?(node)
           [node]
         else
           subjects_in_scope(node)
@@ -62,7 +60,7 @@ module RuboCop
       def find_hooks(node)
         return [] if scope_change?(node) || example?(node)
 
-        if hook(node)
+        if hook?(node)
           [node]
         else
           hooks_in_scope(node)

data/lib/rubocop/rspec/language.rb

@@ -27,7 +27,7 @@ module RuboCop
         end
 
         def send_pattern
-          "(send _ #{node_pattern_union} ...)"
+          "(send {(const nil? :RSpec) nil?} #{node_pattern_union} ...)"
         end
 
         def node_pattern_union
@@ -43,10 +43,6 @@ module RuboCop
         attr_reader :selectors
       end
 
-      module Matchers
-        MESSAGE_CHAIN = SelectorSet.new(%i[receive_message_chain stub_chain])
-      end
-
       module ExampleGroups
         GROUPS  = SelectorSet.new(%i[describe context feature example_group])
         SKIPPED = SelectorSet.new(%i[xdescribe xcontext xfeature])

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.25.1'.freeze
+      STRING = '1.26.0'.freeze
     end
   end
 end

data/rubocop-rspec.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
     Code style checking for RSpec files.
     A plugin for the RuboCop code style enforcing & linting tool.
   DESCRIPTION
-  spec.homepage = 'https://github.com/rubocop-rspec/rubocop-rspec'
+  spec.homepage = 'https://github.com/rubocop-hq/rubocop-rspec'
   spec.authors = ['John Backus', 'Ian MacLeod', 'Nils Gemeinhardt']
   spec.email = [
     'johncbackus@gmail.com',
@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.extra_rdoc_files = ['MIT-LICENSE.md', 'README.md']
 
   spec.metadata = {
-    'changelog_uri' => 'https://github.com/rubocop-rspec/rubocop-rspec/blob/master/CHANGELOG.md',
+    'changelog_uri' => 'https://github.com/rubocop-hq/rubocop-rspec/blob/master/CHANGELOG.md',
     'documentation_uri' => 'https://rubocop-rspec.readthedocs.io/'
   }
 

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

@@ -24,6 +24,10 @@ RSpec.describe RuboCop::Cop::RSpec::AlignLeftLetBrace do
     RUBY
   end
 
+  it 'works with empty file' do
+    expect_no_offenses('')
+  end
+
   offensive_source = <<-RUBY
     let(:foo) { bar }
     let(:hi) { baz }

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

@@ -24,6 +24,10 @@ RSpec.describe RuboCop::Cop::RSpec::AlignRightLetBrace do
     RUBY
   end
 
+  it 'works with empty file' do
+    expect_no_offenses('')
+  end
+
   offensive_source = <<-RUBY
     let(:foo)      { a }
     let(:hi)       { ab }

data/spec/rubocop/cop/rspec/capybara/feature_methods_spec.rb

@@ -76,6 +76,15 @@ RSpec.describe RuboCop::Cop::RSpec::Capybara::FeatureMethods, :config do
     RUBY
   end
 
+  it 'allows includes before the spec' do
+    expect_offense(<<-RUBY)
+      require 'rails_helper'
+
+      RSpec.feature 'Foo' do; end
+            ^^^^^^^ Use `describe` instead of `feature`.
+    RUBY
+  end
+
   context 'with configured `EnabledMethods`' do
     let(:cop_config) { { 'EnabledMethods' => %w[feature] } }
 

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

@@ -49,6 +49,20 @@ RSpec.describe RuboCop::Cop::RSpec::EmptyExampleGroup, :config do
     RUBY
   end
 
+  it 'does not flag methods matching example group names' do
+    expect_no_offenses(<<-RUBY)
+      describe Foo do
+        it 'yields a block when given' do
+          value = nil
+
+          helper.feature('whatevs') { value = 5 }
+
+          expect(value).to be 5
+        end
+      end
+    RUBY
+  end
+
   it 'does not recognize custom include methods by default' do
     expect_offense(<<-RUBY)
       describe Foo do

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

@@ -38,6 +38,30 @@ RSpec.describe RuboCop::Cop::RSpec::EmptyLineAfterFinalLet do
     RUBY
   end
 
+  it 'allows comment followed by an empty line after let' do
+    expect_no_offenses(<<-RUBY)
+    RSpec.describe User do
+      let(:a) { a }
+      let(:b) { b }
+      # end of setup
+
+      it { expect(a).to eq(b) }
+    end
+    RUBY
+  end
+
+  it 'flags missing empty line after the comment that comes after last let' do
+    expect_offense(<<-RUBY)
+      RSpec.describe User do
+        let(:a) { a }
+        let(:b) { b }
+        # end of setup
+        ^^^^^^^^^^^^^^ Add an empty line after the last `let` block.
+        it { expect(a).to eq(b) }
+      end
+    RUBY
+  end
+
   it 'ignores empty lines between the lets' do
     expect_offense(<<-RUBY)
       RSpec.describe User do
@@ -136,6 +160,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) { foo }
+    # a multiline comment marking
+    # the end of setup
+    it 'has a new line' do
+    end
+  end
+  RUBY
+
+  good_example = <<-RUBY
+  RSpec.describe User do
+    let(:params) { foo }
+    # a multiline comment marking
+    # the end of setup
+
+    it 'has a new line' do
+    end
+  end
+  RUBY
+
   include_examples 'autocorrect',
                    bad_example,
                    good_example

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

@@ -13,6 +13,16 @@ RSpec.describe RuboCop::Cop::RSpec::EmptyLineAfterSubject do
     RUBY
   end
 
+  it 'checks for empty line after subject!' do
+    expect_offense(<<-RUBY)
+      RSpec.describe User do
+        subject! { described_class.new }
+        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Add empty line after `subject`.
+        let(:params) { foo }
+      end
+    RUBY
+  end
+
   it 'approves empty line after subject' do
     expect_no_offenses(<<-RUBY)
       RSpec.describe User do
@@ -23,6 +33,16 @@ RSpec.describe RuboCop::Cop::RSpec::EmptyLineAfterSubject do
     RUBY
   end
 
+  it 'approves empty line after subject!' do
+    expect_no_offenses(<<-RUBY)
+      RSpec.describe User do
+        subject! { described_class.new }
+
+        let(:params) { foo }
+      end
+    RUBY
+  end
+
   it 'handles subjects in tests' do
     expect_no_offenses(<<-RUBY)
       RSpec.describe User do
@@ -48,7 +68,7 @@ RSpec.describe RuboCop::Cop::RSpec::EmptyLineAfterSubject do
     RUBY
   end
 
-  it 'handles let being the latest node' do
+  it 'handles subject being the latest node' do
     expect_no_offenses(<<-RUBY)
       RSpec.describe User do
         subject { described_user }

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

@@ -22,6 +22,17 @@ RSpec.describe RuboCop::Cop::RSpec::OverwritingSetup do
     RUBY
   end
 
+  it 'works with `subject!` and `let!`' do
+    expect_offense(<<-RUBY)
+      RSpec.describe User do
+        subject!(:a) { a }
+
+        let!(:a) { b }
+        ^^^^^^^^^^^^^^ `a` is already defined.
+      end
+    RUBY
+  end
+
   it 'finds `let!` overwriting `let`' do
     expect_offense(<<-RUBY)
       RSpec.describe User do
@@ -44,6 +55,17 @@ RSpec.describe RuboCop::Cop::RSpec::OverwritingSetup do
     RUBY
   end
 
+  it 'handles unnamed subjects' do
+    expect_offense(<<-RUBY)
+      RSpec.describe User do
+        subject { a }
+
+        let(:subject) { b }
+        ^^^^^^^^^^^^^^^^^^^ `subject` 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

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

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+RSpec.describe RuboCop::Cop::RSpec::ReceiveCounts do
+  subject(:cop) { described_class.new }
+
+  it 'flags usage of `exactly(1).times`' do
+    expect_offense(<<-RUBY)
+      expect(foo).to receive(:bar).exactly(1).times
+                                  ^^^^^^^^^^^^^^^^^ Use `.once` instead of `.exactly(1).times`.
+    RUBY
+  end
+
+  it 'flags usage of `exactly(2).times`' do
+    expect_offense(<<-RUBY)
+      expect(foo).to receive(:bar).exactly(2).times
+                                  ^^^^^^^^^^^^^^^^^ Use `.twice` instead of `.exactly(2).times`.
+    RUBY
+  end
+
+  it 'allows `exactly(3).times`' do
+    expect_no_offenses(<<-RUBY)
+      expect(foo).to receive(:bar).exactly(3).times
+    RUBY
+  end
+
+  it 'allows `exactly(n).times`' do
+    expect_no_offenses(<<-RUBY)
+      expect(foo).to receive(:bar).exactly(n).times
+    RUBY
+  end
+
+  it 'flags usage of `exactly(1).times` after `with`' do
+    expect_offense(<<-RUBY)
+      expect(foo).to receive(:bar).with(baz).exactly(1).times
+                                            ^^^^^^^^^^^^^^^^^ Use `.once` instead of `.exactly(1).times`.
+    RUBY
+  end
+
+  it 'flags usage of `exactly(1).times` with return value' do
+    expect_offense(<<-RUBY)
+      expect(foo).to receive(:bar).exactly(1).times.and_return(true)
+                                  ^^^^^^^^^^^^^^^^^ Use `.once` instead of `.exactly(1).times`.
+    RUBY
+  end
+
+  it 'flags usage of `exactly(1).times` with a block' do
+    expect_offense(<<-RUBY)
+      expect(foo).to receive(:bar).exactly(1).times { true }
+                                  ^^^^^^^^^^^^^^^^^ Use `.once` instead of `.exactly(1).times`.
+    RUBY
+  end
+
+  it 'flags usage of `at_least(1).times`' do
+    expect_offense(<<-RUBY)
+      expect(foo).to receive(:bar).at_least(1).times
+                                  ^^^^^^^^^^^^^^^^^^ Use `.at_least(:once)` instead of `.at_least(1).times`.
+    RUBY
+  end
+
+  it 'flags usage of `at_least(2).times`' do
+    expect_offense(<<-RUBY)
+      expect(foo).to receive(:bar).at_least(2).times
+                                  ^^^^^^^^^^^^^^^^^^ Use `.at_least(:twice)` instead of `.at_least(2).times`.
+    RUBY
+  end
+
+  it 'flags usage of `at_most(1).times`' do
+    expect_offense(<<-RUBY)
+      expect(foo).to receive(:bar).at_most(1).times
+                                  ^^^^^^^^^^^^^^^^^ Use `.at_most(:once)` instead of `.at_most(1).times`.
+    RUBY
+  end
+
+  it 'flags usage of `at_most(2).times`' do
+    expect_offense(<<-RUBY)
+      expect(foo).to receive(:bar).at_most(2).times
+                                  ^^^^^^^^^^^^^^^^^ Use `.at_most(:twice)` instead of `.at_most(2).times`.
+    RUBY
+  end
+
+  include_examples 'autocorrect',
+                   'expect(foo).to receive(:bar).exactly(1).times { true }',
+                   'expect(foo).to receive(:bar).once { true }'
+
+  include_examples 'autocorrect',
+                   'expect(foo).to receive(:bar).at_least(2).times { true }',
+                   'expect(foo).to receive(:bar).at_least(:twice) { true }'
+end

data/spec/rubocop/rspec/language/selector_set_spec.rb

@@ -35,14 +35,16 @@ RSpec.describe RuboCop::RSpec::Language::SelectorSet do
 
   describe '#send_pattern' do
     it 'builds a send matching pattern' do
-      expect(selector_set.send_pattern).to eql('(send _ {:foo :bar} ...)')
+      expect(selector_set.send_pattern).to eql(
+        '(send {(const nil? :RSpec) nil?} {:foo :bar} ...)'
+      )
     end
   end
 
   describe '#block_pattern' do
     it 'builds a block matching pattern' do
       expect(selector_set.block_pattern).to eql(
-        '(block (send _ {:foo :bar} ...) ...)'
+        '(block (send {(const nil? :RSpec) nil?} {:foo :bar} ...) ...)'
       )
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rspec
 version: !ruby/object:Gem::Version
-  version: 1.25.1
+  version: 1.26.0
 platform: ruby
 authors:
 - John Backus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -169,6 +169,7 @@ files:
 - lib/rubocop/cop/rspec/pending.rb
 - lib/rubocop/cop/rspec/predicate_matcher.rb
 - lib/rubocop/cop/rspec/rails/http_status.rb
+- lib/rubocop/cop/rspec/receive_counts.rb
 - lib/rubocop/cop/rspec/repeated_description.rb
 - lib/rubocop/cop/rspec/repeated_example.rb
 - lib/rubocop/cop/rspec/return_from_stub.rb
@@ -256,6 +257,7 @@ files:
 - spec/rubocop/cop/rspec/pending_spec.rb
 - spec/rubocop/cop/rspec/predicate_matcher_spec.rb
 - spec/rubocop/cop/rspec/rails/http_status_spec.rb
+- spec/rubocop/cop/rspec/receive_counts_spec.rb
 - spec/rubocop/cop/rspec/repeated_description_spec.rb
 - spec/rubocop/cop/rspec/repeated_example_spec.rb
 - spec/rubocop/cop/rspec/return_from_stub_spec.rb
@@ -279,11 +281,11 @@ files:
 - spec/shared/detects_style_behavior.rb
 - spec/spec_helper.rb
 - spec/support/expect_offense.rb
-homepage: https://github.com/rubocop-rspec/rubocop-rspec
+homepage: https://github.com/rubocop-hq/rubocop-rspec
 licenses:
 - MIT
 metadata:
-  changelog_uri: https://github.com/rubocop-rspec/rubocop-rspec/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/rubocop-hq/rubocop-rspec/blob/master/CHANGELOG.md
   documentation_uri: https://rubocop-rspec.readthedocs.io/
 post_install_message: 
 rdoc_options: []
@@ -362,6 +364,7 @@ test_files:
 - spec/rubocop/cop/rspec/pending_spec.rb
 - spec/rubocop/cop/rspec/predicate_matcher_spec.rb
 - spec/rubocop/cop/rspec/rails/http_status_spec.rb
+- spec/rubocop/cop/rspec/receive_counts_spec.rb
 - spec/rubocop/cop/rspec/repeated_description_spec.rb
 - spec/rubocop/cop/rspec/repeated_example_spec.rb
 - spec/rubocop/cop/rspec/return_from_stub_spec.rb