aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/new_base/render_text_test.rb
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-01 17:27:44 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-01 17:31:03 -0700
commite046f36824fcc164c284a13524c6b4153010a4e1 (patch)
tree08e7420dc8cb23db244fb46bb9878ac653d6eb39 /actionpack/test/new_base/render_text_test.rb
parentb1d34b3aa42beaf6a9fb93f114aed8fe08ebd9db (diff)
downloadrails-e046f36824fcc164c284a13524c6b4153010a4e1.tar.gz
rails-e046f36824fcc164c284a13524c6b4153010a4e1.tar.bz2
rails-e046f36824fcc164c284a13524c6b4153010a4e1.zip
Renamed Base2 to Base and don't require old action_controller for new Base
Diffstat (limited to 'actionpack/test/new_base/render_text_test.rb')
-rw-r--r--actionpack/test/new_base/render_text_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/new_base/render_text_test.rb b/actionpack/test/new_base/render_text_test.rb
index d97c2ca0a6..39f2f7abbf 100644
--- a/actionpack/test/new_base/render_text_test.rb
+++ b/actionpack/test/new_base/render_text_test.rb
@@ -1,10 +1,10 @@
require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
-class ApplicationController < ActionController::Base2
+class ApplicationController < ActionController::Base
end
module RenderText
- class SimpleController < ActionController::Base2
+ class SimpleController < ActionController::Base
self.view_paths = [ActionView::Template::FixturePath.new]
def index
@@ -146,4 +146,4 @@ module RenderText
end
end
-ActionController::Base2.app_loaded! \ No newline at end of file
+ActionController::Base.app_loaded! \ No newline at end of file