Bring abstract_controller up to date with rails/master

Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list
of commits that could not be applied cleanly or are obviated with the
abstract_controller refactor. They all need to be revisited to ensure
that fixes made in 2.3 do not reappear in 3.0:

2259ecf368e6a6715966f69216e3ee86bf1a82a7
AR not available
  * This will be reimplemented with ActionORM or equivalent

06182ea02e92afad579998aa80144588e8865ac3
implicitly rendering a js response should not use the default layout
[#1844 state:resolved]
  * This will be handled generically

893e9eb99504705419ad6edac14d00e71cef5f12
Improve view rendering performance in development mode and reinstate
template recompiling in production [#1909 state:resolved]
  * We will need to reimplement rails-dev-boost on top of the refactor;
    the changes here are very implementation specific and cannot be
    cleanly applied. The following commits are implicated:

      199e750d46c04970b5e7684998d09405648ecbd4
      3942cb406e1d5db0ac00e03153809cc8dc4cc4db
      f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690
      e3b166aab37ddc2fbab030b146eb61713b91bf55
      ae9f258e03c9fd5088da12c1c6cd216cc89a01f7
      44423126c6f6133a1d9cf1d0832b527e8711d40f

0cb020b4d6d838025859bd60fb8151c8e21b8e84
workaround for picking layouts based on wrong view_paths
[#1974 state:resolved]
  * The specifics of this commit no longer apply. Since it is a two-line
    commit, we will reimplement this change.

8c5cc66a831aadb159f3daaffa4208064c30af0e
make action_controller/layouts pick templates from the current instance's
view_paths instead of the class view_paths [#1974 state:resolved]
  * This does not apply at all. It should be trivial to apply the feature
    to the reimplemented ActionController::Base.

87e8b162463f13bd50d27398f020769460a770e3
fix HTML fallback for explicit templates [#2052 state:resolved]
  * There were a number of patches related to this that simply compounded
    each other. Basically none of them apply cleanly, and the underlying
    issue needs to be revisited. After discussing the underlying problem
    with Koz, we will defer these fixes for further discussion.

1 files changed, 275 insertions, 205 deletions

diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb
index dad9e55e61..d77a045e56 100644
--- a/railties/test/initializer_test.rb
+++ b/railties/test/initializer_test.rb
@@ -1,6 +1,10 @@
 require 'abstract_unit'
 require 'initializer'
 
+require 'action_view'
+require 'action_mailer'
+require 'active_record'
+
 # Mocks out the configuration
 module Rails
   def self.configuration
@@ -26,7 +30,6 @@ class Initializer_load_environment_Test < Test::Unit::TestCase
   ensure
     $initialize_test_set_from_env = nil
   end
-
 end
 
 class Initializer_eager_loading_Test < Test::Unit::TestCase
@@ -47,268 +50,335 @@ class Initializer_eager_loading_Test < Test::Unit::TestCase
   end
 end
 
-uses_mocha 'Initializer after_initialize' do
-  class Initializer_after_initialize_with_blocks_environment_Test < Test::Unit::TestCase
-    def setup
-      config = ConfigurationMock.new("")
-      config.after_initialize do
-        $test_after_initialize_block1 = "success"
-      end
-      config.after_initialize do
-        $test_after_initialize_block2 = "congratulations"
-      end
-      assert_nil $test_after_initialize_block1
-      assert_nil $test_after_initialize_block2
-
-      Rails::Initializer.any_instance.expects(:gems_dependencies_loaded).returns(true)
-      Rails::Initializer.run(:after_initialize, config)
+class Initializer_after_initialize_with_blocks_environment_Test < Test::Unit::TestCase
+  def setup
+    config = ConfigurationMock.new("")
+    config.after_initialize do
+      $test_after_initialize_block1 = "success"
     end
-
-    def teardown
-      $test_after_initialize_block1 = nil
-      $test_after_initialize_block2 = nil
+    config.after_initialize do
+      $test_after_initialize_block2 = "congratulations"
     end
+    assert_nil $test_after_initialize_block1
+    assert_nil $test_after_initialize_block2
 
-    def test_should_have_called_the_first_after_initialize_block
-      assert_equal "success", $test_after_initialize_block1
-    end
+    Rails::Initializer.any_instance.expects(:gems_dependencies_loaded).returns(true)
+    Rails::Initializer.run(:after_initialize, config)
+  end
 
-    def test_should_have_called_the_second_after_initialize_block
-      assert_equal "congratulations", $test_after_initialize_block2
-    end
+  def teardown
+    $test_after_initialize_block1 = nil
+    $test_after_initialize_block2 = nil
   end
 
-  class Initializer_after_initialize_with_no_block_environment_Test < Test::Unit::TestCase
-    def setup
-      config = ConfigurationMock.new("")
-      config.after_initialize do
-        $test_after_initialize_block1 = "success"
-      end
-      config.after_initialize # don't pass a block, this is what we're testing!
-      config.after_initialize do
-        $test_after_initialize_block2 = "congratulations"
-      end
-      assert_nil $test_after_initialize_block1
+  def test_should_have_called_the_first_after_initialize_block
+    assert_equal "success", $test_after_initialize_block1
+  end
 
-      Rails::Initializer.any_instance.expects(:gems_dependencies_loaded).returns(true)
-      Rails::Initializer.run(:after_initialize, config)
-    end
+  def test_should_have_called_the_second_after_initialize_block
+    assert_equal "congratulations", $test_after_initialize_block2
+  end
+end
 
-    def teardown
-      $test_after_initialize_block1 = nil
-      $test_after_initialize_block2 = nil
+class Initializer_after_initialize_with_no_block_environment_Test < Test::Unit::TestCase
+  def setup
+    config = ConfigurationMock.new("")
+    config.after_initialize do
+      $test_after_initialize_block1 = "success"
     end
-
-    def test_should_have_called_the_first_after_initialize_block
-      assert_equal "success", $test_after_initialize_block1, "should still get set"
+    config.after_initialize # don't pass a block, this is what we're testing!
+    config.after_initialize do
+      $test_after_initialize_block2 = "congratulations"
     end
+    assert_nil $test_after_initialize_block1
 
-    def test_should_have_called_the_second_after_initialize_block
-      assert_equal "congratulations", $test_after_initialize_block2
-    end
+    Rails::Initializer.any_instance.expects(:gems_dependencies_loaded).returns(true)
+    Rails::Initializer.run(:after_initialize, config)
+  end
+
+  def teardown
+    $test_after_initialize_block1 = nil
+    $test_after_initialize_block2 = nil
+  end
+
+  def test_should_have_called_the_first_after_initialize_block
+    assert_equal "success", $test_after_initialize_block1, "should still get set"
+  end
+
+  def test_should_have_called_the_second_after_initialize_block
+    assert_equal "congratulations", $test_after_initialize_block2
   end
 end
 
-uses_mocha 'framework paths' do
-  class ConfigurationFrameworkPathsTests < Test::Unit::TestCase
-    def setup
-      @config = Rails::Configuration.new
-      @config.frameworks.clear
+class ConfigurationFrameworkPathsTests < Test::Unit::TestCase
+  def setup
+    @config = Rails::Configuration.new
+    @config.frameworks.clear
 
-      File.stubs(:directory?).returns(true)
-      @config.stubs(:framework_root_path).returns('')
-    end
+    File.stubs(:directory?).returns(true)
+    @config.stubs(:framework_root_path).returns('')
+  end
 
-    def test_minimal
-      expected = %w(
-        /railties
-        /railties/lib
-        /activesupport/lib
-      )
-      assert_equal expected, @config.framework_paths
-    end
+  def test_minimal
+    expected = %w(
+      /railties
+      /railties/lib
+      /activesupport/lib
+    )
+    assert_equal expected, @config.framework_paths
+  end
 
-    def test_actioncontroller_or_actionview_add_actionpack
-      @config.frameworks << :action_controller
-      assert_framework_path '/actionpack/lib'
+  def test_actioncontroller_or_actionview_add_actionpack
+    @config.frameworks << :action_controller
+    assert_framework_path '/actionpack/lib'
 
-      @config.frameworks = [:action_view]
-      assert_framework_path '/actionpack/lib'
-    end
+    @config.frameworks = [:action_view]
+    assert_framework_path '/actionpack/lib'
+  end
 
-    def test_paths_for_ar_ares_and_mailer
-      [:active_record, :action_mailer, :active_resource, :action_web_service].each do |framework|
-        @config.frameworks = [framework]
-        assert_framework_path "/#{framework.to_s.gsub('_', '')}/lib"
-      end
+  def test_paths_for_ar_ares_and_mailer
+    [:active_record, :action_mailer, :active_resource, :action_web_service].each do |framework|
+      @config.frameworks = [framework]
+      assert_framework_path "/#{framework.to_s.gsub('_', '')}/lib"
     end
+  end
 
-    def test_unknown_framework_raises_error
-      @config.frameworks << :action_foo
-      initializer = Rails::Initializer.new @config
-      initializer.expects(:require).raises(LoadError)
+  def test_unknown_framework_raises_error
+    @config.frameworks << :action_foo
+    initializer = Rails::Initializer.new @config
+    initializer.expects(:require).raises(LoadError)
 
-      assert_raise RuntimeError do
-        initializer.send :require_frameworks
-      end
+    assert_raise RuntimeError do
+      initializer.send :require_frameworks
     end
+  end
 
-    def test_action_mailer_load_paths_set_only_if_action_mailer_in_use
-      @config.frameworks = [:action_controller]
-      initializer = Rails::Initializer.new @config
-      initializer.send :require_frameworks
+  def test_action_mailer_load_paths_set_only_if_action_mailer_in_use
+    @config.frameworks = [:action_controller]
+    initializer = Rails::Initializer.new @config
+    initializer.send :require_frameworks
 
-      assert_nothing_raised NameError do
-        initializer.send :load_view_paths
-      end
+    assert_nothing_raised NameError do
+      initializer.send :load_view_paths
     end
+  end
 
-    def test_action_controller_load_paths_set_only_if_action_controller_in_use
-      @config.frameworks = []
-      initializer = Rails::Initializer.new @config
-      initializer.send :require_frameworks
+  def test_action_controller_load_paths_set_only_if_action_controller_in_use
+    @config.frameworks = []
+    initializer = Rails::Initializer.new @config
+    initializer.send :require_frameworks
 
-      assert_nothing_raised NameError do
-        initializer.send :load_view_paths
-      end
+    assert_nothing_raised NameError do
+      initializer.send :load_view_paths
     end
-
-    protected
-      def assert_framework_path(path)
-        assert @config.framework_paths.include?(path),
-          "<#{path.inspect}> not found among <#{@config.framework_paths.inspect}>"
-      end
   end
+
+  protected
+    def assert_framework_path(path)
+      assert @config.framework_paths.include?(path),
+        "<#{path.inspect}> not found among <#{@config.framework_paths.inspect}>"
+    end
 end
 
-uses_mocha "Initializer plugin loading tests" do
-  require File.dirname(__FILE__) + '/plugin_test_helper'
+require File.dirname(__FILE__) + '/plugin_test_helper'
 
-  class InitializerPluginLoadingTests < Test::Unit::TestCase
-    def setup
-      @configuration     = Rails::Configuration.new
-      @configuration.plugin_paths << plugin_fixture_root_path
-      @initializer       = Rails::Initializer.new(@configuration)
-      @valid_plugin_path = plugin_fixture_path('default/stubby')
-      @empty_plugin_path = plugin_fixture_path('default/empty')
-    end
+class InitializerPluginLoadingTests < Test::Unit::TestCase
+  def setup
+    @configuration     = Rails::Configuration.new
+    @configuration.frameworks -= [:action_mailer]
+    @configuration.plugin_paths << plugin_fixture_root_path
+    @initializer       = Rails::Initializer.new(@configuration)
+    @valid_plugin_path = plugin_fixture_path('default/stubby')
+    @empty_plugin_path = plugin_fixture_path('default/empty')
+  end
 
-    def test_no_plugins_are_loaded_if_the_configuration_has_an_empty_plugin_list
-      only_load_the_following_plugins! []
-      @initializer.load_plugins
-      assert_equal [], @initializer.loaded_plugins
-    end
+  def test_no_plugins_are_loaded_if_the_configuration_has_an_empty_plugin_list
+    only_load_the_following_plugins! []
+    @initializer.load_plugins
+    assert_equal [], @initializer.loaded_plugins
+  end
 
-    def test_only_the_specified_plugins_are_located_in_the_order_listed
-      plugin_names = [:plugin_with_no_lib_dir, :acts_as_chunky_bacon]
-      only_load_the_following_plugins! plugin_names
-      load_plugins!
-      assert_plugins plugin_names, @initializer.loaded_plugins
-    end
+  def test_only_the_specified_plugins_are_located_in_the_order_listed
+    plugin_names = [:plugin_with_no_lib_dir, :acts_as_chunky_bacon]
+    only_load_the_following_plugins! plugin_names
+    load_plugins!
+    assert_plugins plugin_names, @initializer.loaded_plugins
+  end
 
-    def test_all_plugins_are_loaded_when_registered_plugin_list_is_untouched
-      failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
-      load_plugins!
-      assert_plugins [:a, :acts_as_chunky_bacon, :engine, :gemlike, :plugin_with_no_lib_dir, :stubby], @initializer.loaded_plugins, failure_tip
-    end
+  def test_all_plugins_are_loaded_when_registered_plugin_list_is_untouched
+    failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
+    load_plugins!
+    assert_plugins [:a, :acts_as_chunky_bacon, :engine, :gemlike, :plugin_with_no_lib_dir, :stubby], @initializer.loaded_plugins, failure_tip
+  end
 
-    def test_all_plugins_loaded_when_all_is_used
-      plugin_names = [:stubby, :acts_as_chunky_bacon, :all]
-      only_load_the_following_plugins! plugin_names
-      load_plugins!
-      failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
-      assert_plugins [:stubby, :acts_as_chunky_bacon, :a, :engine, :gemlike, :plugin_with_no_lib_dir], @initializer.loaded_plugins, failure_tip
-    end
+  def test_all_plugins_loaded_when_all_is_used
+    plugin_names = [:stubby, :acts_as_chunky_bacon, :all]
+    only_load_the_following_plugins! plugin_names
+    load_plugins!
+    failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
+    assert_plugins [:stubby, :acts_as_chunky_bacon, :a, :engine, :gemlike, :plugin_with_no_lib_dir], @initializer.loaded_plugins, failure_tip
+  end
 
-    def test_all_plugins_loaded_after_all
-      plugin_names = [:stubby, :all, :acts_as_chunky_bacon]
-      only_load_the_following_plugins! plugin_names
-      load_plugins!
-      failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
-      assert_plugins [:stubby, :a, :engine, :gemlike, :plugin_with_no_lib_dir, :acts_as_chunky_bacon], @initializer.loaded_plugins, failure_tip
-    end
+  def test_all_plugins_loaded_after_all
+    plugin_names = [:stubby, :all, :acts_as_chunky_bacon]
+    only_load_the_following_plugins! plugin_names
+    load_plugins!
+    failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
+    assert_plugins [:stubby, :a, :engine, :gemlike, :plugin_with_no_lib_dir, :acts_as_chunky_bacon], @initializer.loaded_plugins, failure_tip
+  end
+
+  def test_plugin_names_may_be_strings
+    plugin_names = ['stubby', 'acts_as_chunky_bacon', :a, :plugin_with_no_lib_dir]
+    only_load_the_following_plugins! plugin_names
+    load_plugins!
+    failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
+    assert_plugins plugin_names, @initializer.loaded_plugins, failure_tip
+  end
 
-    def test_plugin_names_may_be_strings
-      plugin_names = ['stubby', 'acts_as_chunky_bacon', :a, :plugin_with_no_lib_dir]
-      only_load_the_following_plugins! plugin_names
+  def test_registering_a_plugin_name_that_does_not_exist_raises_a_load_error
+    only_load_the_following_plugins! [:stubby, :acts_as_a_non_existant_plugin]
+    assert_raise(LoadError) do
       load_plugins!
-      failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
-      assert_plugins plugin_names, @initializer.loaded_plugins, failure_tip
     end
+  end
 
-    def test_registering_a_plugin_name_that_does_not_exist_raises_a_load_error
-      only_load_the_following_plugins! [:stubby, :acts_as_a_non_existant_plugin]
-      assert_raises(LoadError) do
-        load_plugins!
+  def test_load_error_messages_mention_missing_plugins_and_no_others
+    valid_plugin_names = [:stubby, :acts_as_chunky_bacon]
+    invalid_plugin_names = [:non_existant_plugin1, :non_existant_plugin2]
+    only_load_the_following_plugins!( valid_plugin_names + invalid_plugin_names )
+    begin
+      load_plugins!
+      flunk "Expected a LoadError but did not get one"
+    rescue LoadError => e
+      failure_tip = "It's likely someone renamed or deleted plugin fixtures without updating this test"
+      assert_plugins valid_plugin_names, @initializer.loaded_plugins, failure_tip
+      invalid_plugin_names.each do |plugin|
+        assert_match(/#{plugin.to_s}/, e.message, "LoadError message should mention plugin '#{plugin}'")
+      end
+      valid_plugin_names.each do |plugin|
+        assert_no_match(/#{plugin.to_s}/, e.message, "LoadError message should not mention '#{plugin}'")
       end
+
     end
+  end
 
-    def test_should_ensure_all_loaded_plugins_load_paths_are_added_to_the_load_path
-      only_load_the_following_plugins! [:stubby, :acts_as_chunky_bacon]
+  def test_should_ensure_all_loaded_plugins_load_paths_are_added_to_the_load_path
+    only_load_the_following_plugins! [:stubby, :acts_as_chunky_bacon]
 
-      @initializer.add_plugin_load_paths
+    @initializer.add_plugin_load_paths
+
+    assert $LOAD_PATH.include?(File.join(plugin_fixture_path('default/stubby'), 'lib'))
+    assert $LOAD_PATH.include?(File.join(plugin_fixture_path('default/acts/acts_as_chunky_bacon'), 'lib'))
+  end
 
-      assert $LOAD_PATH.include?(File.join(plugin_fixture_path('default/stubby'), 'lib'))
-      assert $LOAD_PATH.include?(File.join(plugin_fixture_path('default/acts/acts_as_chunky_bacon'), 'lib'))
+  private
+
+    def load_plugins!
+      @initializer.add_plugin_load_paths
+      @initializer.load_plugins
     end
+end
 
+class InitializerSetupI18nTests < Test::Unit::TestCase
+  def test_no_config_locales_dir_present_should_return_empty_load_path
+    File.stubs(:exist?).returns(false)
+    assert_equal [], Rails::Configuration.new.i18n.load_path
+  end
 
-    private
+  def test_config_locales_dir_present_should_be_added_to_load_path
+    File.stubs(:exist?).returns(true)
+    Dir.stubs(:[]).returns([ "my/test/locale.yml" ])
+    assert_equal [ "my/test/locale.yml" ], Rails::Configuration.new.i18n.load_path
+  end
 
-      def load_plugins!
-        @initializer.add_plugin_load_paths
-        @initializer.load_plugins
-      end
+  def test_config_defaults_should_be_added_with_config_settings
+    File.stubs(:exist?).returns(true)
+    Dir.stubs(:[]).returns([ "my/test/locale.yml" ])
+
+    config = Rails::Configuration.new
+    config.i18n.load_path << "my/other/locale.yml"
+
+    assert_equal [ "my/test/locale.yml", "my/other/locale.yml" ], config.i18n.load_path
+  end
+
+  def test_config_defaults_and_settings_should_be_added_to_i18n_defaults
+    File.stubs(:exist?).returns(true)
+    Dir.stubs(:[]).returns([ "my/test/locale.yml" ])
+
+    config = Rails::Configuration.new
+    config.i18n.load_path << "my/other/locale.yml"
+
+    Rails::Initializer.run(:initialize_i18n, config)
+    assert_equal [ 
+     File.expand_path(File.dirname(__FILE__) + "/../../activesupport/lib/active_support/locale/en.yml"),
+     File.expand_path(File.dirname(__FILE__) + "/../../actionpack/lib/action_view/locale/en.yml"),
+     File.expand_path(File.dirname(__FILE__) + "/../../activerecord/lib/active_record/locale/en.yml"),
+     "my/test/locale.yml",
+     "my/other/locale.yml" ], I18n.load_path.collect { |path| path =~ /^\./ ? File.expand_path(path) : path }
+  end
+
+  def test_setting_another_default_locale
+    config = Rails::Configuration.new
+    config.i18n.default_locale = :de
+    Rails::Initializer.run(:initialize_i18n, config)
+    assert_equal :de, I18n.default_locale
   end
 end
 
-uses_mocha 'i18n settings' do
-  class InitializerSetupI18nTests < Test::Unit::TestCase
-    def test_no_config_locales_dir_present_should_return_empty_load_path
-      File.stubs(:exist?).returns(false)
-      assert_equal [], Rails::Configuration.new.i18n.load_path
-    end
+class InitializerDatabaseMiddlewareTest < Test::Unit::TestCase
+  def setup
+    @config = Rails::Configuration.new
+    @config.frameworks = [:active_record, :action_controller, :action_view]
+  end
 
-    def test_config_locales_dir_present_should_be_added_to_load_path
-      File.stubs(:exist?).returns(true)
-      Dir.stubs(:[]).returns([ "my/test/locale.yml" ])
-      assert_equal [ "my/test/locale.yml" ], Rails::Configuration.new.i18n.load_path
-    end
-    
-    def test_config_defaults_should_be_added_with_config_settings
-      File.stubs(:exist?).returns(true)
-      Dir.stubs(:[]).returns([ "my/test/locale.yml" ])
+  def test_initialize_database_middleware_doesnt_perform_anything_when_active_record_not_in_frameworks
+    @config.frameworks.clear
+    @config.expects(:middleware).never
+    Rails::Initializer.run(:initialize_database_middleware, @config)
+  end
 
-      config = Rails::Configuration.new
-      config.i18n.load_path << "my/other/locale.yml"
+  def test_database_middleware_initializes_when_session_store_is_active_record
+    store = ActionController::Base.session_store
+    ActionController::Base.session_store = ActiveRecord::SessionStore
 
-      assert_equal [ "my/test/locale.yml", "my/other/locale.yml" ], config.i18n.load_path
-    end
-    
-    def test_config_defaults_and_settings_should_be_added_to_i18n_defaults
-      File.stubs(:exist?).returns(true)
-      Dir.stubs(:[]).returns([ "my/test/locale.yml" ])
-
-      config = Rails::Configuration.new
-      config.i18n.load_path << "my/other/locale.yml"
-
-      # To bring in AV's i18n load path.
-      require 'action_view'
-
-      Rails::Initializer.run(:initialize_i18n, config)
-      assert_equal [ 
-       File.expand_path("./test/../../activesupport/lib/active_support/locale/en.yml"),
-       File.expand_path("./test/../../actionpack/lib/action_view/locale/en.yml"),
-       "my/test/locale.yml",
-       "my/other/locale.yml" ], I18n.load_path.collect { |path| path =~ /^\./ ? File.expand_path(path) : path }
-    end
+    @config.middleware.expects(:insert_before).with(:"ActiveRecord::SessionStore", ActiveRecord::ConnectionAdapters::ConnectionManagement)
+    @config.middleware.expects(:insert_before).with(:"ActiveRecord::SessionStore", ActiveRecord::QueryCache)
+
+    Rails::Initializer.run(:initialize_database_middleware, @config)
+  ensure
+    ActionController::Base.session_store = store
+  end
+
+  def test_database_middleware_doesnt_initialize_when_session_store_is_not_active_record
+    store = ActionController::Base.session_store
+    ActionController::Base.session_store = ActionDispatch::Session::CookieStore
+
+    # Define the class, so we don't have to actually make it load
+    eval("class ActiveRecord::ConnectionAdapters::ConnectionManagement; end")
+
+    @config.middleware.expects(:use).with(ActiveRecord::ConnectionAdapters::ConnectionManagement)
+    @config.middleware.expects(:use).with(ActiveRecord::QueryCache)
+
+    Rails::Initializer.run(:initialize_database_middleware, @config)
+  ensure
+    ActionController::Base.session_store = store
+  end
+end
+
+class InitializerViewPathsTest  < Test::Unit::TestCase
+  def setup
+    @config = Rails::Configuration.new
+    @config.frameworks = [:action_view, :action_controller, :action_mailer]
     
-    def test_setting_another_default_locale
-      config = Rails::Configuration.new
-      config.i18n.default_locale = :de
-      Rails::Initializer.run(:initialize_i18n, config)
-      assert_equal :de, I18n.default_locale
-    end
+    ActionController::Base.stubs(:view_paths).returns(stub)
+    ActionMailer::Base.stubs(:view_paths).returns(stub)
+  end
+  
+  def test_load_view_paths_doesnt_perform_anything_when_action_view_not_in_frameworks
+    @config.frameworks -= [:action_view]
+    ActionController::Base.view_paths.expects(:load!).never
+    ActionMailer::Base.view_paths.expects(:load!).never
+    Rails::Initializer.run(:load_view_paths, @config)
   end
 end