mocha 0.12.7 → 0.13.0

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 0.12.7
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metaclass
-  requirement: &70269211293480 !ruby/object:Gem::Requirement
+  requirement: &70267336106140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70269211293480
+  version_requirements: *70267336106140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70269211292160 !ruby/object:Gem::Requirement
+  requirement: &70267336104820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269211292160
+  version_requirements: *70267336104820
 - !ruby/object:Gem::Dependency
   name: introspection
-  requirement: &70269211291700 !ruby/object:Gem::Requirement
+  requirement: &70267336104360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70269211291700
+  version_requirements: *70267336104360
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70269211291320 !ruby/object:Gem::Requirement
+  requirement: &70267336103960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,38 +54,34 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269211291320
+  version_requirements: *70267336103960
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70269211290860 !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
   prerelease: false
-  version_requirements: *70269211290860
+  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
@@ -110,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
@@ -133,13 +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/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_252.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
@@ -148,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
@@ -179,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
@@ -191,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
@@ -201,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
@@ -250,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
@@ -263,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
@@ -273,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
@@ -306,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
@@ -322,7 +323,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3599471528182065481
+      hash: -4192078905680069090
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -336,4 +337,4 @@ signing_key:
 specification_version: 3
 summary: Mocking and stubbing library
 test_files: []
-has_rdoc: 
+has_rdoc: yard

data/COPYING.rdoc

