rubocop-rspec 1.32.0 → 1.33.0

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

@@ -23,7 +23,7 @@ module RuboCop
       #     instance_double("ClassName", method_name: 'returned value')
       #   end
       class VerifiedDoubles < Cop
-        MSG = 'Prefer using verifying doubles over normal doubles.'.freeze
+        MSG = 'Prefer using verifying doubles over normal doubles.'
 
         def_node_matcher :unverified_double, <<-PATTERN
           {(send nil? {:double :spy} $...)}
@@ -41,7 +41,7 @@ module RuboCop
         private
 
         def symbol?(name)
-          name && name.sym_type?
+          name&.sym_type?
         end
       end
     end

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

@@ -13,7 +13,7 @@ module RuboCop
       #   expect(something).to be(1)
       class VoidExpect < Cop
         MSG = 'Do not use `expect()` without `.to` or `.not_to`. ' \
-              'Chain the methods or remove it.'.freeze
+              'Chain the methods or remove it.'
 
         def_node_matcher :expect?, <<-PATTERN
           (send nil? :expect ...)

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

@@ -14,7 +14,7 @@ module RuboCop
       class Yield < Cop
         include RangeHelp
 
-        MSG = 'Use `.and_yield`.'.freeze
+        MSG = 'Use `.and_yield`.'
 
         def_node_search :method_on_stub?, '(send nil? :receive ...)'
 
@@ -52,9 +52,7 @@ module RuboCop
         end
 
         def block_range(node)
-          block_start = node.loc.begin.begin_pos
-          block_end = node.loc.end.end_pos
-          range_between(block_start, block_end)
+          node.loc.begin.with(end_pos: node.loc.end.end_pos)
         end
 
         def generate_replacement(node)

data/lib/rubocop/cop/rspec_cops.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'rspec/capybara/current_path_expectation'
 require_relative 'rspec/capybara/feature_methods'
 
@@ -22,6 +24,7 @@ require_relative 'rspec/describe_class'
 require_relative 'rspec/describe_method'
 require_relative 'rspec/describe_symbol'
 require_relative 'rspec/described_class'
+require_relative 'rspec/dialect'
 require_relative 'rspec/empty_example_group'
 require_relative 'rspec/empty_line_after_example_group'
 require_relative 'rspec/empty_line_after_final_let'

data/lib/rubocop/rspec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RuboCop
   # RuboCop RSpec project namespace
   module RSpec

data/lib/rubocop/rspec/blank_line_separation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RuboCop
   module RSpec
     # Helps determine the offending location if there is not a blank line
@@ -26,7 +28,7 @@ module RuboCop
       end
 
       def last_child?(node)
-        return true unless node.parent && node.parent.begin_type?
+        return true unless node.parent&.begin_type?
 
         node.equal?(node.parent.children.last)
       end

data/lib/rubocop/rspec/config_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module RuboCop
@@ -5,7 +7,7 @@ module RuboCop
     # Builds a YAML config file from two config hashes
     class ConfigFormatter
       NAMESPACES = /^(RSpec|Capybara|FactoryBot|Rails)/.freeze
-      STYLE_GUIDE_BASE_URL = 'http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/'.freeze
+      STYLE_GUIDE_BASE_URL = 'http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/'
 
       def initialize(config, descriptions)
         @config       = config

data/lib/rubocop/rspec/description_extractor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RuboCop
   module RSpec
     # Extracts cop descriptions from YARD docstrings
@@ -20,7 +22,7 @@ module RuboCop
       # Decorator of a YARD code object for working with documented rspec cops
       class CodeObject
         COP_CLASS_NAMES = %w[RuboCop::Cop RuboCop::Cop::RSpec::Cop].freeze
-        RSPEC_NAMESPACE = 'RuboCop::Cop::RSpec'.freeze
+        RSPEC_NAMESPACE = 'RuboCop::Cop::RSpec'
 
         def initialize(yardoc)
           @yardoc = yardoc

data/lib/rubocop/rspec/factory_bot.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module RSpec
+    # RuboCop FactoryBot project namespace
+    module FactoryBot
+      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
+
+      private_constant(
+        :ATTRIBUTE_DEFINING_METHODS,
+        :UNPROXIED_METHODS,
+        :DEFINITION_PROXY_METHODS,
+        :RESERVED_METHODS
+      )
+
+      def self.attribute_defining_methods
+        ATTRIBUTE_DEFINING_METHODS
+      end
+
+      def self.reserved_methods
+        RESERVED_METHODS
+      end
+    end
+  end
+end

data/lib/rubocop/rspec/final_end_location.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RuboCop
   module RSpec
     # Helps find the true end location of nodes which might contain heredocs.

data/lib/rubocop/rspec/inject.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RuboCop
   module RSpec
     # Because RuboCop doesn't yet support plugins, we have to monkey patch in a

data/lib/rubocop/rspec/language.rb

@@ -4,6 +4,8 @@ module RuboCop
   module RSpec
     # RSpec public API methods that are commonly used in cops
     module Language
+      RSPEC = '{(const nil? :RSpec) nil?}'
+
       # Set of method selectors
       class SelectorSet
         def initialize(selectors)
@@ -27,7 +29,7 @@ module RuboCop
         end
 
         def send_pattern
-          "(send {(const nil? :RSpec) nil?} #{node_pattern_union} ...)"
+          "(send #{RSPEC} #{node_pattern_union} ...)"
         end
 
         def node_pattern_union
@@ -106,6 +108,10 @@ module RuboCop
         ALL = SelectorSet.new(%i[expect is_expected expect_any_instance_of])
       end
 
+      module Runners
+        ALL = SelectorSet.new(%i[to to_not not_to])
+      end
+
       ALL =
         ExampleGroups::ALL +
         SharedGroups::ALL  +
