diff options
| author | thedarkone <nobody> | 2009-02-12 19:35:14 +0100 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-02-12 13:04:12 -0600 |
| commit | 3942cb406e1d5db0ac00e03153809cc8dc4cc4db (patch) | |
| tree | 3fda08b1509e81f209d5353180feec2086139a3f /railties | |
| parent | b1d41bdfb06cb5f606f515965316a348d9bc9b47 (diff) | |
| download | rails-3942cb406e1d5db0ac00e03153809cc8dc4cc4db.tar.gz rails-3942cb406e1d5db0ac00e03153809cc8dc4cc4db.tar.bz2 rails-3942cb406e1d5db0ac00e03153809cc8dc4cc4db.zip | |
Port fast reloadable templates from rails-dev-boost.
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/environments/test.rb | 1 | ||||
| -rw-r--r-- | railties/lib/initializer.rb | 6 | ||||
| -rw-r--r-- | railties/test/plugin_loader_test.rb | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/railties/environments/test.rb b/railties/environments/test.rb index 496eb9572b..d6f80a4080 100644 --- a/railties/environments/test.rb +++ b/railties/environments/test.rb @@ -12,6 +12,7 @@ config.whiny_nils = true # Show full error reports and disable caching config.action_controller.consider_all_requests_local = true config.action_controller.perform_caching = false +config.action_view.cache_template_loading = true # Disable request forgery protection in test environment config.action_controller.allow_forgery_protection = false diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index c4c55a97eb..281b074e0a 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -369,8 +369,8 @@ Run `rake gems:install` to install the missing gems. def load_view_paths if configuration.frameworks.include?(:action_view) - ActionController::Base.view_paths.each { |path| path.load! } if configuration.frameworks.include?(:action_controller) - ActionMailer::Base.template_root.load! if configuration.frameworks.include?(:action_mailer) + ActionController::Base.view_paths.load! if configuration.frameworks.include?(:action_controller) + ActionMailer::Base.view_paths.load! if configuration.frameworks.include?(:action_mailer) end end @@ -478,7 +478,7 @@ Run `rake gems:install` to install the missing gems. # set to use Configuration#view_path. def initialize_framework_views if configuration.frameworks.include?(:action_view) - view_path = ActionView::Template::Path.new(configuration.view_path) + view_path = ActionView::PathSet.type_cast(configuration.view_path) ActionMailer::Base.template_root ||= view_path if configuration.frameworks.include?(:action_mailer) ActionController::Base.view_paths = view_path if configuration.frameworks.include?(:action_controller) && ActionController::Base.view_paths.empty? end diff --git a/railties/test/plugin_loader_test.rb b/railties/test/plugin_loader_test.rb index 23b81ddbf6..59491fe99e 100644 --- a/railties/test/plugin_loader_test.rb +++ b/railties/test/plugin_loader_test.rb @@ -130,7 +130,7 @@ class TestPluginLoader < Test::Unit::TestCase @loader.send :add_engine_view_paths - assert_equal [ File.join(plugin_fixture_path('engines/engine'), 'app', 'views') ], ActionController::Base.view_paths + assert_equal [ File.join(plugin_fixture_path('engines/engine'), 'app', 'views').sub(/\A\.\//, '') ], ActionController::Base.view_paths end def test_should_add_plugin_load_paths_to_Dependencies_load_once_paths |