diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-28 19:46:17 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-28 19:46:17 +0000 |
| commit | 285361d1589002fcdd1584c07e6eb295f13c9f37 (patch) | |
| tree | 2d50a69b3b59b6fb3cb7577b990fe3b1aaf58f4f /actionmailer/Rakefile | |
| parent | dfa19408651ecc82e2aeba95d93db871ba8a6e41 (diff) | |
| parent | d58398c2b5e98aad18dc72790230f338c10d145c (diff) | |
| download | rails-285361d1589002fcdd1584c07e6eb295f13c9f37.tar.gz rails-285361d1589002fcdd1584c07e6eb295f13c9f37.tar.bz2 rails-285361d1589002fcdd1584c07e6eb295f13c9f37.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
railties/lib/rails/railtie.rb
Diffstat (limited to 'actionmailer/Rakefile')
| -rw-r--r-- | actionmailer/Rakefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile index 6c19371514..2619d9359e 100644 --- a/actionmailer/Rakefile +++ b/actionmailer/Rakefile @@ -22,14 +22,14 @@ task :default => [ :test ] # Run the unit tests Rake::TestTask.new { |t| t.libs << "test" - t.pattern = 'test/*_test.rb' + t.pattern = 'test/**/*_test.rb' t.warning = true } namespace :test do task :isolated do ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME')) - Dir.glob("test/*_test.rb").all? do |file| + Dir.glob("test/**/*_test.rb").all? do |file| system(ruby, '-Ilib:test', file) end or raise "Failures" end |