@@ -113,7 +119,8 @@ module RuboCop
         Hooks::ALL         +
         Helpers::ALL       +
         Subject::ALL       +
-        Expectations::ALL
+        Expectations::ALL  +
+        Runners::ALL
     end
   end
 end

data/lib/rubocop/rspec/top_level_describe.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RuboCop
   module RSpec
     # Helper methods for top level describe cops

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.32.0'.freeze
+      STRING = '1.33.0'
     end
   end
 end

data/rubocop-rspec.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift File.expand_path('lib', __dir__)
 require 'rubocop/rspec/version'
 
@@ -19,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.version = RuboCop::RSpec::Version::STRING
   spec.platform = Gem::Platform::RUBY
-  spec.required_ruby_version = '>= 2.2.0'
+  spec.required_ruby_version = '>= 2.3.0'
 
   spec.require_paths = ['lib']
   spec.files = Dir[

data/spec/project/changelog_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe 'CHANGELOG.md' do
   subject(:changelog) { SpecHelper::ROOT.join('CHANGELOG.md').read }
 

data/spec/project/default_config_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe 'config/default.yml' do
   subject(:default_config) do
     RuboCop::ConfigLoader.load_file('config/default.yml')

data/spec/project/project_requires_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe 'Project requires' do
   it 'alphabetizes cop requires' do
     source   = SpecHelper::ROOT.join('lib', 'rubocop', 'cop', 'rspec_cops.rb')

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

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 RSpec.describe RuboCop::Cop::RSpec::AlignLeftLetBrace do
   subject(:cop) { described_class.new }
 
+  # rubocop:disable RSpec/ExampleLength
   it 'registers offense for unaligned braces' do
     expect_offense(<<-RUBY)
       let(:foo) { bar }
@@ -15,52 +18,34 @@ RSpec.describe RuboCop::Cop::RSpec::AlignLeftLetBrace do
       }
 
       describe 'blah' do
-        let(:blahblah) { baz }
+        let(:long_name) { thing }
         let(:blah) { thing }
                    ^ Align left let brace
         let(:a) { thing }
                 ^ Align left let brace
       end
     RUBY
+
+    expect_correction(<<-RUBY)
+      let(:foo)      { bar }
+      let(:hi)       { baz }
+      let(:blahblah) { baz }
+
+      let(:thing) { ignore_this }
+      let(:other) {
+        ignore_this_too
+      }
+
+      describe 'blah' do
+        let(:long_name) { thing }
+        let(:blah)      { thing }
+        let(:a)         { thing }
+      end
+    RUBY
   end
+  # rubocop:enable RSpec/ExampleLength
 
   it 'works with empty file' do
     expect_no_offenses('')
   end
-
-  offensive_source = <<-RUBY
-    let(:foo) { bar }
-    let(:hi) { baz }
-    let(:blahblah) { baz }
-
-    let(:thing) { ignore_this }
-    let(:other) {
-      ignore_this_too
-    }
-
-    describe 'blah' do
-      let(:long_name) { thing }
-      let(:blah) { thing }
-      let(:a) { thing }
-    end
-  RUBY
-
-  corrected_source = <<-RUBY
-    let(:foo)      { bar }
-    let(:hi)       { baz }
-    let(:blahblah) { baz }
-
-    let(:thing) { ignore_this }
-    let(:other) {
-      ignore_this_too
-    }
-
-    describe 'blah' do
-      let(:long_name) { thing }
-      let(:blah)      { thing }
-      let(:a)         { thing }
-    end
-  RUBY
-
-  include_examples 'autocorrect', offensive_source, corrected_source
 end

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

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 RSpec.describe RuboCop::Cop::RSpec::AlignRightLetBrace do
   subject(:cop) { described_class.new }
 
+  # rubocop:disable RSpec/ExampleLength
   it 'registers offense for unaligned braces' do
     expect_offense(<<-RUBY)
       let(:foo)      { a }
@@ -22,45 +25,27 @@ RSpec.describe RuboCop::Cop::RSpec::AlignRightLetBrace do
         let(:a)        { abc }
       end
     RUBY
+
+    expect_correction(<<-RUBY)
+      let(:foo)      { a    }
+      let(:hi)       { ab   }
+      let(:blahblah) { abcd }
+
+      let(:thing) { ignore_this }
+      let(:other) {
+        ignore_this_too
+      }
+
+      describe 'blah' do
+        let(:blahblah) { a   }
+        let(:blah)     { bc  }
+        let(:a)        { abc }
+      end
+    RUBY
   end
+  # rubocop:enable RSpec/ExampleLength
 
   it 'works with empty file' do
     expect_no_offenses('')
   end
-
-  offensive_source = <<-RUBY
-    let(:foo)      { a }
-    let(:hi)       { ab }
-    let(:blahblah) { abcd }
-
-    let(:thing) { ignore_this }
-    let(:other) {
-      ignore_this_too
-    }
-
-    describe 'blah' do
-      let(:blahblah) { a }
-      let(:blah)     { bc }
-      let(:a)        { abc }
-    end
-  RUBY
-
-  corrected_source = <<-RUBY
-    let(:foo)      { a    }
-    let(:hi)       { ab   }
-    let(:blahblah) { abcd }
-
-    let(:thing) { ignore_this }
-    let(:other) {
-      ignore_this_too
-    }
-
-    describe 'blah' do
-      let(:blahblah) { a   }
-      let(:blah)     { bc  }
-      let(:a)        { abc }
-    end
-  RUBY
-
-  include_examples 'autocorrect', offensive_source, corrected_source
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe RuboCop::Cop::RSpec::AnyInstance do
   subject(:cop) { described_class.new }