Depend on mocha 0.13.0

* Change to `require "mocha/setup"` per release notes for 0.13.0: http://gofreerange.com/mocha/docs/file.RELEASE.html
thoughtbot · Nov 30, 2012 · 298b30c · sferik · Dec 1, 2012 · joshuaclayton
1 parent b81aa1a
commit 298b30c
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/bourne.gemspec b/bourne.gemspec
@@ -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.12.7') # follow instructions in mock.rb to update
+  s.add_dependency('mocha', '0.13.0') # follow instructions in mock.rb to update
 
   s.add_development_dependency('rake')
 end
diff --git a/lib/bourne.rb b/lib/bourne.rb
@@ -1,2 +1,2 @@
-require 'mocha'
+require 'mocha/api'
 require 'bourne/api'
diff --git a/test/acceptance/mocha_example_test.rb b/test/acceptance/mocha_example_test.rb
@@ -1,5 +1,5 @@
 require File.expand_path('../../test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class MochaExampleTest < Test::Unit::TestCase
 

diff --git a/test/acceptance/stubba_example_test.rb b/test/acceptance/stubba_example_test.rb
@@ -1,5 +1,5 @@
 require File.expand_path('../../test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class Widget
 

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -14,7 +14,7 @@
 end
 
 require 'test/unit'
-require 'mocha'
+require 'mocha/setup'
 
 if defined?(MiniTest)
   FailedAssertion = MiniTest::Assertion

diff --git a/test/unit/assert_received_test.rb b/test/unit/assert_received_test.rb
@@ -2,7 +2,7 @@
 require 'test_runner'
 require 'bourne/api'
 require 'bourne/mockery'
-require 'mocha/object'
+require 'mocha/api'
 
 class AssertReceivedTest < Test::Unit::TestCase
 

diff --git a/test/unit/have_received_test.rb b/test/unit/have_received_test.rb
@@ -2,7 +2,7 @@
 require 'test_runner'
 require 'bourne/api'
 require 'bourne/mockery'
-require 'mocha/object'
+require 'mocha/api'
 require 'matcher_helpers'
 
 module HaveReceivedTestMethods