diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-17 19:46:06 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-17 19:46:06 -0300 |
| commit | c01c8967a02537f132d437d5ae15332982119651 (patch) | |
| tree | 76ed47f6bffd5fe1aa11c65cd32b222d881f43aa /activesupport/test/isolation_test.rb | |
| parent | 770fca10fba68fa14308f33e923493e6f63bfa35 (diff) | |
| parent | ccf28d2499d1b4e2aba41291eb800e0e02120923 (diff) | |
| download | rails-c01c8967a02537f132d437d5ae15332982119651.tar.gz rails-c01c8967a02537f132d437d5ae15332982119651.tar.bz2 rails-c01c8967a02537f132d437d5ae15332982119651.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/calculations.rb
Diffstat (limited to 'activesupport/test/isolation_test.rb')
| -rw-r--r-- | activesupport/test/isolation_test.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activesupport/test/isolation_test.rb b/activesupport/test/isolation_test.rb index b83a7a0e49..7aecdb8009 100644 --- a/activesupport/test/isolation_test.rb +++ b/activesupport/test/isolation_test.rb @@ -1,7 +1,9 @@ require 'abstract_unit' # Does awesome -if ENV['CHILD'] +if defined?(MiniTest) + $stderr.puts "Umm, MiniTest not supported yet, mmkay?" +elsif ENV['CHILD'] class ChildIsolationTest < ActiveSupport::TestCase include ActiveSupport::Testing::Isolation @@ -153,4 +155,4 @@ else end end -end
\ No newline at end of file +end |