aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-09-22 17:37:39 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-09-22 17:37:39 +0000
commit6ccf5032294f6b6978a626fc8f793b4df1a38584 (patch)
treed9e6ef8dbbb787a0071d6b2ab31635aec70da569 /actionmailer
parenta5fde9987360988d92eb9f1eeba2ffcbc5752c1f (diff)
downloadrails-6ccf5032294f6b6978a626fc8f793b4df1a38584.tar.gz
rails-6ccf5032294f6b6978a626fc8f793b4df1a38584.tar.bz2
rails-6ccf5032294f6b6978a626fc8f793b4df1a38584.zip
Test requirement fix (closes #9276) [lazyatom]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7547 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/test/abstract_unit.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index d1e69ce0fb..649e7982cc 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -31,9 +31,9 @@ end
# Wrap tests that use Mocha and skip if unavailable.
def uses_mocha(test_name)
- require 'mocha'
+ gem 'mocha', ">=0.5"
require 'stubba'
yield
-rescue LoadError
- $stderr.puts "Skipping #{test_name} tests. `gem install mocha` and try again."
+rescue Gem::LoadError
+ $stderr.puts "Skipping #{test_name} tests (Mocha >= 0.5 is required). `gem install mocha` and try again."
end