aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-08-13 19:33:15 -0500
committerJeremy Kemper <jeremy@bitsweat.net>2009-08-15 12:28:09 -0700
commit26e4d688aca9c28cceccc72fc00d8ea93e067ddf (patch)
treefcda5d48afe706c2473fcb762ed2c8c84c5d219c /activesupport
parent940a391c9b0aaefa8d1e836332bd46ed74e7a9f4 (diff)
downloadrails-26e4d688aca9c28cceccc72fc00d8ea93e067ddf.tar.gz
rails-26e4d688aca9c28cceccc72fc00d8ea93e067ddf.tar.bz2
rails-26e4d688aca9c28cceccc72fc00d8ea93e067ddf.zip
Skip isolation test tests when using MiniTest
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/test/isolation_test.rb6
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