mocha 1.14.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc815752f26d71dc07dcbe29561835e3efd005f8602ada080106a8b000491276
-  data.tar.gz: d14e6b7be4792efe68f48eb13c084a151a6e26fe3bd30f85491a990947474ab7
+  metadata.gz: c6be1c2dafee7237e2ff675159cbc86afd1b5a56493d2671eba64cc4fbb001dd
+  data.tar.gz: 2bde2824fd9b2f5a3ba6445f9f3e42e1e97053f235eb5fea647410f037a0cee2
 SHA512:
-  metadata.gz: ca77565fde00fa34b850e95072bb32d2daf2886ddaef4ec084b6c462f4d1a8d6104ae1c5ac35f49414d3ed28527589608582b49d7ff1352388642ce710039f0d
-  data.tar.gz: 0dab5223dde0fbd762b2a3ff92a7574f771ebcf9e8f5ec032697a3a3a7da96f6d892395b7decec1ad31512138d3f198850b5e1f20aada1885074491b13a57fb3
+  metadata.gz: fd3c082fca1dd5123b1c7ac6dd65ba4c9a2e92ec8791dcbc6f3d4a9a9f9c8161cf8cf4b9058c7483f5419118cdfea6cfc17cc0b206964dfc98ed8271852ea5ee
+  data.tar.gz: 074fcc5048dd385eb929c03b5757c517eaceb0f72e8536500d867b3571f072a7aa29afc8a7a78a4ab0db3c7208a5c811c0a5754d30b9ebaec213ea1337f17eea

data/.rubocop.yml

@@ -1,7 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.2 # closest to required_ruby_version of '>= 1.8.6'
+  TargetRubyVersion: 2.2 # closest to required_ruby_version of '>= 1.9'
 
 # Even the reference in the documentation suggests that you should prefer
 # `alias_method` vs `alias`, so I don't understand why that isn't the default.

data/Gemfile

@@ -3,9 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 # rubocop:disable Bundler/DuplicatedGem
-if RUBY_VERSION < '1.9.3'
-  gem 'rake', '~> 10.0'
-elsif RUBY_VERSION < '2'
+if RUBY_VERSION < '2'
   gem 'rake', '~> 12.2.1'
 elsif RUBY_VERSION < '2.2'
   gem 'rake', '~> 12.3.3'

data/README.md

@@ -338,7 +338,7 @@ $ MOCHA_GENERATE_DOCS=true GOOGLE_ANALYTICS_WEB_PROPERTY_ID=UA-625523-7 rake gen
 * Sign in to rubygems.org and find API key - https://rubygems.org/profile/edit
 
 ```bash
-$ curl -u james@floehopper.org https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials; chmod 0600 ~/.gem/credentials
+$ curl -u <email-address> -H 'OTP:<one-time-password>' https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials; chmod 0600 ~/.gem/credentials
 ```
 
 * Release gem to Rubygems:

data/RELEASE.md

@@ -1,5 +1,25 @@
 # Release Notes
 
