mocha 2.8.0 → 3.0.0.pre.rc.2

data/lib/mocha/return_values.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/single_return_value'
 
 module Mocha

data/lib/mocha/ruby_version.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Mocha
   RUBY_V27_PLUS = Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.7')
+  RUBY_V30_PLUS = Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('3.0')
   RUBY_V34_PLUS = Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('3.4')
 end

data/lib/mocha/sequence.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   # Used to constrain the order in which expectations can occur.
   #

data/lib/mocha/single_return_value.rb

@@ -1,4 +1,4 @@
-require 'mocha/is_a'
+# frozen_string_literal: true
 
 module Mocha
   class SingleReturnValue

data/lib/mocha/state_machine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   # A state machine that is used to constrain the order of invocations.
   # An invocation can be constrained to occur when a state {#is}, or {#is_not}, active.
@@ -81,7 +83,7 @@ module Mocha
     #
     # @param [String] unexpected_state_name name of unexpected state.
     # @return [StatePredicate] state predicate which, when queried, will indicate whether the {StateMachine} is *not* in the state specified by +unexpected_state_name+.
-    def is_not(unexpected_state_name) # rubocop:disable Naming/PredicateName
+    def is_not(unexpected_state_name) # rubocop:disable Naming/PredicatePrefix
       StatePredicate.new(self, unexpected_state_name, 'is not') { |current, given| current != given }
     end
 

data/lib/mocha/stubbed_method.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ruby2_keywords'
 require 'mocha/ruby_version'
 
@@ -5,10 +7,10 @@ module Mocha
   class StubbedMethod
     PrependedModule = Class.new(Module)
 
-    attr_reader :stubbee, :method_name
+    attr_reader :stubba_object, :method_name
 
-    def initialize(stubbee, method_name)
-      @stubbee = stubbee
+    def initialize(stubba_object, method_name)
+      @stubba_object = stubba_object
       @original_method = nil
       @original_visibility = nil
       @method_name = method_name.to_sym
@@ -23,19 +25,21 @@ module Mocha
       remove_new_method
       mock.unstub(method_name.to_sym)
       return if mock.any_expectations?
+
       reset_mocha
     end
 
     def mock
-      mock_owner.mocha
+      stubbee.mocha
     end
 
     def reset_mocha
-      mock_owner.reset_mocha
+      stubbee.reset_mocha
     end
 
     def hide_original_method
       return unless original_method_owner.__method_exists__?(method_name)
+
       store_original_method_visibility
       use_prepended_module_for_stub_method
     end
@@ -55,20 +59,23 @@ module Mocha
     end
 
     def matches?(other)
-      return false unless other.class == self.class
-      (stubbee.object_id == other.stubbee.object_id) && (method_name == other.method_name)
+      return false unless other.instance_of?(self.class)
+
+      (stubba_object.object_id == other.stubba_object.object_id) && # rubocop:disable Lint/IdentityComparison
+        (method_name == other.method_name)
     end
 
     alias_method :==, :eql?
 
     def to_s
-      "#{stubbee}.#{method_name}"
+      "#{stubba_object}.#{method_name}"
     end
 
     private
 
     def retain_original_visibility(method_owner)
       return unless @original_visibility
+
       Module.instance_method(@original_visibility).bind(method_owner).call(method_name)
     end
 

data/lib/mocha/stubbing_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/error_with_filtered_backtrace'
 
 module Mocha

data/lib/mocha/test_unit.rb

@@ -1,4 +1,5 @@
-require 'mocha/ruby_version'
+# frozen_string_literal: true
+
 require 'mocha/integration/test_unit'
 
 unless Mocha::Integration::TestUnit.activate

data/lib/mocha/thrower.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   class Thrower
     def initialize(tag, object = nil)

data/lib/mocha/thrown_object.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   class ThrownObject
     def initialize(tag, value = nil)

data/lib/mocha/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
-  VERSION = '2.8.0'.freeze
+  VERSION = '3.0.0-rc.2'
 end

data/lib/mocha/yield_parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   class YieldParameters
     def initialize

data/lib/mocha.rb

@@ -1 +1,21 @@
+# frozen_string_literal: true
+
 require 'mocha/version'
+
+# Mocha's top level namespace, which also provides the ability to {.configure configure} Mocha's behavior.
+#
+# Methods in the {API} are directly available in +Test::Unit::TestCase+, +Minitest::Unit::TestCase+.
+#
+# The mock creation methods are {API#mock mock}, {API#stub stub} and {API#stub_everything stub_everything}, all of which return a {Mock}
+#
+# A {Mock} {Mock#expects expects} or {Mock#stubs stubs} a method, which sets up (returns) an {Expectation}.
+#
+# An {Expectation} can be further qualified through its {Expectation fluent interface}.
+#
+# {ParameterMatchers} for {Expectation#with} restrict the parameter values which will match the {Expectation}.
+#
+# Adapters in {Integration} provide built-in support for +Minitest+ and +Test::Unit+.
+#
+# Integration {Hooks} enable support for other test frameworks.
+module Mocha
+end

data/mocha.gemspec

