mocha 0.12.10 → 0.13.0

data/test/integration/mini_test_test.rb

@@ -0,0 +1,9 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+require "minitest/unit"
+require "mocha/setup"
+require "integration/shared_tests"
+
+class MiniTestTest < Test::Unit::TestCase
+  include SharedTests
+end

data/test/integration/shared_tests.rb

@@ -0,0 +1,174 @@
+require 'test_runner'
+require 'execution_point'
+
+module SharedTests
+  include TestRunner
+
+  def test_assertion_satisfied
+    test_result = run_as_test do
+      assert true
+    end
+    assert_passed(test_result)
+  end
+
+  def test_assertion_unsatisfied
+    execution_point = nil
+    test_result = run_as_test do
+      execution_point = ExecutionPoint.current; flunk
+    end
+    assert_failed(test_result)
+    failure = test_result.failures.first
+    assert_equal execution_point, ExecutionPoint.new(failure.location)
+  end
+
+  def test_mock_object_unexpected_invocation
+    execution_point = nil
+    test_result = run_as_test do
+      mock = mock("not expecting invocation")
+      execution_point = ExecutionPoint.current; mock.unexpected
+    end
+    assert_failed(test_result)
+    failure = test_result.failures.first
+    assert_equal execution_point, ExecutionPoint.new(failure.location)
+    assert_equal ["unexpected invocation: #<Mock:not expecting invocation>.unexpected()"], test_result.failure_message_lines
+  end
+
+  def test_mock_object_explicitly_unexpected_invocation
+    execution_point = nil
+    test_result = run_as_test do
+      mock = mock("not expecting invocation")
+      mock.expects(:unexpected).never
+      execution_point = ExecutionPoint.current; mock.unexpected
+    end
+    assert_failed(test_result)
+    failure = test_result.failures.first
+    assert_equal execution_point, ExecutionPoint.new(failure.location)
+    assert_equal [
+      "unexpected invocation: #<Mock:not expecting invocation>.unexpected()",
+      "unsatisfied expectations:",
+      "- expected never, invoked once: #<Mock:not expecting invocation>.unexpected(any_parameters)"
+    ], test_result.failure_message_lines
+  end
+
+  def test_mock_object_unsatisfied_expectation
+    execution_point = nil
+    test_result = run_as_test do
+      mock = mock("expecting invocation")
+      execution_point = ExecutionPoint.current; mock.expects(:expected)
+    end
+    assert_failed(test_result)
+    failure = test_result.failures.first
+    assert_equal execution_point, ExecutionPoint.new(failure.location)
+    assert_equal [
+      "not all expectations were satisfied",
+      "unsatisfied expectations:",
+      "- expected exactly once, not yet invoked: #<Mock:expecting invocation>.expected(any_parameters)"
+    ], test_result.failure_message_lines
+  end
+
+  def test_mock_object_unexpected_invocation_in_setup
+    execution_point = nil
+    test_result = run_as_tests(
+      :setup => lambda {
+        mock = mock("not expecting invocation")
+        execution_point = ExecutionPoint.current; mock.unexpected
+      },
+      :test_me => lambda {
+        assert true
+      }
+    )
+    assert_failed(test_result)
+    failure = test_result.failures.first
+    assert_equal execution_point, ExecutionPoint.new(failure.location)
+    assert_equal ["unexpected invocation: #<Mock:not expecting invocation>.unexpected()"], test_result.failure_message_lines
+  end
+
+  def test_mock_object_unsatisfied_expectation_in_setup
+    execution_point = nil
+    test_result = run_as_tests(
+      :setup => lambda {
+        mock = mock("expecting invocation")
+        execution_point = ExecutionPoint.current; mock.expects(:expected)
+      },
+      :test_me => lambda {
+        assert true
+      }
+    )
+    assert_failed(test_result)
+    failure = test_result.failures.first
+    assert_equal execution_point, ExecutionPoint.new(failure.location)
+    assert_equal [
+      "not all expectations were satisfied",
+      "unsatisfied expectations:",
+      "- expected exactly once, not yet invoked: #<Mock:expecting invocation>.expected(any_parameters)"
+    ], test_result.failure_message_lines
+  end
+
+  def test_mock_object_unexpected_invocation_in_teardown
+    execution_point = nil
+    test_result = run_as_tests(
+      :test_me => lambda {
+        assert true
+      },
+      :teardown => lambda {
+        mock = mock("not expecting invocation")
+        execution_point = ExecutionPoint.current; mock.unexpected
+      }
+    )
+    assert_failed(test_result)
+    failure = test_result.failures.first
+    assert_equal execution_point, ExecutionPoint.new(failure.location)
+    assert_equal ["unexpected invocation: #<Mock:not expecting invocation>.unexpected()"], test_result.failure_message_lines
+  end
+
+  def test_real_object_explicitly_unexpected_invocation
+    execution_point = nil
+    object = Object.new
+    test_result = run_as_test do
+      object.expects(:unexpected).never
+      execution_point = ExecutionPoint.current; object.unexpected
+    end
+    assert_failed(test_result)
+    failure = test_result.failures.first
+    assert_equal execution_point, ExecutionPoint.new(failure.location)
+    assert_equal [
+      "unexpected invocation: #{object.mocha_inspect}.unexpected()",
+      "unsatisfied expectations:",
+      "- expected never, invoked once: #{object.mocha_inspect}.unexpected(any_parameters)"
+    ], test_result.failure_message_lines
+  end
+
+  def test_real_object_unsatisfied_expectation
+    execution_point = nil
+    object = Object.new
+    test_result = run_as_test do
+      execution_point = ExecutionPoint.current; object.expects(:expected)
+    end
+    assert_failed(test_result)
+    failure = test_result.failures.first
+    assert_equal execution_point, ExecutionPoint.new(failure.location)
+    assert_equal [
+      "not all expectations were satisfied",
+      "unsatisfied expectations:",
+      "- expected exactly once, not yet invoked: #{object.mocha_inspect}.expected(any_parameters)"
+    ], test_result.failure_message_lines
+  end
+
+  def test_real_object_expectation_does_not_leak_into_subsequent_test
+    execution_point = nil
+    klass = Class.new
+    test_result = run_as_tests(
+      :test_1 => lambda {
+        klass.expects(:foo)
+        klass.foo
+      },
+      :test_2 => lambda {
+        execution_point = ExecutionPoint.current; klass.foo
+      }
+    )
+    assert_failed(test_result)
+    exception = test_result.errors.first.exception
+    assert_equal execution_point, ExecutionPoint.new(exception.backtrace)
+    assert_match %r{undefined method `foo'}, exception.message
+  end
+end

data/test/integration/test_unit_test.rb

@@ -0,0 +1,9 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+require "test/unit"
+require "mocha/setup"
+require "integration/shared_tests"
+
+class TestUnitTest < Test::Unit::TestCase
+  include SharedTests
+end

data/test/mini_test_result.rb

@@ -1,5 +1,4 @@
 require 'stringio'
-require 'test/unit/testcase'
 require 'minitest/unit'
 
 class MiniTestResult

data/test/test_runner.rb

@@ -1,7 +1,6 @@
 require 'test/unit/testcase'
 
 if defined?(MiniTest)
-  require 'mocha/integration/mini_test'
   require File.expand_path('../mini_test_result', __FILE__)
 else
   require File.expand_path('../test_unit_result', __FILE__)
@@ -9,28 +8,29 @@ end
 
 module TestRunner
   def run_as_test(&block)
-    run_as_tests(block)
+    run_as_tests(:test_me => block)
   end
 
-  def run_as_tests(*procs)
-    tests = procs.map do |proc|
-      test_class = Class.new(Test::Unit::TestCase) do
-        define_method(:test_me, proc)
+  def run_as_tests(methods = {})
+    base_class = defined?(MiniTest) ? MiniTest::Unit::TestCase : Test::Unit::TestCase
+    test_class = Class.new(base_class) do
+      methods.each do |(method_name, proc)|
+        define_method(method_name, proc)
       end
-      test_class.new(:test_me)
     end
+    tests = methods.keys.select { |m| m.to_s[/^test/] }.map { |m| test_class.new(m) }
 
-    if defined?(Test::Unit::TestResult)
-      test_result = TestUnitResult.build_test_result
-      tests.each do |test|
-        test.run(test_result) {}
-      end
-    else
+    if defined?(MiniTest)
       runner = MiniTest::Unit.new
       tests.each do |test|
         test.run(runner)
       end
       test_result = MiniTestResult.new(runner, tests)
+    else
+      test_result = TestUnitResult.build_test_result
+      tests.each do |test|
+        test.run(test_result) {}
+      end
     end
 
     test_result
@@ -42,7 +42,7 @@ module TestRunner
   end
 
   def assert_failed(test_result)
-    flunk "Test passed unexpectedly" if test_result.passed?
+    flunk "Test passed unexpectedly" unless test_result.failure_count + test_result.error_count > 0
   end
 
 end

data/test/unit/class_methods_test.rb

@@ -0,0 +1,40 @@
+require File.expand_path('../../test_helper', __FILE__)
+require 'mocha/class_methods'
+require 'mocha/object_methods'
+
+class ClassMethodsTest < Test::Unit::TestCase
+
+  def setup
+    @klass = Class.new.extend(Mocha::ClassMethods, Mocha::ObjectMethods)
+  end
+
+  def test_should_build_any_instance_object
+    any_instance = @klass.any_instance
+    assert_not_nil any_instance
+    assert any_instance.is_a?(Mocha::ClassMethods::AnyInstance)
+  end
+
+  def test_should_return_same_any_instance_object
+    any_instance_1 = @klass.any_instance
+    any_instance_2 = @klass.any_instance
+    assert_equal any_instance_1, any_instance_2
+  end
+
+  def test_should_use_stubba_class_method_for_class
+    assert_equal Mocha::ClassMethod, @klass.stubba_method
+  end
+
+  def test_should_use_stubba_class_method_for_any_instance
+    assert_equal Mocha::AnyInstanceMethod, @klass.any_instance.stubba_method
+  end
+
+  def test_should_stub_self_for_class
+    assert_equal @klass, @klass.stubba_object
+  end
+
+  def test_should_stub_relevant_class_for_any_instance
+    any_instance = @klass.any_instance
+    assert_equal @klass, any_instance.stubba_object
+  end
+
+end

data/test/unit/method_matcher_test.rb

@@ -10,6 +10,11 @@ class MethodMatcherTest < Test::Unit::TestCase
     assert method_matcher.match?(:method_name)
   end
 
+  def test_should_match_if_actual_method_name_is_expected_method_name_as_string
+    method_matcher = MethodMatcher.new(:method_name)
+    assert method_matcher.match?('method_name')
+  end
+
   def test_should_not_match_if_actual_method_name_is_not_same_as_expected_method_name
     method_matcher = MethodMatcher.new(:method_name)
     assert !method_matcher.match?(:different_method_name)

data/test/unit/mock_test.rb

@@ -214,6 +214,12 @@ class MockTest < Test::Unit::TestCase
     assert_equal true, mock.respond_to?(:method1)
   end
 
+  def test_should_respond_to_expected_method_as_string
+    mock = build_mock
+    mock.expects(:method1)
+    assert_equal true, mock.respond_to?('method1')
+  end
+
   def test_should_not_respond_to_unexpected_method
     mock = build_mock
     assert_equal false, mock.respond_to?(:method1)

data/test/unit/module_methods_test.rb

@@ -0,0 +1,19 @@
+require File.expand_path('../../test_helper', __FILE__)
+require 'mocha/module_methods'
+require 'mocha/object_methods'
+
+class ModuleMethodsTest < Test::Unit::TestCase
+
+  def setup
+    @module = Module.new.extend(Mocha::ModuleMethods, Mocha::ObjectMethods)
+  end
+
+  def test_should_use_stubba_module_method_for_module
+    assert_equal Mocha::ModuleMethod, @module.stubba_method
+  end
+
+  def test_should_stub_self_for_module
+    assert_equal @module, @module.stubba_object
+  end
+
+end

data/test/unit/object_methods_test.rb

@@ -0,0 +1,45 @@
+require File.expand_path('../../test_helper', __FILE__)
+require 'mocha/object_methods'
+require 'mocha/mock'
+
+class ObjectMethodsTest < Test::Unit::TestCase
+
+  def setup
+    @object = Object.new.extend(Mocha::ObjectMethods)
+  end
+
+  def test_should_build_mocha_referring_to_self
+    mocha = @object.mocha
+    assert_not_nil mocha
+    assert mocha.is_a?(Mocha::Mock)
+    assert_equal @object.mocha_inspect, mocha.mocha_inspect
+  end
+
+  def test_should_reuse_existing_mocha
+    mocha_1 = @object.mocha
+    mocha_2 = @object.mocha
+    assert_equal mocha_1, mocha_2
+  end
+
+  def test_should_reset_mocha
+    assert_nil @object.reset_mocha
+  end
+
+  def test_should_use_stubba_instance_method_for_object
+    assert_equal Mocha::InstanceMethod, Object.new.stubba_method
+  end
+
+  def test_should_stub_self_for_object
+    assert_equal @object, @object.stubba_object
+  end
+
+  def test_nobody_expects_the_spanish_inquisition
+    assert_raise(Mocha::ExpectationError) { @object.expects(:the_spanish_inquisition) }
+  end
+
+  def test_should_alias_object_method
+    klass = Class.new { def self.method_x; end }
+    assert_equal klass._method(:method_x), klass.method(:method_x)
+  end
+
+end

metadata

@@ -1,116 +1,87 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
+  version: 0.13.0
   prerelease: 
-  version: 0.12.10
 platform: ruby
 authors:
 - James Mead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metaclass
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70267336106140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.1
   prerelease: false
+  version_requirements: *70267336106140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70267336104820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   prerelease: false
+  version_requirements: *70267336104820
 - !ruby/object:Gem::Dependency
   name: introspection
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70267336104360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.1
   prerelease: false
+  version_requirements: *70267336104360
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70267336103960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   prerelease: false
+  version_requirements: *70267336103960
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  name: redcarpet
+  requirement: &70267336103420 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   prerelease: false
+  version_requirements: *70267336103420
 description: Mocking and stubbing library with JMock/SchMock syntax, which allows
   mocking and stubbing of methods on real (non-mock) classes.
 email: mocha-developer@googlegroups.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.rdoc
-- COPYING.rdoc
+extra_rdoc_files: []
 files:
 - .gemtest
-- COPYING.rdoc
+- .yardopts
+- COPYING.md
 - Gemfile
-- MIT-LICENSE.rdoc
-- README.rdoc
-- RELEASE.rdoc
+- MIT-LICENSE.md
+- README.md
+- RELEASE.md
 - Rakefile
 - build-matrix.rb
-- examples/misc.rb
-- examples/mocha.rb
-- examples/stubba.rb
 - gemfiles/Gemfile.minitest.1.3.0
 - gemfiles/Gemfile.minitest.1.4.0
 - gemfiles/Gemfile.minitest.1.4.1
@@ -120,8 +91,6 @@ files:
 - gemfiles/Gemfile.minitest.2.11.0
 - gemfiles/Gemfile.minitest.2.11.2
 - gemfiles/Gemfile.minitest.2.3.0
-- gemfiles/Gemfile.minitest.3.3.0
-- gemfiles/Gemfile.minitest.4.2.0
 - gemfiles/Gemfile.minitest.latest
 - gemfiles/Gemfile.test-unit.2.0.0
 - gemfiles/Gemfile.test-unit.2.0.1
@@ -137,20 +106,25 @@ files:
 - lib/mocha/central.rb
 - lib/mocha/change_state_side_effect.rb
 - lib/mocha/class_method.rb
+- lib/mocha/class_methods.rb
 - lib/mocha/configuration.rb
+- lib/mocha/debug.rb
 - lib/mocha/deprecation.rb
 - lib/mocha/exception_raiser.rb
 - lib/mocha/expectation.rb
 - lib/mocha/expectation_error.rb
 - lib/mocha/expectation_error_factory.rb
 - lib/mocha/expectation_list.rb
+- lib/mocha/hooks.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/mini_test.rb
-- lib/mocha/integration/mini_test/assertion_counter.rb
+- lib/mocha/integration/mini_test/adapter.rb
 - lib/mocha/integration/mini_test/exception_translation.rb
+- lib/mocha/integration/mini_test/nothing.rb
 - lib/mocha/integration/mini_test/version_13.rb
 - lib/mocha/integration/mini_test/version_140.rb
 - lib/mocha/integration/mini_test/version_141.rb
@@ -160,16 +134,14 @@ files:
 - lib/mocha/integration/mini_test/version_2110_to_2111.rb
 - lib/mocha/integration/mini_test/version_2112_to_320.rb
 - lib/mocha/integration/mini_test/version_230_to_2101.rb
-- lib/mocha/integration/mini_test/version_330_to_410.rb
-- lib/mocha/integration/mini_test/version_420_to_433.rb
-- lib/mocha/integration/mini_test/version_440.rb
-- lib/mocha/integration/mini_test/version_450_to_461.rb
+- lib/mocha/integration/monkey_patcher.rb
 - lib/mocha/integration/test_unit.rb
-- lib/mocha/integration/test_unit/assertion_counter.rb
+- lib/mocha/integration/test_unit/adapter.rb
 - lib/mocha/integration/test_unit/gem_version_200.rb
 - lib/mocha/integration/test_unit/gem_version_201_to_202.rb
 - lib/mocha/integration/test_unit/gem_version_203_to_220.rb
-- lib/mocha/integration/test_unit/gem_version_230_to_254.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/is_a.rb
@@ -178,11 +150,11 @@ files:
 - lib/mocha/mock.rb
 - lib/mocha/mockery.rb
 - lib/mocha/module_method.rb
+- lib/mocha/module_methods.rb
 - lib/mocha/multiple_yields.rb
 - lib/mocha/names.rb
 - lib/mocha/no_yields.rb
-- lib/mocha/object.rb
-- lib/mocha/options.rb
+- lib/mocha/object_methods.rb
 - lib/mocha/parameter_matchers.rb
 - lib/mocha/parameter_matchers/all_of.rb
 - lib/mocha/parameter_matchers/any_of.rb
@@ -209,6 +181,7 @@ files:
 - lib/mocha/pretty_parameters.rb
 - lib/mocha/return_values.rb
 - lib/mocha/sequence.rb
+- lib/mocha/setup.rb
 - lib/mocha/single_return_value.rb
 - lib/mocha/single_yield.rb
 - lib/mocha/standalone.rb
@@ -221,7 +194,6 @@ files:
 - lib/mocha_standalone.rb
 - mocha.gemspec
 - test/acceptance/acceptance_test_helper.rb
-- test/acceptance/api_test.rb
 - test/acceptance/bug_18914_test.rb
 - test/acceptance/bug_21465_test.rb
 - test/acceptance/bug_21563_test.rb
@@ -231,7 +203,6 @@ files:
 - test/acceptance/failure_messages_test.rb
 - test/acceptance/issue_65_test.rb
 - test/acceptance/issue_70_test.rb
-- test/acceptance/minitest_test.rb
 - test/acceptance/mocha_example_test.rb
 - test/acceptance/mocha_test_result_test.rb
 - test/acceptance/mock_test.rb
@@ -280,6 +251,9 @@ files:
 - test/acceptance/unstubbing_test.rb
 - test/deprecation_disabler.rb
 - test/execution_point.rb
+- test/integration/mini_test_test.rb
+- test/integration/shared_tests.rb
+- test/integration/test_unit_test.rb
 - test/method_definer.rb
 - test/mini_test_result.rb
 - test/simple_counter.rb
@@ -293,6 +267,7 @@ files:
 - test/unit/central_test.rb
 - test/unit/change_state_side_effect_test.rb
 - test/unit/class_method_test.rb
+- test/unit/class_methods_test.rb
 - test/unit/configuration_test.rb
 - test/unit/date_time_inspect_test.rb
 - test/unit/exception_raiser_test.rb
@@ -303,10 +278,11 @@ files:
 - test/unit/method_matcher_test.rb
 - test/unit/mock_test.rb
 - test/unit/mockery_test.rb
+- test/unit/module_methods_test.rb
 - test/unit/multiple_yields_test.rb
 - test/unit/no_yields_test.rb
 - test/unit/object_inspect_test.rb
-- test/unit/object_test.rb
+- test/unit/object_methods_test.rb
 - test/unit/parameter_matchers/all_of_test.rb
 - test/unit/parameter_matchers/any_of_test.rb
 - test/unit/parameter_matchers/anything_test.rb
@@ -336,12 +312,7 @@ files:
 homepage: http://gofreerange.com/mocha/docs
 licenses: []
 post_install_message: 
-rdoc_options:
-- --title
-- Mocha
-- --main
-- README.rdoc
-- --line-numbers
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -349,10 +320,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      hash: -4008824448557729351
-      version: '0'
+      hash: -4192078905680069090
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -361,9 +332,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mocha
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Mocking and stubbing library
 test_files: []
-has_rdoc: 
+has_rdoc: yard