rspec-expectations 3.0.0 → 3.0.1

data/lib/rspec/matchers/built_in/be_instance_of.rb

@@ -5,7 +5,6 @@ module RSpec
       # Provides the implementation for `be_an_instance_of`.
       # Not intended to be instantiated directly.
       class BeAnInstanceOf < BaseMatcher
-
         # @api private
         # @return [String]
         def description

data/lib/rspec/matchers/built_in/be_kind_of.rb

@@ -5,8 +5,8 @@ module RSpec
       # Provides the implementation for `be_a_kind_of`.
       # Not intended to be instantiated directly.
       class BeAKindOf < BaseMatcher
-
       private
+
         def match(expected, actual)
           actual.kind_of? expected
         end

data/lib/rspec/matchers/built_in/change.rb

@@ -87,8 +87,8 @@ module RSpec
         end
 
         def raise_block_syntax_error
-          raise SyntaxError,
-            "The block passed to the `change` matcher must use `{ ... }` instead of do/end"
+          raise SyntaxError, "The block passed to the `change` matcher must " \
+            "use `{ ... }` instead of do/end"
         end
 
         def positive_failure_reason
@@ -128,7 +128,7 @@ module RSpec
         end
 
         # @private
-        def does_not_match?(event_proc)
+        def does_not_match?(_event_proc)
           raise NotImplementedError, "`expect { }.not_to change { }.#{@relativity}()` is not supported"
         end
 
@@ -281,7 +281,7 @@ module RSpec
         end
 
         # @private
-        def does_not_match?(event_proc)
+        def does_not_match?(_event_proc)
           raise NotImplementedError, "`expect { }.not_to change { }.to()` is not supported"
         end
 

data/lib/rspec/matchers/built_in/compound.rb

@@ -13,9 +13,9 @@ module RSpec
         end
 
         # @private
-        def does_not_match?(actual)
-          raise NotImplementedError,
-            "`expect(...).not_to matcher.#{conjunction} matcher` is not supported"
+        def does_not_match?(_actual)
+          raise NotImplementedError, "`expect(...).not_to " \
+            "matcher.#{conjunction} matcher` is not supported"
         end
 
         # @api private
@@ -68,7 +68,6 @@ module RSpec
         # @api public
         # Matcher used to represent a compound `and` expectation.
         class And < self
-
           # @api private
           # @return [String]
           def failure_message
@@ -83,7 +82,7 @@ module RSpec
 
         private
 
-          def match(expected, actual)
+          def match(_expected, actual)
             @matcher_1_matches = matcher_1.matches?(actual)
             @matcher_2_matches = matcher_2.matches?(actual)
 
@@ -98,7 +97,6 @@ module RSpec
         # @api public
         # Matcher used to represent a compound `or` expectation.
         class Or < self
-
           # @api private
           # @return [String]
           def failure_message
@@ -107,7 +105,7 @@ module RSpec
 
         private
 
-          def match(expected, actual)
+          def match(_expected, actual)
             matcher_1.matches?(actual) || matcher_2.matches?(actual)
           end
 
@@ -119,4 +117,3 @@ module RSpec
     end
   end
 end
-

data/lib/rspec/matchers/built_in/contain_exactly.rb

@@ -5,7 +5,6 @@ module RSpec
       # Provides the implementation for `contain_exactly` and `match_array`.
       # Not intended to be instantiated directly.
       class ContainExactly < BaseMatcher
-
         # @api private
         # @return [String]
         def failure_message
@@ -16,7 +15,7 @@ module RSpec
             message += "the extra elements were:        #{safe_sort(extra_items).inspect}\n" unless extra_items.empty?
             message
           else
-            "expected a collection that can be converted to an array with " +
+            "expected a collection that can be converted to an array with " \
             "`#to_ary` or `#to_a`, but got #{actual.inspect}"
           end
         end
@@ -35,8 +34,8 @@ module RSpec
 
       private
 
-        def match(expected, actual)
-          convert_actual_to_an_array or return false
+        def match(_expected, _actual)
+          return false unless convert_actual_to_an_array
           match_when_sorted? || (extra_items.empty? && missing_items.empty?)
         end
 
@@ -93,10 +92,10 @@ module RSpec
                 # some extra checks we don't need (e.g. to support nested data
                 # structures), and given that it's called N*M times here, it helps
                 # perf significantly to implement the matching bit ourselves.
-                if (e === a || a == e)
-                  expected_matches[ei] << ai
-                  actual_matches[ai] << ei
-                end
+                next unless e === a || a == e
+
+                expected_matches[ei] << ai
+                actual_matches[ai] << ei
               end
             end
 
@@ -204,7 +203,9 @@ module RSpec
           # @private
           # Starting solution that is worse than any other real solution.
           NullSolution = Class.new do