@@ -2,14 +2,19 @@ lib = File.expand_path('../lib/', __FILE__)
 $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 require 'mocha/version'
 
+DESCRIPTION =
+  'A library for mocking and stubbing with a unified, simple and readable syntax ' \
+  'for both full & partial mocking. Built-in support for Minitest and Test::Unit. ' \
+  'Supported by many other test frameworks, e.g. RSpec.'.freeze
+
 Gem::Specification.new do |s|
   s.name = 'mocha'
   s.version = Mocha::VERSION
   s.licenses = ['MIT', 'BSD-2-Clause']
-  s.required_ruby_version = '>= 2.1'
+  s.required_ruby_version = '>= 2.2'
 
   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.'
+  s.description = DESCRIPTION
   s.email = 'mocha-developer@googlegroups.com'
 
   s.files = Dir.chdir(File.expand_path('..', __FILE__)) do
@@ -27,8 +32,9 @@ Gem::Specification.new do |s|
     'documentation_uri' => 'https://mocha.jamesmead.org/',
     'funding_uri' => 'https://github.com/sponsors/floehopper',
     'homepage_uri' => s.homepage,
-    'source_code_uri' => 'https://github.com/freerange/mocha'
+    'source_code_uri' => 'https://github.com/freerange/mocha',
+    'rubygems_mfa_required' => 'true'
   }
 
-  s.add_runtime_dependency 'ruby2_keywords', '>= 0.0.5'
+  s.add_dependency 'ruby2_keywords', '>= 0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 3.0.0.pre.rc.2
 platform: ruby
 authors:
 - James Mead
@@ -24,8 +24,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
-description: Mocking and stubbing library with JMock/SchMock syntax, which allows
-  mocking and stubbing of methods on real (non-mock) classes.
+description: A library for mocking and stubbing with a unified, simple and readable
+  syntax for both full & partial mocking. Built-in support for Minitest and Test::Unit.
+  Supported by many other test frameworks, e.g. RSpec.
 email: mocha-developer@googlegroups.com
 executables: []
 extensions: []
@@ -44,19 +45,22 @@ files:
 - RELEASE.md
 - Rakefile
 - gemfiles/Gemfile.minitest.latest
+- gemfiles/Gemfile.rubocop
 - gemfiles/Gemfile.test-unit.latest
 - lib/mocha.rb
 - lib/mocha/any_instance_method.rb
+- lib/mocha/any_instance_receiver.rb
 - lib/mocha/api.rb
 - lib/mocha/argument_iterator.rb
 - lib/mocha/backtrace_filter.rb
-- lib/mocha/block_matcher.rb
+- lib/mocha/block_matchers.rb
 - lib/mocha/cardinality.rb
 - lib/mocha/central.rb
 - lib/mocha/change_state_side_effect.rb
 - lib/mocha/class_methods.rb
 - lib/mocha/configuration.rb
-- lib/mocha/debug.rb
+- lib/mocha/default_name.rb
+- lib/mocha/default_receiver.rb
 - lib/mocha/deprecation.rb
 - lib/mocha/detection/minitest.rb
 - lib/mocha/detection/test_unit.rb
@@ -67,34 +71,36 @@ files:
 - lib/mocha/expectation_error_factory.rb
 - lib/mocha/expectation_list.rb
 - lib/mocha/hooks.rb
+- lib/mocha/ignoring_warning.rb
+- lib/mocha/impersonating_any_instance_name.rb
+- lib/mocha/impersonating_name.rb
 - lib/mocha/in_state_ordering_constraint.rb
 - lib/mocha/inspect.rb
 - lib/mocha/instance_method.rb
+- lib/mocha/integration.rb
 - lib/mocha/integration/assertion_counter.rb
 - lib/mocha/integration/minitest.rb
 - lib/mocha/integration/minitest/adapter.rb
-- lib/mocha/integration/minitest/exception_translation.rb
 - lib/mocha/integration/monkey_patcher.rb
 - lib/mocha/integration/test_unit.rb
 - lib/mocha/integration/test_unit/adapter.rb
 - lib/mocha/invocation.rb
-- lib/mocha/is_a.rb
 - lib/mocha/logger.rb
 - lib/mocha/macos_version.rb
 - lib/mocha/method_matcher.rb
 - lib/mocha/minitest.rb
 - lib/mocha/mock.rb
 - lib/mocha/mockery.rb
-- lib/mocha/names.rb
+- lib/mocha/name.rb
 - lib/mocha/not_initialized_error.rb
 - lib/mocha/object_methods.rb
+- lib/mocha/object_receiver.rb
 - lib/mocha/parameter_matchers.rb
 - lib/mocha/parameter_matchers/all_of.rb
 - lib/mocha/parameter_matchers/any_of.rb
 - lib/mocha/parameter_matchers/any_parameters.rb
 - lib/mocha/parameter_matchers/anything.rb
-- lib/mocha/parameter_matchers/base.rb
-- lib/mocha/parameter_matchers/deprecations.rb
+- lib/mocha/parameter_matchers/base_methods.rb
 - lib/mocha/parameter_matchers/equals.rb
 - lib/mocha/parameter_matchers/equivalent_uri.rb
 - lib/mocha/parameter_matchers/has_entries.rb
