aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-11-29 23:36:12 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-11-30 09:08:30 -0800
commit4da879079e103346525523d5e687dfabb1120a77 (patch)
tree6fa8f77a25b7ba60428267ee1c6330fd602e23d5
parentb757663af7063eb2e1fa09546e415abe977be011 (diff)
downloadrails-4da879079e103346525523d5e687dfabb1120a77.tar.gz
rails-4da879079e103346525523d5e687dfabb1120a77.tar.bz2
rails-4da879079e103346525523d5e687dfabb1120a77.zip
`run_test` method conflicts with newer minitest, so change the name
-rw-r--r--railties/test/application/test_test.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index 27a7959e84..a06facc04b 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -24,7 +24,7 @@ module ApplicationTests
end
RUBY
- run_test 'unit/foo_test.rb'
+ run_test_file 'unit/foo_test.rb'
end
# Run just in Ruby < 1.9
@@ -40,7 +40,7 @@ module ApplicationTests
end
RUBY
- run_test 'unit/backtrace_test.rb'
+ run_test_file 'unit/backtrace_test.rb'
end
end
@@ -66,7 +66,7 @@ module ApplicationTests
end
RUBY
- run_test 'integration/posts_test.rb'
+ run_test_file 'integration/posts_test.rb'
end
test "performance test" do
@@ -91,11 +91,11 @@ module ApplicationTests
end
RUBY
- run_test 'performance/posts_test.rb'
+ run_test_file 'performance/posts_test.rb'
end
private
- def run_test(name)
+ def run_test_file(name)
result = ruby '-Itest', "#{app_path}/test/#{name}"
assert_equal 0, $?.to_i, result
end