+## 1.15.0
+
+### External changes
+
+* Fix examples using mock constructor with block (1cc17667)
+* Add another example for `API#sequence` (b7a7d233, #59)
+* Remove support for Ruby v1.8 (ddb5d672)
+* Deprecate support for Ruby versions earlier than v2.0 - thanks to @wasabigeek (#553, #555)
+
+### Internal changes
+
+* Update instructions for obtaining Rubygems API key (ed9c040a)
+* Consistent definitions for `respond_to?` methods (#533)
+* Run test tasks before release tasks (92a1bc6e, #447)
+* Fix test:performance Rake task (#538, #539)
+* Tidying following removal of support for Ruby v1.8 - thanks to @nitishr (#542)
+* Remove `ParametersMatcher` from `Invocation#call_description` - thanks to @wasabigeek (#543)
+* Remove unnecessary splatting in Invocation - thanks to @wasabigeek (#549)
+* Extract `handle_method_call` from `method_missing` - thanks to @wasabigeek (#550)
+
 ## 1.14.0
 
 ### External changes

data/Rakefile

@@ -1,5 +1,7 @@
 require 'bundler'
-Bundler::GemHelper.install_tasks
+namespace 'rubygems' do
+  Bundler::GemHelper.install_tasks
+end
 require 'bundler/setup'
 
 require 'rake/testtask'
@@ -18,15 +20,10 @@ task 'test' do
 end
 
 namespace 'test' do # rubocop:disable Metrics/BlockLength
-  unit_tests = FileList['test/unit/**/*_test.rb']
-  all_acceptance_tests = FileList['test/acceptance/*_test.rb']
-  ruby186_incompatible_acceptance_tests = FileList['test/acceptance/stub_class_method_defined_on_*_test.rb'] + FileList['test/acceptance/stub_instance_method_defined_on_*_test.rb']
-  ruby186_compatible_acceptance_tests = all_acceptance_tests - ruby186_incompatible_acceptance_tests
-
   desc 'Run unit tests'
   Rake::TestTask.new('units') do |t|
     t.libs << 'test'
-    t.test_files = unit_tests
+    t.test_files = FileList['test/unit/**/*_test.rb']
     t.verbose = true
     t.warning = true
   end
@@ -34,11 +31,7 @@ namespace 'test' do # rubocop:disable Metrics/BlockLength
   desc 'Run acceptance tests'
   Rake::TestTask.new('acceptance') do |t|
     t.libs << 'test'
-    t.test_files = if defined?(RUBY_VERSION) && (RUBY_VERSION >= '1.8.7')
-                     all_acceptance_tests
-                   else
-                     ruby186_compatible_acceptance_tests
-                   end
+    t.test_files = FileList['test/acceptance/*_test.rb']
     t.verbose = true
     t.warning = true
   end
@@ -100,6 +93,7 @@ def benchmark_test_case(klass, iterations)
   if defined?(MiniTest)
     minitest_version = Gem::Version.new(Mocha::Detection::MiniTest.version)
     if Gem::Requirement.new('>= 5.0.0').satisfied_by?(minitest_version)
+      Minitest.seed = 1
       result = Benchmark.realtime { iterations.times { |_i| klass.run(MiniTest::CompositeReporter.new) } }
       MiniTest::Runnable.runnables.delete(klass)
       result
@@ -154,4 +148,4 @@ if ENV['MOCHA_GENERATE_DOCS']
   task 'generate_docs' => %w[clobber_yardoc yardoc checkout_docs_cname checkout_docs_js]
 end
 
-task 'release' => 'default'
+task 'release' => ['default', 'rubygems:release']

data/gemfiles/Gemfile.test-unit.latest

@@ -4,9 +4,5 @@ gemspec :path=>"../"
 
 group :development do
   gem "rake"
-  if RUBY_VERSION < '1.9'
-    gem "test-unit", "~> 2"
-  else
-    gem "test-unit"
-  end
+  gem "test-unit"
 end

data/lib/mocha/any_instance_method.rb

@@ -1,4 +1,3 @@
-require 'mocha/ruby_version'
 require 'mocha/stubbed_method'
 
 module Mocha
@@ -9,10 +8,6 @@ module Mocha
       stubbee.any_instance
     end
 
-    def method_body(method)
-      method
-    end
-
     def stubbee_method(method_name)
       stubbee.instance_method(method_name)
     end

data/lib/mocha/api.rb

@@ -1,3 +1,4 @@
+require 'mocha/ruby_version'
 require 'mocha/parameter_matchers'
 require 'mocha/hooks'
 require 'mocha/mockery'
@@ -199,11 +200,22 @@ module Mocha
     # @example Ensure methods on egg are invoked in correct order.
     #   breakfast = sequence('breakfast')
     #
-    #   egg = mock('egg') do
-    #     expects(:crack).in_sequence(breakfast)
-    #     expects(:fry).in_sequence(breakfast)
-    #     expects(:eat).in_sequence(breakfast)
-    #   end
+    #   egg = mock('egg')
+    #   egg.expects(:crack).in_sequence(breakfast)
+    #   egg.expects(:fry).in_sequence(breakfast)
+    #   egg.expects(:eat).in_sequence(breakfast)
+    #
+    # @example Ensure methods across multiple objects are invoked in correct order.
+    #   sequence = sequence(:task_order)
+    #
+    #   task_one = mock("task_one")
+    #   task_two = mock("task_two")
+    #
+    #   task_one.expects(:execute).in_sequence(sequence)
+    #   task_two.expects(:execute).in_sequence(sequence)
+    #
+    #   task_one.execute
+    #   task_two.execute
     def sequence(name)
       Sequence.new(name)
     end
@@ -226,14 +238,13 @@ module Mocha
     # @example Constrain expected invocations to occur in particular states.
     #   power = states('power').starts_as('off')
     #
-    #   radio = mock('radio') do
-    #     expects(:switch_on).then(power.is('on'))
-    #     expects(:select_channel).with('BBC Radio 4').when(power.is('on'))
-    #     expects(:adjust_volume).with(+5).when(power.is('on'))
-    #     expects(:select_channel).with('BBC World Service').when(power.is('on'))
-    #     expects(:adjust_volume).with(-5).when(power.is('on'))
-    #     expects(:switch_off).then(power.is('off'))
-    #   end
+    #   radio = mock('radio')
+    #   radio.expects(:switch_on).then(power.is('on'))
+    #   radio.expects(:select_channel).with('BBC Radio 4').when(power.is('on'))
+    #   radio.expects(:adjust_volume).with(+5).when(power.is('on'))
+    #   radio.expects(:select_channel).with('BBC World Service').when(power.is('on'))
+    #   radio.expects(:adjust_volume).with(-5).when(power.is('on'))
+    #   radio.expects(:switch_off).then(power.is('off'))
     def states(name)
       Mockery.instance.new_state_machine(name)
     end

data/lib/mocha/class_methods.rb

@@ -26,8 +26,8 @@ module Mocha
         @stubba_object
       end
 
-      def respond_to?(method)
-        @stubba_object.allocate.respond_to?(method.to_sym)
+      def respond_to?(symbol, include_all = false)
+        @stubba_object.allocate.respond_to?(symbol.to_sym, include_all)
       end
 
       attr_reader :stubba_object

data/lib/mocha/instance_method.rb

@@ -8,10 +8,6 @@ module Mocha
       stubbee
     end
 
-    def method_body(method)
-      PRE_RUBY_V19 ? proc { |*args, &block| method.call(*args, &block) } : method
-    end
-
     def stubbee_method(method_name)
       stubbee._method(method_name)
     end

data/lib/mocha/integration/test_unit.rb

@@ -3,7 +3,6 @@ require 'mocha/debug'
 require 'mocha/detection/test_unit'
 
 require 'mocha/integration/test_unit/nothing'
-require 'mocha/integration/test_unit/ruby_version_185_and_below'
 require 'mocha/integration/test_unit/ruby_version_186_and_above'
 require 'mocha/integration/test_unit/gem_version_200'
 require 'mocha/integration/test_unit/gem_version_201_to_202'
@@ -31,7 +30,6 @@ module Mocha
           TestUnit::GemVersion201To202,
           TestUnit::GemVersion200,
           TestUnit::RubyVersion186AndAbove,
-          TestUnit::RubyVersion185AndBelow,
           TestUnit::Nothing
         ].detect { |m| m.applicable_to?(test_unit_version, ruby_version) }
 

data/lib/mocha/invocation.rb

@@ -10,7 +10,7 @@ module Mocha
   class Invocation
     attr_reader :method_name, :block
 
-    def initialize(mock, method_name, *arguments, &block)
+    def initialize(mock, method_name, arguments = [], block = nil)
       @mock = mock
       @method_name = method_name
       @arguments = arguments
@@ -55,7 +55,7 @@ module Mocha
     end
 
     def call_description
-      description = "#{@mock.mocha_inspect}.#{@method_name}#{ParametersMatcher.new(@arguments).mocha_inspect}"
+      description = "#{@mock.mocha_inspect}.#{@method_name}#{argument_description}"
       description << ' { ... }' unless @block.nil?
       description
     end
@@ -73,5 +73,14 @@ module Mocha
     def full_description
       "\n  - #{call_description} #{result_description}"
     end
+
+    private
+
+    def argument_description
+      signature = arguments.mocha_inspect
+      signature = signature.gsub(/^\[|\]$/, '')
+      signature = signature.gsub(/^\{|\}$/, '') if arguments.length == 1
+      "(#{signature})"
+    end
   end
 end

data/lib/mocha/minitest.rb

@@ -1,3 +1,4 @@
+require 'mocha/ruby_version'
 require 'mocha/integration/mini_test'
 require 'mocha/deprecation'
 

data/lib/mocha/mock.rb

@@ -1,4 +1,3 @@
-require 'mocha/singleton_class'
 require 'mocha/expectation'
 require 'mocha/expectation_list'
 require 'mocha/invocation'
@@ -8,7 +7,6 @@ require 'mocha/method_matcher'
 require 'mocha/parameters_matcher'
 require 'mocha/argument_iterator'
 require 'mocha/expectation_error_factory'
-require 'mocha/ruby_version'
 
 module Mocha
   # Traditional mock object.
@@ -165,7 +163,7 @@ module Mocha
     # @param [Array<Symbol>] method_names names of methods to unstub.
     #
     # @example Invoking an unstubbed method causes error to be raised
-    #   object = mock('mock') do
+    #   object = mock('mock')
     #   object.stubs(:stubbed_method).returns(:result_one)
     #   object.stubbed_method # => :result_one
     #   object.unstub(:stubbed_method)
@@ -311,9 +309,14 @@ module Mocha
 
     # @private
     def method_missing(symbol, *arguments, &block) # rubocop:disable Style/MethodMissingSuper
+      handle_method_call(symbol, arguments, block)
+    end
+
+    # @private
+    def handle_method_call(symbol, arguments, block)
       check_expiry
       check_responder_responds_to(symbol)
-      invocation = Invocation.new(self, symbol, *arguments, &block)
+      invocation = Invocation.new(self, symbol, arguments, block)
       if (matching_expectation_allowing_invocation = all_expectations.match_allowing_invocation(invocation))
         matching_expectation_allowing_invocation.invoke(invocation)
       elsif (matching_expectation = all_expectations.match(invocation)) || (!matching_expectation && !@everything_stubbed)
@@ -322,25 +325,14 @@ module Mocha
     end
 
     # @private
-    def respond_to_missing?(symbol, include_private = false)
+    def respond_to_missing?(symbol, include_all)
       if @responder
-        if @responder.method(:respond_to?).arity > 1
-          @responder.respond_to?(symbol, include_private)
-        else
-          @responder.respond_to?(symbol)
-        end
+        @responder.respond_to?(symbol, include_all)
       else
         @everything_stubbed || all_expectations.matches_method?(symbol)
       end
     end
 
-    if PRE_RUBY_V19
-      # @private
-      def respond_to?(symbol, include_private = false)
-        respond_to_missing?(symbol, include_private)
-      end
-    end
-
     # @private
     def __verified__?(assertion_counter = nil)
       @expectations.verified?(assertion_counter)

data/lib/mocha/mockery.rb

@@ -1,4 +1,3 @@
-require 'mocha/ruby_version'
 require 'mocha/central'
 require 'mocha/mock'
 require 'mocha/names'
@@ -119,10 +118,9 @@ module Mocha
     end
 
     def on_stubbing(object, method)
-      method = PRE_RUBY_V19 ? method.to_s : method.to_sym
       signature_proc = lambda { "#{object.mocha_inspect}.#{method}" }
       check(:stubbing_non_existent_method, 'non-existent method', signature_proc) do
-        !(object.stubba_class.__method_exists__?(method, true) || object.respond_to?(method.to_sym))
+        !(object.stubba_class.__method_exists__?(method, true) || object.respond_to?(method))
       end
       check(:stubbing_non_public_method, 'non-public method', signature_proc) do
         object.stubba_class.__method_exists__?(method, false)

data/lib/mocha/ruby_version.rb

@@ -1,4 +1,11 @@
+require 'mocha/deprecation'
+
 module Mocha
-  PRE_RUBY_V19 = Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('1.9')
   RUBY_V2_PLUS = Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2')
+
+  unless RUBY_V2_PLUS
+    Mocha::Deprecation.warning(
+      'Versions of Ruby earlier than v2.0 will not be supported in future versions of Mocha.'
+    )
+  end
 end

data/lib/mocha/stubbed_method.rb

@@ -1,5 +1,4 @@
 require 'mocha/ruby_version'
-require 'mocha/singleton_class'
 
 module Mocha
   class StubbedMethod
@@ -11,7 +10,7 @@ module Mocha
       @stubbee = stubbee
       @original_method = nil
       @original_visibility = nil
-      @method_name = PRE_RUBY_V19 ? method_name.to_s : method_name.to_sym
+      @method_name = method_name.to_sym
     end
 
     def stub
@@ -58,7 +57,7 @@ module Mocha
       self_in_scope = self
       method_name_in_scope = method_name
       stub_method_owner.send(:define_method, method_name) do |*args, &block|
-        self_in_scope.mock.method_missing(method_name_in_scope, *args, &block)
+        self_in_scope.mock.handle_method_call(method_name_in_scope, args, block)
       end
       retain_original_visibility(stub_method_owner)
     end
@@ -74,7 +73,7 @@ module Mocha
     def restore_original_method
       return if use_prepended_module_for_stub_method?
       if stub_method_overwrites_original_method?
-        original_method_owner.send(:define_method, method_name, method_body(@original_method))
+        original_method_owner.send(:define_method, method_name, @original_method)
       end
       retain_original_visibility(original_method_owner)
     end

data/lib/mocha/test_unit.rb

@@ -1,3 +1,4 @@
+require 'mocha/ruby_version'
 require 'mocha/integration/test_unit'
 require 'mocha/deprecation'
 

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = '1.14.0'.freeze
+  VERSION = '1.15.0'.freeze
 end

data/lib/mocha.rb

@@ -1,9 +1 @@
 require 'mocha/version'
-require 'mocha/ruby_version'
-require 'mocha/deprecation'
-
-if Mocha::PRE_RUBY_V19
-  Mocha::Deprecation.warning(
-    'Versions of Ruby earlier than v1.9 will not be supported in future versions of Mocha.'
-  )
-end

data/mocha.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name = 'mocha'
   s.version = Mocha::VERSION
   s.licenses = ['MIT', 'BSD-2-Clause']
-  s.required_ruby_version = '>= 1.8.7'
+  s.required_ruby_version = '>= 1.9'
 
   s.authors = ['James Mead']
   s.description = 'Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors:
 - James Mead
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 1980-01-01 00:00:00.000000000 Z
+date: 2022-09-21 00:00:00.000000000 Z
 dependencies: []
 description: Mocking and stubbing library with JMock/SchMock syntax, which allows
   mocking and stubbing of methods on real (non-mock) classes.
@@ -80,7 +80,6 @@ files:
 - lib/mocha/integration/test_unit/gem_version_203_to_220.rb
 - lib/mocha/integration/test_unit/gem_version_230_to_250.rb
 - lib/mocha/integration/test_unit/nothing.rb
-- lib/mocha/integration/test_unit/ruby_version_185_and_below.rb
 - lib/mocha/integration/test_unit/ruby_version_186_and_above.rb
 - lib/mocha/invocation.rb
 - lib/mocha/is_a.rb
@@ -124,7 +123,6 @@ files:
 - lib/mocha/sequence.rb
 - lib/mocha/setup.rb
 - lib/mocha/single_return_value.rb
-- lib/mocha/singleton_class.rb
 - lib/mocha/state_machine.rb
 - lib/mocha/stubbed_method.rb
 - lib/mocha/stubbing_error.rb
@@ -141,7 +139,7 @@ licenses:
 - MIT
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -149,15 +147,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Mocking and stubbing library
 test_files: []

data/lib/mocha/integration/test_unit/ruby_version_185_and_below.rb

@@ -1,61 +0,0 @@
-require 'mocha/integration/assertion_counter'
-require 'mocha/integration/monkey_patcher'
-require 'mocha/expectation_error'
-
-module Mocha
-  module Integration
-    module TestUnit
-      module RubyVersion185AndBelow
-        def self.applicable_to?(test_unit_version, ruby_version)
-          Gem::Requirement.new('<= 1.2.3').satisfied_by?(test_unit_version) && Gem::Requirement.new('<= 1.8.5').satisfied_by?(ruby_version)
-        end
-
-        def self.description
-          'monkey patch for standard library in Ruby <= v1.8.5'
-        end
-
-        def self.included(mod)
-          MonkeyPatcher.apply(mod, RunMethodPatch)
-        end
-
-        module RunMethodPatch
-          # rubocop:disable all
-          def run(result)
-            assertion_counter = AssertionCounter.new(self)
-            yield(Test::Unit::TestCase::STARTED, name)
-            @_result = result
-            begin
-              begin
-                mocha_setup
-                setup
-                __send__(@method_name)
-                mocha_verify(assertion_counter)
-              rescue Mocha::ExpectationError => e
-                add_failure(e.message, e.backtrace)
-              rescue Test::Unit::AssertionFailedError => e
-                add_failure(e.message, e.backtrace)
-              rescue StandardError, ScriptError
-                add_error($!)
-              ensure
-                begin
-                  teardown
-                rescue Mocha::ExpectationError => e
-                  add_failure(e.message, e.backtrace)
-                rescue Test::Unit::AssertionFailedError => e
-                  add_failure(e.message, e.backtrace)
-                rescue StandardError, ScriptError
-                  add_error($!)
-                end
-              end
-            ensure
-              mocha_teardown
-            end
-            result.add_run
-            yield(Test::Unit::TestCase::FINISHED, name)
-          end
-          # rubocop:enable all
-        end
-      end
-    end
-  end
-end

data/lib/mocha/singleton_class.rb

@@ -1,9 +0,0 @@
-if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('1.9.2')
-  unless Kernel.method_defined?(:singleton_class)
-    module Kernel
-      def singleton_class
-        class << self; self; end
-      end
-    end
-  end
-end