@@ -115,7 +121,6 @@ files:
 - lib/mocha/parameter_matchers/yaml_equivalent.rb
 - lib/mocha/parameters_matcher.rb
 - lib/mocha/raised_exception.rb
-- lib/mocha/receivers.rb
 - lib/mocha/return_values.rb
 - lib/mocha/ruby_version.rb
 - lib/mocha/sequence.rb
@@ -140,6 +145,7 @@ metadata:
   funding_uri: https://github.com/sponsors/floehopper
   homepage_uri: https://mocha.jamesmead.org
   source_code_uri: https://github.com/freerange/mocha
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -148,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/mocha/debug.rb

@@ -1,9 +0,0 @@
-module Mocha
-  module Debug
-    OPTIONS = (ENV['MOCHA_OPTIONS'] || '').split(',').freeze
-
-    def self.puts(message)
-      warn(message) if OPTIONS.include?('debug')
-    end
-  end
-end

data/lib/mocha/integration/minitest/exception_translation.rb

@@ -1,14 +0,0 @@
-require 'mocha/expectation_error'
-
-module Mocha
-  module Integration
-    module Minitest
-      def self.translate(exception)
-        return exception unless exception.is_a?(::Mocha::ExpectationError)
-        translated_exception = ::Minitest::Assertion.new(exception.message)
-        translated_exception.set_backtrace(exception.backtrace)
-        translated_exception
-      end
-    end
-  end
-end

data/lib/mocha/is_a.rb

@@ -1,7 +0,0 @@
-class Object
-  # :stopdoc:
-
-  alias_method :__is_a__, :is_a?
-
-  # :startdoc:
-end

data/lib/mocha/names.rb

@@ -1,43 +0,0 @@
-module Mocha
-  class ImpersonatingName
-    def initialize(object)
-      @object = object
-    end
-
-    def mocha_inspect
-      @object.mocha_inspect
-    end
-  end
-
-  class ImpersonatingAnyInstanceName
-    def initialize(klass)
-      @klass = klass
-    end
-
-    def mocha_inspect
-      "#<AnyInstance:#{@klass.mocha_inspect}>"
-    end
-  end
-
-  class Name
-    def initialize(name)
-      @name = name.to_s
-    end
-
-    def mocha_inspect
-      "#<Mock:#{@name}>"
-    end
-  end
-
-  class DefaultName
-    def initialize(mock)
-      @mock = mock
-    end
-
-    def mocha_inspect
-      address = @mock.__id__ * 2
-      address += 0x100000000 if address < 0
-      "#<Mock:0x#{format('%<address>x', address: address)}>"
-    end
-  end
-end

data/lib/mocha/parameter_matchers/deprecations.rb

@@ -1,46 +0,0 @@
-require 'mocha/deprecation'
-require 'set'
-
-module Mocha
-  module ParameterMatchers
-    module Methods
-      # @private
-      def self.included(base)
-        base.define_singleton_method(:const_missing) do |name|
-          if ParameterMatchers.access_deprecated?(name)
-            Mocha::ParameterMatchers.const_get(name).tap do |mod|
-              Deprecation.warning(
-                "Referencing #{name} outside its namespace is deprecated. Use fully-qualified #{mod} instead."
-              )
-            end
-          else
-            super(name)
-          end
-        end
-      end
-    end
-
-    # @private
-    @classes_with_access_deprecated = Set.new
-
-    # @private
-    def self.provide_deprecated_access_to(name)
-      @classes_with_access_deprecated.add(name)
-    end
-
-    # @private
-    def self.access_deprecated?(name)
-      @classes_with_access_deprecated.include?(name)
-    end
-
-    # @private
-    def self.define_deprecated_matcher_method(name)
-      define_method(name) do |*args|
-        Deprecation.warning(
-          "Calling #{ParameterMatchers}##{name} is deprecated. Use #{Methods}##{name} instead."
-        )
-        Methods.instance_method(name).bind(self).call(*args)
-      end
-    end
-  end
-end

data/lib/mocha/receivers.rb

@@ -1,45 +0,0 @@
-module Mocha
-  class ObjectReceiver
-    def initialize(object)
-      @object = object
-    end
-
-    def mocks
-      object = @object
-      mocks = []
-      while object
-        mocha = object.mocha(false)
-        mocks << mocha if mocha
-        object = object.is_a?(Class) ? object.superclass : nil
-      end
-      mocks
-    end
-  end
-
-  class AnyInstanceReceiver
-    def initialize(klass)
-      @klass = klass
-    end
-
-    def mocks
-      klass = @klass
-      mocks = []
-      while klass
-        mocha = klass.any_instance.mocha(false)
-        mocks << mocha if mocha
-        klass = klass.superclass
-      end
-      mocks
-    end
-  end
-
-  class DefaultReceiver
-    def initialize(mock)
-      @mock = mock
-    end
-
-    def mocks
-      [@mock]
-    end
-  end
-end