-            def self.worse_than?(other); true; end
+            def self.worse_than?(_other)
+              true
+            end
           end
 
           def categorize_indexes(indexes_to_categorize, other_indexes)

data/lib/rspec/matchers/built_in/eq.rb

@@ -5,7 +5,6 @@ module RSpec
       # Provides the implementation for `eq`.
       # Not intended to be instantiated directly.
       class Eq < BaseMatcher
-
         # @api private
         # @return [String]
         def failure_message

data/lib/rspec/matchers/built_in/eql.rb

@@ -5,7 +5,6 @@ module RSpec
       # Provides the implementation for `eql`.
       # Not intended to be instantiated directly.
       class Eql < BaseMatcher
-
         # @api private
         # @return [String]
         def failure_message

data/lib/rspec/matchers/built_in/equal.rb

@@ -5,7 +5,6 @@ module RSpec
       # Provides the implementation for `equal`.
       # Not intended to be instantiated directly.
       class Equal < BaseMatcher
-
         # @api private
         # @return [String]
         def failure_message
@@ -19,7 +18,7 @@ module RSpec
         # @api private
         # @return [String]
         def failure_message_when_negated
-          return <<-MESSAGE
+          <<-MESSAGE
 
 expected not #{inspect_object(actual)}
          got #{inspect_object(expected)}
@@ -60,7 +59,7 @@ MESSAGE
         end
 
         def detailed_failure_message
-          return <<-MESSAGE
+          <<-MESSAGE
 
 expected #{inspect_object(expected)}
      got #{inspect_object(actual)}

data/lib/rspec/matchers/built_in/exist.rb

@@ -37,13 +37,10 @@ module RSpec
           "expected #{@actual.inspect} not to exist#{@test.validity_message}"
         end
 
-      private
-
         # @api private
         # Simple class for memoizing actual/expected for this matcher
         # and examining the match
         class ExistenceTest < Struct.new(:actual, :expected)
-
           # @api private
           # @return [Boolean]
           def valid_test?
@@ -83,7 +80,6 @@ module RSpec
             @predicates ||= [:exist?, :exists?].select { |p| actual.respond_to?(p) }
           end
         end
-
       end
     end
   end

data/lib/rspec/matchers/built_in/include.rb

@@ -78,9 +78,9 @@ module RSpec
         end
 
         def actual_hash_has_key?(expected_key)
-          # We check `has_key?` first for perf:
-          # has_key? is O(1), but `any?` is O(N).
-          actual.has_key?(expected_key) ||
+          # We check `key?` first for perf:
+          # `key?` is O(1), but `any?` is O(N).
+          actual.key?(expected_key) ||
           actual.keys.any? { |key| values_match?(expected_key, key) }
         end
 

data/lib/rspec/matchers/built_in/match.rb

@@ -5,7 +5,6 @@ module RSpec
       # Provides the implementation for `match`.
       # Not intended to be instantiated directly.
       class Match < BaseMatcher
-
         # @api private
         # @return [String]
         def description

data/lib/rspec/matchers/built_in/operators.rb

@@ -27,10 +27,10 @@ module RSpec
 
           # @private
           def get(klass, operator)
-            klass.ancestors.each { |ancestor|
+            klass.ancestors.each do |ancestor|
               matcher = registry[ancestor] && registry[ancestor][operator]
               return matcher if matcher
-            }
+            end
 
             nil
           end
@@ -45,7 +45,7 @@ module RSpec
         # @private
         def self.use_custom_matcher_or_delegate(operator)
           define_method(operator) do |expected|
-            if uses_generic_implementation_of?(operator) && matcher = OperatorMatcher.get(@actual.class, operator)
+            if uses_generic_implementation_of?(operator) && (matcher = OperatorMatcher.get(@actual.class, operator))
               @actual.__send__(::RSpec::Matchers.last_expectation_handler.should_method, matcher.new(expected))
             else
               eval_match(@actual, operator, expected)
@@ -54,9 +54,9 @@ module RSpec
 
           negative_operator = operator.sub(/^=/, '!')
           if negative_operator != operator && respond_to?(negative_operator)
-            define_method(negative_operator) do |expected|
+            define_method(negative_operator) do |_expected|
               opposite_should = ::RSpec::Matchers.last_expectation_handler.opposite_should_method
-              raise "RSpec does not support `#{::RSpec::Matchers.last_expectation_handler.should_method} #{negative_operator} expected`.  " +
+              raise "RSpec does not support `#{::RSpec::Matchers.last_expectation_handler.should_method} #{negative_operator} expected`.  " \
                 "Use `#{opposite_should} #{operator} expected` instead."
             end
           end
@@ -98,7 +98,7 @@ module RSpec
         def __delegate_operator(actual, operator, expected)
           if actual.__send__(operator, expected)
             true
