Skip to content

Commit

Permalink
run_test method conflicts with newer minitest, so change the name
Browse files Browse the repository at this point in the history
  • Loading branch information
tenderlove committed Nov 30, 2011
1 parent b757663 commit 4da8790
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions railties/test/application/test_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def test_truth
end
RUBY

run_test 'unit/foo_test.rb'
run_test_file 'unit/foo_test.rb'
end

# Run just in Ruby < 1.9
Expand All @@ -40,7 +40,7 @@ def test_truth
end
RUBY

run_test 'unit/backtrace_test.rb'
run_test_file 'unit/backtrace_test.rb'
end
end

Expand All @@ -66,7 +66,7 @@ def test_index
end
RUBY

run_test 'integration/posts_test.rb'
run_test_file 'integration/posts_test.rb'
end

test "performance test" do
Expand All @@ -91,11 +91,11 @@ def test_index
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
Expand Down

0 comments on commit 4da8790

Please sign in to comment.