From 585e75696b31395aee895e5366e331c07c3f5ee1 Mon Sep 17 00:00:00 2001 From: Godfrey Chan Date: Tue, 23 Sep 2014 02:06:08 +0900 Subject: Revert "Merge pull request #16888 from jejacks0n/render_template" This reverts commit 07635a74b5ee08dcba3f6617def6230d8f114fe5, reversing changes made to 1b5f61a025b6ce1ee52b7148e3ed2a9acbde28b9. Reason: it's not ready :bomb:, see https://github.com/rails/rails/pull/16888#issuecomment-56400816 --- .../test/actionpack/controller/render_test.rb | 23 +++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'actionview/test') diff --git a/actionview/test/actionpack/controller/render_test.rb b/actionview/test/actionpack/controller/render_test.rb index 563caee8a2..b3b51ae583 100644 --- a/actionview/test/actionpack/controller/render_test.rb +++ b/actionview/test/actionpack/controller/render_test.rb @@ -91,17 +91,17 @@ class TestController < ApplicationController # :ported: def render_hello_world - render "test/hello_world" + render :template => "test/hello_world" end def render_hello_world_with_last_modified_set response.last_modified = Date.new(2008, 10, 10).to_time - render "test/hello_world" + render :template => "test/hello_world" end # :ported: compatibility def render_hello_world_with_forward_slash - render "/test/hello_world" + render :template => "/test/hello_world" end # :ported: @@ -111,7 +111,7 @@ class TestController < ApplicationController # :deprecated: def render_template_in_top_directory_with_slash - render '/shared' + render :template => '/shared' end # :ported: @@ -159,6 +159,13 @@ class TestController < ApplicationController render :file => path end + # :ported: + def render_file_as_string_with_instance_variables + @secret = 'in the sauce' + path = File.expand_path(File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_ivar')) + render path + end + # :ported: def render_file_not_using_full_path @secret = 'in the sauce' @@ -187,7 +194,7 @@ class TestController < ApplicationController def render_file_as_string_with_locals path = File.expand_path(File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_locals')) - render file: path, :locals => {:secret => 'in the sauce'} + render path, :locals => {:secret => 'in the sauce'} end def accessing_request_in_template @@ -786,6 +793,12 @@ class RenderTest < ActionController::TestCase assert_equal "Hello world!", @response.body end + # :ported: + def test_render_file_as_string_with_instance_variables + get :render_file_as_string_with_instance_variables + assert_equal "The secret is in the sauce\n", @response.body + end + # :ported: def test_render_file_not_using_full_path get :render_file_not_using_full_path -- cgit v1.2.3