-          elsif ['==','===', '=~'].include?(operator)
+          elsif ['==', '===', '=~'].include?(operator)
             fail_with_message("expected: #{expected.inspect}\n     got: #{actual.inspect} (using #{operator})")
           else
             fail_with_message("expected: #{operator} #{expected.inspect}\n     got: #{operator.gsub(/./, ' ')} #{actual.inspect}")
@@ -111,7 +111,7 @@ module RSpec
       class NegativeOperatorMatcher < OperatorMatcher
         def __delegate_operator(actual, operator, expected)
           return false unless actual.__send__(operator, expected)
-          return fail_with_message("expected not: #{operator} #{expected.inspect}\n         got: #{operator.gsub(/./, ' ')} #{actual.inspect}")
+          fail_with_message("expected not: #{operator} #{expected.inspect}\n         got: #{operator.gsub(/./, ' ')} #{actual.inspect}")
         end
       end
     end

data/lib/rspec/matchers/built_in/output.rb

@@ -101,7 +101,7 @@ module RSpec
           "some stream"
         end
 
-        def self.capture(block)
+        def self.capture(_block)
           raise "You must chain `to_stdout` or `to_stderr` off of the `output(...)` matcher."
         end
       end

data/lib/rspec/matchers/built_in/raise_error.rb

@@ -26,8 +26,9 @@ module RSpec
           self
         end
 
+        # rubocop:disable MethodLength
         # @private
-        def matches?(given_proc, negative_expectation = false, &block)
+        def matches?(given_proc, negative_expectation=false, &block)
           @given_proc = given_proc
           @block ||= block
           @raised_expected_error = false
@@ -52,6 +53,7 @@ module RSpec
 
           expectation_matched?
         end
+        # rubocop:enable MethodLength
 
         # @private
         def does_not_match?(given_proc)
@@ -112,17 +114,18 @@ module RSpec
         end
 
         def prevent_invalid_expectations
-          if (expecting_specific_exception? || @expected_message)
-            what_to_raise = if expecting_specific_exception? && @expected_message
-                                  "`expect { }.not_to raise_error(SpecificErrorClass, message)`"
-                                elsif expecting_specific_exception?
-                                  "`expect { }.not_to raise_error(SpecificErrorClass)`"
-                                elsif @expected_message
-                                  "`expect { }.not_to raise_error(message)`"
-                                end
-            specific_class_error = ArgumentError.new("#{what_to_raise} is not valid, use `expect { }.not_to raise_error` (with no args) instead")
-            raise specific_class_error
-          end
+          what_to_raise = if expecting_specific_exception? && @expected_message
+                            "`expect { }.not_to raise_error(SpecificErrorClass, message)`"
+                          elsif expecting_specific_exception?
+                            "`expect { }.not_to raise_error(SpecificErrorClass)`"
+                          elsif @expected_message
+                            "`expect { }.not_to raise_error(message)`"
+                          end
+
+          return unless what_to_raise
+
+          specific_class_error = ArgumentError.new("#{what_to_raise} is not valid, use `expect { }.not_to raise_error` (with no args) instead")
+          raise specific_class_error
         end
 
         def expected_error

data/lib/rspec/matchers/built_in/respond_to.rb

@@ -1,3 +1,5 @@
+RSpec::Support.require_rspec_support "method_signature_verifier"
+
 module RSpec
   module Matchers
     module BuiltIn
@@ -45,7 +47,7 @@ module RSpec
         # @api private
         # @return [String]
         def failure_message
-          "expected #{@actual.inspect} to respond to #{@failing_method_names.collect {|name| name.inspect }.join(', ')}#{with_arity}"
+          "expected #{@actual.inspect} to respond to #{@failing_method_names.map { |name| name.inspect }.join(', ')}#{with_arity}"
         end
 
         # @api private
@@ -82,8 +84,8 @@ module RSpec
         end
 
         def with_arity
-          @expected_arity.nil?? "" :
-            " with #{@expected_arity} argument#{@expected_arity == 1 ? '' : 's'}"
+          return "" unless @expected_arity
+          " with #{@expected_arity} argument#{@expected_arity == 1 ? '' : 's'}"
         end
 
         def pp_names

data/lib/rspec/matchers/built_in/start_and_end_with.rb

@@ -52,7 +52,6 @@ module RSpec
       # Provides the implementation for `start_with`.
       # Not intended to be instantiated directly.
       class StartWith < StartAndEndWith
-
       private
 
         def subset_matches?
@@ -68,7 +67,6 @@ module RSpec
       # Provides the implementation for `end_with`.
       # Not intended to be instantiated directly.
       class EndWith < StartAndEndWith
-
       private
 
         def subset_matches?

data/lib/rspec/matchers/built_in/throw_symbol.rb

@@ -7,12 +7,13 @@ module RSpec
       class ThrowSymbol
         include Composable
 
