aboutsummaryrefslogtreecommitdiffstats
path: root/actionwebservice/test
diff options
context:
space:
mode:
Diffstat (limited to 'actionwebservice/test')
-rw-r--r--actionwebservice/test/abstract_dispatcher.rb2
-rw-r--r--actionwebservice/test/scaffolded_controller_test.rb10
2 files changed, 6 insertions, 6 deletions
diff --git a/actionwebservice/test/abstract_dispatcher.rb b/actionwebservice/test/abstract_dispatcher.rb
index e5a08392b4..e9b8edde9d 100644
--- a/actionwebservice/test/abstract_dispatcher.rb
+++ b/actionwebservice/test/abstract_dispatcher.rb
@@ -208,7 +208,7 @@ module DispatcherTest
end
def add
- @added = @params['a'] + @params['b']
+ @added = params['a'] + params['b']
end
def add2(a, b)
diff --git a/actionwebservice/test/scaffolded_controller_test.rb b/actionwebservice/test/scaffolded_controller_test.rb
index 123a7043eb..c339c81647 100644
--- a/actionwebservice/test/scaffolded_controller_test.rb
+++ b/actionwebservice/test/scaffolded_controller_test.rb
@@ -73,29 +73,29 @@ class ScaffoldedControllerTest < Test::Unit::TestCase
def test_scaffold_invoke
get :scaffold_invoke
- assert_rendered_file 'methods.rhtml'
+ assert_template 'methods.rhtml'
end
def test_scaffold_invoke_method_params
get :scaffold_invoke_method_params, :service => 'scaffolded', :method => 'Hello'
- assert_rendered_file 'parameters.rhtml'
+ assert_template 'parameters.rhtml'
end
def test_scaffold_invoke_method_params_with_struct
get :scaffold_invoke_method_params, :service => 'scaffolded', :method => 'HelloStructParam'
- assert_rendered_file 'parameters.rhtml'
+ assert_template 'parameters.rhtml'
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_rendered_file 'result.rhtml'
+ assert_template 'result.rhtml'
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_rendered_file 'result.rhtml'
+ assert_template 'result.rhtml'
persons = [ScaffoldPerson.new(:id => 1, :name => "leon"), ScaffoldPerson.new(:id => 2, :name => "paul")]
assert_equal persons, @controller.instance_eval{ @method_return_value }
end