aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/new_render_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test/controller/new_render_test.rb')
-rw-r--r--actionpack/test/controller/new_render_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb
index d3967791a0..3eb84e6d24 100644
--- a/actionpack/test/controller/new_render_test.rb
+++ b/actionpack/test/controller/new_render_test.rb
@@ -60,12 +60,12 @@ class NewRenderTestController < ActionController::Base
def render_file_with_instance_variables
@secret = 'in the sauce'
- path = File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_ivar.rhtml')
+ path = File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_ivar.erb')
render :file => path
end
def render_file_with_locals
- path = File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_locals.rhtml')
+ path = File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_locals.erb')
render :file => path, :locals => {:secret => 'in the sauce'}
end
@@ -227,11 +227,11 @@ class NewRenderTestController < ActionController::Base
end
def hello_world_from_rxml_using_action
- render :action => "hello_world.rxml"
+ render :action => "hello_world.builder"
end
def hello_world_from_rxml_using_template
- render :template => "test/hello_world.rxml"
+ render :template => "test/hello_world.builder"
end
def head_with_location_header