-        def initialize(expected_symbol = nil, expected_arg=nil)
+        def initialize(expected_symbol=nil, expected_arg=nil)
           @expected_symbol = expected_symbol
           @expected_arg = expected_arg
           @caught_symbol = @caught_arg = nil
         end
 
+        # rubocop:disable MethodLength
         # @private
         def matches?(given_proc)
           @block = given_proc
@@ -39,17 +40,18 @@ module RSpec
             # Ruby 1.8 uses NameError with `symbol'
             # Ruby 1.9 uses ArgumentError with :symbol
           rescue NameError, ArgumentError => e
-            unless e.message =~ /uncaught throw (`|\:)([a-zA-Z0-9_]*)(')?/
+            unless (match_data = e.message.match(/uncaught throw (`|\:)([a-zA-Z0-9_]*)(')?/))
               other_exception = e
               raise
             end
-            @caught_symbol = $2.to_sym
+            @caught_symbol = match_data.captures[1].to_sym
           rescue => other_exception
             raise
           ensure
+            # rubocop:disable EnsureReturn
             unless other_exception
               if @expected_symbol.nil?
-                return !@caught_symbol.nil?
+                return !!@caught_symbol
               else
                 if @expected_arg.nil?
                   return @caught_symbol == @expected_symbol
@@ -58,8 +60,10 @@ module RSpec
                 end
               end
             end
+            # rubocop:enable EnsureReturn
           end
         end
+        # rubocop:enable MethodLength
 
         def does_not_match?(given_proc)
           !matches?(given_proc) && Proc === given_proc
@@ -97,7 +101,7 @@ module RSpec
           "got #{caught}"
         end
 
-        def expected(symbol_desc = 'a Symbol')
+        def expected(symbol_desc='a Symbol')
           throw_description(@expected_symbol || symbol_desc, @expected_arg)
         end
 

data/lib/rspec/matchers/built_in/yield.rb

@@ -47,8 +47,8 @@ module RSpec
           when 1 then true
           when 0 then false
           else
-            raise "The #{matcher_name} matcher is not designed to be used with a " +
-                  "method that yields multiple times. Use the yield_successive_args " +
+            raise "The #{matcher_name} matcher is not designed to be used with a " \
+                  "method that yields multiple times. Use the yield_successive_args " \
                   "matcher for that case."
           end
         end
@@ -61,16 +61,16 @@ module RSpec
 
         def assert_used!
           return if @used
-          raise "You must pass the argument yielded to your expect block on " +
-                "to the method-under-test as a block. It acts as a probe that " +
-                "allows the matcher to detect whether or not the method-under-test " +
-                "yields, and, if so, how many times, and what the yielded arguments " +
+          raise "You must pass the argument yielded to your expect block on " \
+                "to the method-under-test as a block. It acts as a probe that " \
+                "allows the matcher to detect whether or not the method-under-test " \
+                "yields, and, if so, how many times, and what the yielded arguments " \
                 "are."
         end
 
         def assert_valid_expect_block!
           return if @block.arity == 1
-          raise "Your expect block must accept an argument to be used with this " +
+          raise "Your expect block must accept an argument to be used with this " \
                 "matcher. Pass the argument as a block on to the method you are testing."
         end
       end
@@ -299,7 +299,7 @@ module RSpec
           if !@probe.has_block?
             "was not a block"
           elsif all_args_match?
-            "yielded with expected arguments" +
+            "yielded with expected arguments" \
               "\nexpected not: #{surface_descriptions_in(@expected).inspect}" +
               "\n         got: #{@actual.inspect}"
           else
@@ -313,8 +313,8 @@ module RSpec
             return !@actual.empty?
           end
 
-          unless match = all_args_match?
-            @positive_args_failure = "yielded with unexpected arguments" +
+          unless (match = all_args_match?)
+            @positive_args_failure = "yielded with unexpected arguments" \
               "\nexpected: #{surface_descriptions_in(@expected).inspect}" +
               "\n     got: #{@actual.inspect}"
           end
@@ -384,20 +384,19 @@ module RSpec
         def positive_failure_reason
           return "was not a block" unless @probe.has_block?
 
-          "yielded with unexpected arguments" +
-          "\nexpected: #{surface_descriptions_in(@expected).inspect}" +
+          "yielded with unexpected arguments" \
+          "\nexpected: #{surface_descriptions_in(@expected).inspect}" \
           "\n     got: #{@actual.inspect}"
         end
 
         def negative_failure_reason
           return "was not a block" unless @probe.has_block?
 
-          "yielded with expected arguments" +
-          "\nexpected not: #{surface_descriptions_in(@expected).inspect}" +
+          "yielded with expected arguments" \
+          "\nexpected not: #{surface_descriptions_in(@expected).inspect}" \
           "\n         got: #{@actual.inspect}"
         end
       end
     end
   end
 end
-