aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkennyj <kennyj@gmail.com>2012-05-20 00:14:40 +0900
committerkennyj <kennyj@gmail.com>2012-05-20 00:14:40 +0900
commite5e2ba14c31f3eb97e5fba31a50da8d26ea3a77e (patch)
tree70fbc48208a144313ee00e6fc9a08b6d8cb00dec
parent26bdcf7299a44b45242e2e4be209b325cfe6bfb4 (diff)
downloadrails-e5e2ba14c31f3eb97e5fba31a50da8d26ea3a77e.tar.gz
rails-e5e2ba14c31f3eb97e5fba31a50da8d26ea3a77e.tar.bz2
rails-e5e2ba14c31f3eb97e5fba31a50da8d26ea3a77e.zip
Don't use assert_block method. It will be deprecated.
-rw-r--r--actionpack/test/ts_isolated.rb2
-rw-r--r--activesupport/test/ts_isolated.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/ts_isolated.rb b/actionpack/test/ts_isolated.rb
index 595b4018e9..c44c5d8968 100644
--- a/actionpack/test/ts_isolated.rb
+++ b/actionpack/test/ts_isolated.rb
@@ -9,7 +9,7 @@ class TestIsolated < ActiveSupport::TestCase
define_method("test #{file}") do
command = "#{ruby} -Ilib:test #{file}"
result = silence_stderr { `#{command}` }
- assert_block("#{command}\n#{result}") { $?.to_i.zero? }
+ assert $?.to_i.zero?, "#{command}\n#{result}"
end
end
end
diff --git a/activesupport/test/ts_isolated.rb b/activesupport/test/ts_isolated.rb
index 938bb4ee99..2c217157d3 100644
--- a/activesupport/test/ts_isolated.rb
+++ b/activesupport/test/ts_isolated.rb
@@ -10,7 +10,7 @@ class TestIsolated < ActiveSupport::TestCase
define_method("test #{file}") do
command = "#{ruby} -Ilib:test #{file}"
result = silence_stderr { `#{command}` }
- assert_block("#{command}\n#{result}") { $?.to_i.zero? }
+ assert $?.to_i.zero?, "#{command}\n#{result}"
end
end
end