diff options
author | Michael Koziarski <michael@koziarski.com> | 2007-09-03 00:18:30 +0000 |
---|---|---|
committer | Michael Koziarski <michael@koziarski.com> | 2007-09-03 00:18:30 +0000 |
commit | f81dae3fca46c43d1fb6e4cb40734ef35623a72e (patch) | |
tree | 987017ae80580ee8f39c877a8f91c8b42eae14c5 /actionpack/test/controller/components_test.rb | |
parent | 6246fad19a5ec747f5914c142b8631af212d47ea (diff) | |
download | rails-f81dae3fca46c43d1fb6e4cb40734ef35623a72e.tar.gz rails-f81dae3fca46c43d1fb6e4cb40734ef35623a72e.tar.bz2 rails-f81dae3fca46c43d1fb6e4cb40734ef35623a72e.zip |
Remove deprecated functionality from actionpack. Closes #8958 [lifofifo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7403 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller/components_test.rb')
-rw-r--r-- | actionpack/test/controller/components_test.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/test/controller/components_test.rb b/actionpack/test/controller/components_test.rb index c45a59bdbe..c046cf045a 100644 --- a/actionpack/test/controller/components_test.rb +++ b/actionpack/test/controller/components_test.rb @@ -14,15 +14,15 @@ class CallerController < ActionController::Base end def calling_from_template - render_template "Ring, ring: <%= render_component(:controller => 'callee', :action => 'being_called') %>" + render :inline => "Ring, ring: <%= render_component(:controller => 'callee', :action => 'being_called') %>" end def internal_caller - render_template "Are you there? <%= render_component(:action => 'internal_callee') %>" + render :inline => "Are you there? <%= render_component(:action => 'internal_callee') %>" end def internal_callee - render_text "Yes, ma'am" + render :text => "Yes, ma'am" end def set_flash @@ -38,7 +38,7 @@ class CallerController < ActionController::Base end def calling_redirected_as_string - render_template "<%= render_component(:controller => 'callee', :action => 'redirected') %>" + render :inline => "<%= render_component(:controller => 'callee', :action => 'redirected') %>" end def rescue_action(e) raise end @@ -46,11 +46,11 @@ end class CalleeController < ActionController::Base def being_called - render_text "#{params[:name] || "Lady"} of the House, speaking" + render :text => "#{params[:name] || "Lady"} of the House, speaking" end def blowing_up - render_text "It's game over, man, just game over, man!", "500 Internal Server Error" + render :text => "It's game over, man, just game over, man!", :status => 500 end def set_flash |