0
@@ -30,13 +30,20 @@ class Net::SMTP
0
   end
0
 end
0
 
0
-# Wrap tests that use Mocha and skip if unavailable.
0
-def uses_mocha(test_name)
0
-  gem 'mocha', ">=0.5"
0
-  require 'stubba'
0
+def uses_gem(gem_name, test_name, version = '> 0')
0
+  require 'rubygems'
0
+  gem gem_name.to_s, version
0
+  require gem_name.to_s
0
   yield
0
-rescue Gem::LoadError
0
-  $stderr.puts "Skipping #{test_name} tests (Mocha >= 0.5 is required). `gem install mocha` and try again."
0
+rescue LoadError
0
+  $stderr.puts "Skipping #{test_name} tests. `gem install #{gem_name}` and try again."
0
+end
0
+
0
+# Wrap tests that use Mocha and skip if unavailable.
0
+unless defined? uses_mocha
0
+  def uses_mocha(test_name, &block)
0
+    uses_gem('mocha', test_name, '>= 0.5.5', &block)
0
+  end
0
 end
0
 
0
 def set_delivery_method(delivery_method)

0
@@ -9,14 +9,18 @@ require 'setter_trap'
0
 
0
 ActiveResource::Base.logger = Logger.new("#{File.dirname(__FILE__)}/debug.log")
0
 
0
+def uses_gem(gem_name, test_name, version = '> 0')
0
+  require 'rubygems'
0
+  gem gem_name.to_s, version
0
+  require gem_name.to_s
0
+  yield
0
+rescue LoadError
0
+  $stderr.puts "Skipping #{test_name} tests. `gem install #{gem_name}` and try again."
0
+end
0
+
0
 # Wrap tests that use Mocha and skip if unavailable.
0
-def uses_mocha(test_name)
0
-  unless Object.const_defined?(:Mocha)
0
-    require 'mocha'
0
-    require 'stubba'
0
+unless defined? uses_mocha
0
+  def uses_mocha(test_name, &block)
0
+    uses_gem('mocha', test_name, '>= 0.5.5', &block)
0
   end
0
-  yield
0
-rescue LoadError => load_error
0
-  raise unless load_error.message =~ /mocha/i
0
-  $stderr.puts "Skipping #{test_name} tests. `gem install mocha` and try again."
0
-end
0
\ No newline at end of file
0
+end