mocha 0.11.4 → 0.12.0

data/README.rdoc

@@ -1,4 +1,4 @@
-= Mocha {<img src="https://secure.travis-ci.org/floehopper/mocha.png" />}[http://travis-ci.org/floehopper/mocha]
+= 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].
 

data/RELEASE.rdoc

@@ -1,3 +1,11 @@
+= 0.12.0
+* Fail fast if neither Test::Unit nor MiniTest is loaded. Fixes #40.
+* Officially support MiniTest up to v3.2.0 (still monkey-patching).
+* Officially support test-unit v2.5.0 (still monkey-patching).
+* Do not monkey-patch Test::Unit or MiniTest unless we *know* it's ok.
+* Add acceptance tests to demonstrate using a block as a custom parameter matcher.
+* Update Travis CI build status image to use the new build under the freerange account.
+
 = 0.11.4
 * Homepage has moved to http://gofreerange.com/mocha/docs.
 

data/Rakefile

@@ -116,7 +116,8 @@ task 'generate_docs' => ['clobber_yardoc', 'yardoc']
 
 desc "Publish docs to Github (relies on running 'generate_docs' task and committing changes to master branch)"
 task 'publish_docs' do
-  `scp -r doc/* gofreerange.com:/home/freerange/docs/mocha && ssh gofreerange.com "sudo su - freerange -c 'sudo chmod -R g+w /home/freerange/docs/mocha'"`
+  path = "/home/freerange/docs/mocha"
+  system %{ssh gofreerange.com "sudo rm -fr #{path} && mkdir -p #{path}" && scp -r doc/* gofreerange.com:#{path}}
 end
 
 task 'release' => 'default' do

data/gemfiles/Gemfile.minitest.2.11.0

@@ -0,0 +1,7 @@
+source :rubygems
+
+gemspec :path=>"../"
+
+group :development do
+  gem "minitest", "2.11.0"
+end

data/gemfiles/Gemfile.minitest.2.11.2

@@ -0,0 +1,7 @@
+source :rubygems
+
+gemspec :path=>"../"
+
+group :development do
+  gem "minitest", "2.11.2"
+end

data/lib/mocha.rb

@@ -1,4 +1,4 @@
 require 'mocha/version'
+require 'mocha/integration'
 require 'mocha_standalone'
 require 'mocha/configuration'
-require 'mocha/integration'

data/lib/mocha/integration.rb

@@ -1,3 +1,5 @@
+require 'mocha/options'
+
 module Mocha
 
   module Integration
@@ -9,22 +11,22 @@ module Mocha
         if test_unit_testcase_defined? && !test_unit_testcase_inherits_from_miniunit_testcase?
           patches << 'mocha/integration/test_unit'
         end
-        if mini_unit_testcase_defined?
+        if mini_test_testcase_defined?
           patches << 'mocha/integration/mini_test'
         end
         patches
       end
 
       def test_unit_testcase_defined?
-        defined?(Test) && defined?(Test::Unit) && defined?(Test::Unit::TestCase)
+        defined?(Test::Unit::TestCase)
       end
 
-      def mini_unit_testcase_defined?
-        defined?(MiniTest) && defined?(MiniTest::Unit) && defined?(MiniTest::Unit::TestCase)
+      def mini_test_testcase_defined?
+        defined?(MiniTest::Unit::TestCase)
       end
 
       def test_unit_testcase_inherits_from_miniunit_testcase?
-        test_unit_testcase_defined? && mini_unit_testcase_defined? && Test::Unit::TestCase.ancestors.include?(MiniTest::Unit::TestCase)
+        test_unit_testcase_defined? && mini_test_testcase_defined? && Test::Unit::TestCase.ancestors.include?(MiniTest::Unit::TestCase)
       end
 
     end
@@ -33,6 +35,10 @@ module Mocha
 
 end
 
+unless Mocha::Integration.monkey_patches.any? || $mocha_options["skip_integration"]
+  raise "Test::Unit or MiniTest must be loaded *before* Mocha (use MOCHA_OPTIONS=skip_integration if you know what you are doing)."
+end
+
 Mocha::Integration.monkey_patches.each do |patch|
   require patch
 end

data/lib/mocha/integration/mini_test.rb

@@ -10,7 +10,9 @@ if !MiniTest::Unit::TestCase.ancestors.include?(Mocha::API)
   require 'mocha/integration/mini_test/version_142_to_172'
   require 'mocha/integration/mini_test/version_200'
   require 'mocha/integration/mini_test/version_201_to_222'
-  require 'mocha/integration/mini_test/version_230_to_262'
+  require 'mocha/integration/mini_test/version_230_to_2101'
+  require 'mocha/integration/mini_test/version_2110_to_2111'
+  require 'mocha/integration/mini_test/version_2112_to_320'
 
   module MiniTest
     class Unit
@@ -41,9 +43,12 @@ if !MiniTest::Unit::TestCase.ancestors.include?(Mocha::API)
           include Mocha::Integration::MiniTest::Version200
         elsif Gem::Requirement.new('>= 2.0.1', '<= 2.2.2').satisfied_by?(mini_test_version)
           include Mocha::Integration::MiniTest::Version201To222
-        elsif Gem::Requirement.new('>= 2.3.0').satisfied_by?(mini_test_version)
-          $stderr.puts "*** MiniTest integration has not been verified but patching anyway ***" if (Gem::Requirement.new('> 2.6.2').satisfied_by?(mini_test_version)) && $mocha_options['debug']
-          include Mocha::Integration::MiniTest::Version230To262
+        elsif Gem::Requirement.new('>= 2.3.0', '<= 2.10.1').satisfied_by?(mini_test_version)
+          include Mocha::Integration::MiniTest::Version230To2101
+        elsif Gem::Requirement.new('>= 2.11.0', '<= 2.11.1').satisfied_by?(mini_test_version)
+          include Mocha::Integration::MiniTest::Version2110To2111
+        elsif Gem::Requirement.new('>= 2.11.2', '<= 3.2.0').satisfied_by?(mini_test_version)
+          include Mocha::Integration::MiniTest::Version2112To320
         else
           $stderr.puts "*** No Mocha integration for MiniTest version ***" if $mocha_options['debug']
         end

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

@@ -0,0 +1,61 @@
+require 'mocha/integration/mini_test/assertion_counter'
+require 'mocha/expectation_error'
+
+module Mocha
+
+  module Integration
+
+    module MiniTest
+
+      module Version2110To2111
+        def self.included(mod)
+          $stderr.puts "Monkey patching MiniTest >= v2.11.0 <= v2.11.1" if $mocha_options['debug']
+        end
+        def run runner
+          trap 'INFO' do
+            time = runner.start_time ? Time.now - runner.start_time : 0
+            warn "%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
+                  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/mini_test/version_2112_to_320.rb

@@ -0,0 +1,64 @@
+require 'mocha/integration/mini_test/assertion_counter'
+require 'mocha/expectation_error'
+
+module Mocha
+
+  module Integration
+
+    module MiniTest
+
+      module Version2112To320
+        def self.included(mod)
+          $stderr.puts "Monkey patching MiniTest >= v2.11.2 <= v3.2.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
+                  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/mini_test/{version_230_to_262.rb → version_230_to_2101.rb}

@@ -7,9 +7,9 @@ module Mocha
 
     module MiniTest
 
-      module Version230To262
+      module Version230To2101
         def self.included(mod)
-          $stderr.puts "Monkey patching MiniTest >= v2.3.0 <= v2.6.2" if $mocha_options['debug']
+          $stderr.puts "Monkey patching MiniTest >= v2.3.0 <= v2.10.1" if $mocha_options['debug']
         end
         def run runner
           trap 'INFO' do

data/lib/mocha/integration/test_unit.rb

@@ -6,7 +6,7 @@ if !Test::Unit::TestCase.ancestors.include?(Mocha::API)
   require 'mocha/integration/test_unit/gem_version_200'
   require 'mocha/integration/test_unit/gem_version_201_to_202'
   require 'mocha/integration/test_unit/gem_version_203_to_220'
-  require 'mocha/integration/test_unit/gem_version_230_to_240'
+  require 'mocha/integration/test_unit/gem_version_230_to_250'
   require 'mocha/integration/test_unit/ruby_version_185_and_below'
   require 'mocha/integration/test_unit/ruby_version_186_and_above'
 
@@ -43,9 +43,8 @@ if !Test::Unit::TestCase.ancestors.include?(Mocha::API)
           include Mocha::Integration::TestUnit::GemVersion201To202
         elsif Gem::Requirement.new('>= 2.0.3', '<= 2.2.0').satisfied_by?(test_unit_version)
           include Mocha::Integration::TestUnit::GemVersion203To220
-        elsif Gem::Requirement.new('>= 2.3.0').satisfied_by?(test_unit_version)
-          $stderr.puts "*** Test::Unit integration has not been verified but patching anyway ***" if (Gem::Requirement.new('> 2.4.0').satisfied_by?(test_unit_version)) && $mocha_options['debug']
-          include Mocha::Integration::TestUnit::GemVersion230To240
+        elsif Gem::Requirement.new('>= 2.3.0', '<= 2.5.0').satisfied_by?(test_unit_version)
+          include Mocha::Integration::TestUnit::GemVersion230To250
         else
           $stderr.puts "*** No Mocha integration for Test::Unit version ***" if $mocha_options['debug']
         end

data/lib/mocha/integration/test_unit/{gem_version_230_to_240.rb → gem_version_230_to_250.rb}

@@ -8,9 +8,9 @@ module Mocha
 
     module TestUnit
 
-      module GemVersion230To240
+      module GemVersion230To250
         def self.included(mod)
-          $stderr.puts "Monkey patching Test::Unit gem >= v2.3.0 and <= v2.4.0" if $mocha_options['debug']
+          $stderr.puts "Monkey patching Test::Unit gem >= v2.3.0 and <= v2.5.0" if $mocha_options['debug']
         end
         def run(result)
           assertion_counter = AssertionCounter.new(result)

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = "0.11.4"
+  VERSION = "0.12.0"
 end

data/test/acceptance/parameter_matcher_test.rb

@@ -297,4 +297,41 @@ class ParameterMatcherTest < Test::Unit::TestCase
     assert_passed(test_result)
   end
 
+  def test_should_match_parameter_when_value_is_divisible_by_four
+    test_result = run_as_test do
+      mock = mock()
+      mock.expects(:method).with { |actual_value| actual_value % 4 == 0 }
+      mock.method(8)
+    end
+    assert_passed(test_result)
+  end
+
+  def test_should_not_match_parameter_when_value_is_not_divisible_by_four
+    test_result = run_as_test do
+      mock = mock()
+      mock.expects(:method).with { |actual_value| actual_value % 4 == 0 }
+      mock.method(9)
+    end
+    assert_failed(test_result)
+  end
+
+  def test_should_match_parameters_when_values_add_up_to_ten
+    test_result = run_as_test do
+      mock = mock()
+      matcher = lambda { |*values| values.inject(0) { |sum, n| sum + n } == 10 }
+      mock.expects(:method).with(&matcher)
+      mock.method(1, 2, 3, 4)
+    end
+    assert_passed(test_result)
+  end
+
+  def test_should_not_match_parameters_when_values_do_not_add_up_to_ten
+    test_result = run_as_test do
+      mock = mock()
+      matcher = lambda { |*values| values.inject(0) { |sum, n| sum + n } == 10 }
+      mock.expects(:method).with(&matcher)
+      mock.method(1, 2, 3, 4, 5)
+    end
+    assert_failed(test_result)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metaclass
-  requirement: &70132715601560 !ruby/object:Gem::Requirement
+  requirement: &70238404164500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70132715601560
+  version_requirements: *70238404164500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70132715600240 !ruby/object:Gem::Requirement
+  requirement: &70238404163180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70132715600240
+  version_requirements: *70238404163180
 - !ruby/object:Gem::Dependency
   name: introspection
-  requirement: &70132715599780 !ruby/object:Gem::Requirement
+  requirement: &70238404162720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70132715599780
+  version_requirements: *70238404162720
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70132715599400 !ruby/object:Gem::Requirement
+  requirement: &70238404162340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70132715599400
+  version_requirements: *70238404162340
 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
@@ -80,6 +80,8 @@ files:
 - gemfiles/Gemfile.minitest.1.4.2
 - gemfiles/Gemfile.minitest.2.0.0
 - gemfiles/Gemfile.minitest.2.0.1
+- gemfiles/Gemfile.minitest.2.11.0
+- gemfiles/Gemfile.minitest.2.11.2
 - gemfiles/Gemfile.minitest.2.3.0
 - gemfiles/Gemfile.minitest.latest
 - gemfiles/Gemfile.test-unit.2.0.0
@@ -115,13 +117,15 @@ files:
 - lib/mocha/integration/mini_test/version_142_to_172.rb
 - lib/mocha/integration/mini_test/version_200.rb
 - lib/mocha/integration/mini_test/version_201_to_222.rb
-- lib/mocha/integration/mini_test/version_230_to_262.rb
+- 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/test_unit.rb
 - lib/mocha/integration/test_unit/assertion_counter.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_240.rb
+- lib/mocha/integration/test_unit/gem_version_230_to_250.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
@@ -306,7 +310,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1391677123881760922
+      hash: -586468752341133139
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: