Permalink
Browse files

Bourne is now compatible with Mocha 0.10.4

  • Loading branch information...
1 parent 55248d6 commit 5768256dd1e106e56fa1591b2204682d161019bb @sikachu sikachu committed Feb 24, 2012
Showing with 12 additions and 8 deletions.
  1. +4 −2 Gemfile.lock
  2. +1 −1 bourne.gemspec
  3. +2 −2 test/method_definer.rb
  4. +1 −3 test/test_helper.rb
  5. +3 −0 test/unit/expectation_test.rb
  6. +1 −0 test/unit/mockery_test.rb
View
@@ -2,12 +2,14 @@ PATH
remote: .
specs:
bourne (1.0)
- mocha (= 0.9.12)
+ mocha (= 0.10.4)
GEM
remote: http://rubygems.org/
specs:
- mocha (0.9.12)
+ metaclass (0.0.1)
+ mocha (0.10.4)
+ metaclass (~> 0.0.1)
rake (0.9.2.2)
PLATFORMS
View
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ["lib"]
- s.add_dependency('mocha', '= 0.9.12')
+ s.add_dependency('mocha', '= 0.10.4')
s.add_development_dependency('rake')
end
@@ -1,4 +1,4 @@
-require 'mocha/metaclass'
+require 'metaclass'
module Mocha
@@ -21,4 +21,4 @@ def define_instance_accessor(*symbols)
class Object
include Mocha::ObjectMethods
-end
+end
View
@@ -13,7 +13,5 @@
gem 'test-unit'
end
-require 'rubygems'
require 'test/unit'
-gem 'mocha', '0.9.12'
-
+require 'mocha'
@@ -20,6 +20,9 @@ def initialize
def invocation(mock, method_name, args)
@invocations << { :mock => mock, :method_name => method_name, :args => args }
end
+
+ def verify(assertion_counter = nil)
+ end
end
def setup
@@ -73,6 +73,7 @@ def test_should_reset_list_of_state_machines_on_teardown
class FakeMethod
def stub; end
def unstub; end
+ def matches?(other); true; end
end
def test_should_unstub_all_methods_on_teardown

1 comment on commit 5768256

@dlindahl

Yay!

Please sign in to comment.