From 21187c0fb4fc559927a2f947f909dedd85969ffb Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 21 Feb 2007 00:29:44 +0000 Subject: Apply the rest of Chads patch git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6180 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionwebservice/test/scaffolded_controller_test.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'actionwebservice/test/scaffolded_controller_test.rb') diff --git a/actionwebservice/test/scaffolded_controller_test.rb b/actionwebservice/test/scaffolded_controller_test.rb index 67e74a95ec..db73be17e3 100644 --- a/actionwebservice/test/scaffolded_controller_test.rb +++ b/actionwebservice/test/scaffolded_controller_test.rb @@ -73,30 +73,30 @@ class ScaffoldedControllerTest < Test::Unit::TestCase def test_scaffold_invoke get :scaffold_invoke - assert_template 'methods.rhtml' + assert_template 'methods.erb' end def test_scaffold_invoke_method_params get :scaffold_invoke_method_params, :service => 'scaffolded', :method => 'Hello' - assert_template 'parameters.rhtml' + assert_template 'parameters.erb' end def test_scaffold_invoke_method_params_with_struct get :scaffold_invoke_method_params, :service => 'scaffolded', :method => 'HelloStructParam' - assert_template 'parameters.rhtml' + assert_template 'parameters.erb' assert_tag :tag => 'form' assert_tag :tag => 'input', :attributes => {:name => "method_params[0][name]"} end def test_scaffold_invoke_submit_hello post :scaffold_invoke_submit, :service => 'scaffolded', :method => 'Hello', :method_params => {'0' => '5', '1' => 'hello world'} - assert_template 'result.rhtml' + assert_template 'result.erb' assert_equal false, @controller.instance_eval{ @method_return_value } end def test_scaffold_invoke_submit_bye post :scaffold_invoke_submit, :service => 'scaffolded', :method => 'Bye' - assert_template 'result.rhtml' + assert_template 'result.erb' persons = [ScaffoldPerson.new(:id => 1, :name => "leon"), ScaffoldPerson.new(:id => 2, :name => "paul")] assert_equal persons, @controller.instance_eval{ @method_return_value } end -- cgit v1.2.3