From 5181137fd5d9e4484cf1fd8b343d9a171382e8e3 Mon Sep 17 00:00:00 2001 From: Justin Ko Date: Fri, 26 Feb 2010 12:14:13 -0700 Subject: [PATCH] include record identifier --- actionpack/lib/action_controller/base.rb | 1 + actionpack/test/controller/base_test.rb | 8 ++++++++ railties/test/application/configuration_test.rb | 6 ------ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index f8ddc8d..872557f 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -30,6 +30,7 @@ module ActionController include ActionController::Verification include ActionController::RequestForgeryProtection include ActionController::Streaming + include ActionController::RecordIdentifier include ActionController::HttpAuthentication::Basic::ControllerMethods include ActionController::HttpAuthentication::Digest::ControllerMethods diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb index 207dc63..0ec1b61 100644 --- a/actionpack/test/controller/base_test.rb +++ b/actionpack/test/controller/base_test.rb @@ -66,6 +66,9 @@ class DefaultUrlOptionsController < ActionController::Base end end +class RecordIdentifierController < ActionController::Base +end + class ControllerClassTests < ActiveSupport::TestCase def test_controller_path assert_equal 'empty', EmptyController.controller_path @@ -92,6 +95,11 @@ class ControllerClassTests < ActiveSupport::TestCase assert_equal [:password], parameters end + + def test_record_identifier + assert_respond_to RecordIdentifierController.new, :dom_id + assert_respond_to RecordIdentifierController.new, :dom_class + end end class ControllerInstanceTests < Test::Unit::TestCase diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index acf752a..ba7e0d9 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -109,12 +109,6 @@ module ApplicationTests end end - test "Frameworks are not preloaded by default" do - require "#{app_path}/config/environment" - - assert ActionController.autoload?(:RecordIdentifier) - end - test "frameworks are preloaded with config.preload_frameworks is set" do add_to_config <<-RUBY config.preload_frameworks = true -- 1.6.5