aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/new_base/render_text_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test/new_base/render_text_test.rb')
-rw-r--r--actionpack/test/new_base/render_text_test.rb11
1 files changed, 8 insertions, 3 deletions
diff --git a/actionpack/test/new_base/render_text_test.rb b/actionpack/test/new_base/render_text_test.rb
index b80a9b4a79..a20ca5fb8c 100644
--- a/actionpack/test/new_base/render_text_test.rb
+++ b/actionpack/test/new_base/render_text_test.rb
@@ -1,5 +1,8 @@
require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+class ApplicationController < ActionController::Base2
+end
+
module HappyPath
class RenderTextWithoutLayoutsController < ActionController::Base2
@@ -10,11 +13,11 @@ module HappyPath
end
end
- class RenderTextWithLayoutsController < ActionController::Base2
+ class RenderTextWithLayoutsController < ::ApplicationController
self.view_paths = [ActionView::FixtureTemplate::FixturePath.new(
"layouts/application.html.erb" => "<%= yield %>, I'm here!",
"layouts/greetings.html.erb" => "<%= yield %>, I wish thee well."
- )]
+ )]
def render_hello_world
render :text => "hello david"
@@ -136,4 +139,6 @@ module HappyPath
assert_body "hello world"
assert_status 200
end
-end \ No newline at end of file
+end
+
+ActionController::Base2.app_loaded! \ No newline at end of file