diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-07-12 21:39:36 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-07-12 21:39:36 +0100 |
| commit | 0cfa3574d599f3bc134cd13fa00d8f22809dd67b (patch) | |
| tree | b8af1a893ba900c9901c9b1fb7a9a2246aba67c6 /actionmailer/test | |
| parent | ef67bd481bacd1ff36a79b7f23f3c08f12f6cbe1 (diff) | |
| parent | 99cc85bc099a757cdd44e4f5f1be4972ab124e0d (diff) | |
| download | rails-0cfa3574d599f3bc134cd13fa00d8f22809dd67b.tar.gz rails-0cfa3574d599f3bc134cd13fa00d8f22809dd67b.tar.bz2 rails-0cfa3574d599f3bc134cd13fa00d8f22809dd67b.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/base.rb
railties/lib/rails_generator/commands.rb
Diffstat (limited to 'actionmailer/test')
| -rw-r--r-- | actionmailer/test/abstract_unit.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index 9b7a4661b6..11058a770d 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -32,8 +32,7 @@ end # Wrap tests that use Mocha and skip if unavailable. def uses_mocha(test_name) - gem 'mocha', ">=0.5" - require 'stubba' + gem 'mocha', ">=0.9.0" yield rescue Gem::LoadError $stderr.puts "Skipping #{test_name} tests (Mocha >= 0.5 is required). `gem install mocha` and try again." |