@@ -1,3 +0,0 @@
-Copyright Revieworld Ltd. 2006
-
-You may use, copy and redistribute this library under the same terms as {Ruby itself}[http://www.ruby-lang.org/en/LICENSE.txt] or under the {file:MIT-LICENSE.rdoc MIT license}.

data/README.rdoc

@@ -1,56 +0,0 @@
-= Mocha {<img src="https://secure.travis-ci.org/freerange/mocha.png" />}[http://travis-ci.org/freerange/mocha]
-
-Mocha is a library for mocking and stubbing using a syntax like that of {JMock}[http://www.jmock.org].
-
-It can be used with many testing frameworks e.g. {Test::Unit}[http://www.ruby-doc.org/core/classes/Test/Unit.html], {RSpec}[http://rspec.info/], {test/spec}[http://chneukirchen.org/repos/testspec/README], {expectations}[http://expectations.rubyforge.org/], {Dust}[http://dust.rubyforge.org/], {MiniTest}[http://rubyforge.org/projects/bfts] and even {JtestR}[http://jtestr.codehaus.org/].
-
-Mocha provides a unified, simple and readable syntax for both traditional mocking and partial mocking.
-
-Mocha was harvested from projects at {Reevoo}[http://www.reevoo.com/] by me ({James}[http://jamesmead.org/]) and my (then) colleagues {Ben}[http://www.techbelly.com/], {Chris}[http://chrisroos.co.uk/] and {Paul}[http://po-ru.com/].
-
-== Installation
-
-Install the latest version of the gem with the following command...
-
-  $ gem install mocha
-
-Note that if you are intending to use Mocha with Test::Unit or MiniTest, you should only load Mocha *after* loading the relevant test library...
-
-  require "test/unit"
-  require "mocha"
-
-If you're using Bundler, ensure the correct load order by not auto-requiring Mocha in the Gemfile and then later load it once you know the test library has been loaded...
-
-  # Gemfile
-  gem "mocha", :require => false
-
-  # Elsewhere after Bundler has loaded gems
-  require "test/unit"
-  require "mocha"
-
-Note that versions 0.10.2, 0.10.3 & 0.11.0 included a bug. Please do not use these versions.
-
-Or install the {Rails}[http://www.rubyonrails.org/] plugin...
-
-  $ script/plugin install git://github.com/freerange/mocha.git
-
-Note that versions 0.9.6 & 0.9.7 of the Rails plugin were broken. As of version 0.9.8, you need to explicitly load Mocha after the test framework e.g. by adding "require 'mocha'" at the bottom of test/test_helper.rb.
-
-== Examples
-
-* Quick Start - {file:misc.rb Usage Examples}
-* Traditional mocking - {file:mocha.rb Star Trek Example}
-* Setting expectations on real classes - {file:stubba.rb Order Example}
-* More examples on {James Mead's Blog}[http://jamesmead.org/blog/]
-* {Mailing List Archives}[http://groups.google.com/group/mocha-developer]
-
-== Links
-
-* {Source code}[http://github.com/freerange/mocha]
-* {Bug reports}[http://github.com/freerange/mocha/issues]
-
-== License
-
-Copyright Revieworld Ltd. 2006
-
-You may use, copy and redistribute this library under the same terms as {Ruby itself}[http://www.ruby-lang.org/en/LICENSE.txt] or under the {file:MIT-LICENSE.rdoc MIT license}.

data/examples/misc.rb

@@ -1,43 +0,0 @@
-require 'test/unit'
-require 'mocha'
-
-class MiscExampleTest < Test::Unit::TestCase
-  
-  def test_mocking_a_class_method
-    product = Product.new
-    Product.expects(:find).with(1).returns(product)
-    assert_equal product, Product.find(1)
-  end
-
-  def test_mocking_an_instance_method_on_a_real_object
-    product = Product.new
-    product.expects(:save).returns(true)
-    assert product.save
-  end
-
-  def test_stubbing_instance_methods_on_real_objects
-    prices = [stub(:pence => 1000), stub(:pence => 2000)]
-    product = Product.new
-    product.stubs(:prices).returns(prices)
-    assert_equal [1000, 2000], product.prices.collect {|p| p.pence}
-  end
-
-  def test_stubbing_an_instance_method_on_all_instances_of_a_class
-    Product.any_instance.stubs(:name).returns('stubbed_name')
-    product = Product.new
-    assert_equal 'stubbed_name', product.name
-  end
-
-  def test_traditional_mocking
-    object = mock()
-    object.expects(:expected_method).with(:p1, :p2).returns(:result)
-    assert_equal :result, object.expected_method(:p1, :p2)
-  end
-
-  def test_shortcuts
-    object = stub(:method1 => :result1, :method2 => :result2)
-    assert_equal :result1, object.method1
-    assert_equal :result2, object.method2
-  end
-  
-end

data/examples/mocha.rb

@@ -1,25 +0,0 @@
-class Enterprise
-
-  def initialize(dilithium)
-    @dilithium = dilithium
-  end
-
-  def go(warp_factor)
-    warp_factor.times { @dilithium.nuke(:anti_matter) }
-  end
-
-end
-
-require 'test/unit'
-require 'mocha'
-
-class EnterpriseTest < Test::Unit::TestCase
-
-  def test_should_boldly_go
-    dilithium = mock()
-    dilithium.expects(:nuke).with(:anti_matter).at_least_once  # auto-verified at end of test
-    enterprise = Enterprise.new(dilithium)
-    enterprise.go(2)
-  end
-
-end

data/examples/stubba.rb

@@ -1,64 +0,0 @@
-class Order
-
-  attr_accessor :shipped_on
-
-  def total_cost
-    line_items.inject(0) { |total, line_item| total + line_item.price } + shipping_cost
-  end
-
-  def total_weight
-    line_items.inject(0) { |total, line_item| total + line_item.weight }
-  end
-
-  def shipping_cost
-    total_weight * 5 + 10
-  end
-
-  class << self
-
-    def find_all
-      # Database.connection.execute('select * from orders...
-    end
-  
-    def number_shipped_since(date)
-      find_all.select { |order| order.shipped_on > date }.length
-    end
-
-    def unshipped_value
-      find_all.inject(0) { |total, order| order.shipped_on ? total : total + order.total_cost }
-    end
-
-  end
-
-end
-
-require 'test/unit'
-require 'mocha'
-
-class OrderTest < Test::Unit::TestCase
-
-  # illustrates stubbing instance method
-  def test_should_calculate_shipping_cost_based_on_total_weight
-    order = Order.new
-    order.stubs(:total_weight).returns(10)
-    assert_equal 60, order.shipping_cost
-  end
-
-  # illustrates stubbing class method
-  def test_should_count_number_of_orders_shipped_after_specified_date
-    now = Time.now; week_in_secs = 7 * 24 * 60 * 60
-    order_1 = Order.new; order_1.shipped_on = now - 1 * week_in_secs
-    order_2 = Order.new; order_2.shipped_on = now - 3 * week_in_secs
-    Order.stubs(:find_all).returns([order_1, order_2])
-    assert_equal 1, Order.number_shipped_since(now - 2 * week_in_secs)
-  end
-
-  # illustrates stubbing instance method for all instances of a class
-  def test_should_calculate_value_of_unshipped_orders
-    Order.stubs(:find_all).returns([Order.new, Order.new, Order.new])
-    Order.any_instance.stubs(:shipped_on).returns(nil)
-    Order.any_instance.stubs(:total_cost).returns(10)
-    assert_equal 30, Order.unshipped_value
-  end
-
-end

data/lib/mocha/integration/mini_test/assertion_counter.rb

@@ -1,23 +0,0 @@
-module Mocha
-
-  module Integration
-
-    module MiniTest
-
-      class AssertionCounter
-
-        def initialize(test_case)
-          @test_case = test_case
-        end
-
-        def increment
-          @test_case.assert(true)
-        end
-
-      end
-
-    end
-
-  end
-
-end

data/lib/mocha/integration/mini_test/version_330_to_410.rb

@@ -1,65 +0,0 @@
-require 'mocha/integration/mini_test/assertion_counter'
-require 'mocha/expectation_error'
-
-module Mocha
-
-  module Integration
-
-    module MiniTest
-
-      module Version330To410
-        def self.included(mod)
-          $stderr.puts "Monkey patching MiniTest >= v3.3.0 <= v4.1.0" if $mocha_options['debug']
-        end
-        def run runner
-          trap "INFO" do
-            runner.report.each_with_index do |msg, i|
-              warn "\n%3d) %s" % [i + 1, msg]
-            end
-            warn ''
-            time = runner.start_time ? Time.now - runner.start_time : 0
-            warn "Current Test: %s#%s %.2fs" % [self.class, self.__name__, time]
-            runner.status $stderr
-          end if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
-          assertion_counter = AssertionCounter.new(self)
-          result = ""
-          begin
-            begin
-              @passed = nil
-              self.before_setup
-              self.setup
-              self.after_setup
-              self.run_test self.__name__
-              mocha_verify(assertion_counter)
-              result = "." unless io?
-              @passed = true
-            rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
-              raise
-            rescue Exception => e
-              @passed = false
-              result = runner.puke self.class, self.__name__, Mocha::Integration::MiniTest.translate(e)
-            ensure
-              %w{ before_teardown teardown after_teardown }.each do |hook|
-                begin
-                  self.send hook
-                rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
-                  raise
-                rescue Exception => e
-                  @passed = false
-                  result = runner.puke self.class, self.__name__, Mocha::Integration::MiniTest.translate(e)
-                end
-              end
-              trap 'INFO', 'DEFAULT' if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
-            end
-          ensure
-            mocha_teardown
-          end
-          result
-        end
-      end
-
-    end
-
-  end
-
-end

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

@@ -1,23 +0,0 @@
-module Mocha
-
-  module Integration
-
-    module TestUnit
-
-      class AssertionCounter
-
-        def initialize(test_result)
-          @test_result = test_result
-        end
-
-        def increment
-          @test_result.add_assertion
-        end
-
-      end
-
-    end
-
-  end
-
-end