From 23fa0395d8d6b0365421b5dea9e5620b95c6b15c Mon Sep 17 00:00:00 2001 From: Nicholas Seckar Date: Wed, 29 Mar 2006 15:11:47 +0000 Subject: Fix Rails info controller for postgres; Closes #4469. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4097 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/test/rails_info_controller_test.rb | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'railties/test/rails_info_controller_test.rb') diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb index 6e539f8051..fc14528a1e 100644 --- a/railties/test/rails_info_controller_test.rb +++ b/railties/test/rails_info_controller_test.rb @@ -1,19 +1,22 @@ $:.unshift File.dirname(__FILE__) + "/../lib" -$:.unshift File.dirname(__FILE__) + "/../builtin/controllers" +$:.unshift File.dirname(__FILE__) + "/../builtin/rails_info" $:.unshift File.dirname(__FILE__) + "/../../actionpack/lib" $:.unshift File.dirname(__FILE__) + "/../../activesupport/lib" require 'test/unit' require 'action_controller' require 'action_controller/test_process' -require 'rails_info' -class ApplicationController < ActionController::Base +require_dependency 'rails/info_controller' +class Rails::InfoController < ActionController::Base @local_request = false class << self cattr_accessor :local_request end + # Re-raise errors caught by the controller. + def rescue_action(e) raise e end; + protected def local_request? self.class.local_request @@ -24,27 +27,22 @@ ActionController::Routing::Routes.draw do |map| map.connect ':controller/:action/:id' end -require 'rails_info_controller' - -# Re-raise errors caught by the controller. -class RailsInfoController; def rescue_action(e) raise e end; end - -class RailsInfoControllerTest < Test::Unit::TestCase +class Rails::InfoControllerTest < Test::Unit::TestCase def setup - @controller = RailsInfoController.new + @controller = Rails::InfoController.new @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new end def test_rails_info_properties_table_rendered_for_local_request - RailsInfoController.local_request = true + Rails::InfoController.local_request = true get :properties assert_tag :tag => 'table' assert_response :success end def test_rails_info_properties_error_rendered_for_non_local_request - RailsInfoController.local_request = false + Rails::InfoController.local_request = false get :properties assert_tag :tag => 'p' assert_response 500 -- cgit v1.2.3