diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-19 08:27:27 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-19 08:27:27 -0700 |
| commit | 777d53901427ea183170c932d27eb43ce9fa5800 (patch) | |
| tree | 1b42a7d02857425a22682daf24d552ed2c2b3121 | |
| parent | 6df96c90ab3623915514e29bf796aeb49e3fa08e (diff) | |
| parent | e5e2ba14c31f3eb97e5fba31a50da8d26ea3a77e (diff) | |
| download | rails-777d53901427ea183170c932d27eb43ce9fa5800.tar.gz rails-777d53901427ea183170c932d27eb43ce9fa5800.tar.bz2 rails-777d53901427ea183170c932d27eb43ce9fa5800.zip | |
Merge pull request #6396 from kennyj/dont_use_assert_block
Don't use assert_block method. It will be removed.
| -rw-r--r-- | actionpack/test/ts_isolated.rb | 2 | ||||
| -rw-r--r-- | activesupport/test/ts_isolated.rb | 2 |
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 |