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.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb
index 1e077bb902..a29a6b9cd2 100644
--- a/actionpack/test/controller/new_render_test.rb
+++ b/actionpack/test/controller/new_render_test.rb
@@ -132,6 +132,7 @@ class NewRenderTestController < ActionController::Base
def rendering_with_conflicting_local_vars
@name = "David"
+ def @template.name() nil end
render :action => "potential_conflicts"
end