aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/new_render_test.rb4
-rw-r--r--actionpack/test/fixtures/test/hello_world.builder4
2 files changed, 2 insertions, 6 deletions
diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb
index 8a3013bec6..3168daeaec 100644
--- a/actionpack/test/controller/new_render_test.rb
+++ b/actionpack/test/controller/new_render_test.rb
@@ -241,11 +241,11 @@ class NewRenderTestController < ActionController::Base
end
def hello_world_from_rxml_using_action
- render :action => "hello_world.builder"
+ render :action => "hello_world_from_rxml.builder"
end
def hello_world_from_rxml_using_template
- render :template => "test/hello_world.builder"
+ render :template => "test/hello_world_from_rxml.builder"
end
def head_with_location_header
diff --git a/actionpack/test/fixtures/test/hello_world.builder b/actionpack/test/fixtures/test/hello_world.builder
deleted file mode 100644
index 8455b11edc..0000000000
--- a/actionpack/test/fixtures/test/hello_world.builder
+++ /dev/null
@@ -1,4 +0,0 @@
-xml.html do
- xml.p "Hello"
-end
-"String return value"