Merge branch 'master' of git@github.com:rails/rails

5 files changed, 117 insertions, 15 deletions

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index cbf7351172..51697fda2f 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -31,8 +31,8 @@ ActionController::Base.logger = nil
 ActionController::Routing::Routes.reload rescue nil
 
 FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
-ActionView::PathSet::Path.eager_load_templates!
 ActionController::Base.view_paths = FIXTURE_LOAD_PATH
+ActionController::Base.view_paths.load
 
 def uses_mocha(test_name)
   yield
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index 61c20f8299..18c01f755c 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -3,6 +3,10 @@ require 'abstract_unit'
 # The view_paths array must be set on Base and not LayoutTest so that LayoutTest's inherited
 # method has access to the view_paths array when looking for a layout to automatically assign.
 old_load_paths = ActionController::Base.view_paths
+
+ActionView::Template::register_template_handler :mab,
+  lambda { |template| template.source.inspect }
+
 ActionController::Base.view_paths = [ File.dirname(__FILE__) + '/../fixtures/layout_tests/' ]
 
 class LayoutTest < ActionController::Base
@@ -31,9 +35,6 @@ end
 class MultipleExtensions < LayoutTest
 end
 
-ActionView::Template::register_template_handler :mab,
-  lambda { |template| template.source.inspect }
-
 class LayoutAutoDiscoveryTest < ActionController::TestCase
   def setup
     @request.host = "www.nextangle.com"
@@ -52,10 +53,9 @@ class LayoutAutoDiscoveryTest < ActionController::TestCase
   end
 
   def test_third_party_template_library_auto_discovers_layout
-    ThirdPartyTemplateLibraryController.view_paths.reload!
     @controller = ThirdPartyTemplateLibraryController.new
     get :hello
-    assert_equal 'layouts/third_party_template_library', @controller.active_layout
+    assert_equal 'layouts/third_party_template_library.mab', @controller.active_layout.to_s
     assert_equal 'layouts/third_party_template_library', @response.layout
     assert_response :success
     assert_equal 'Mab', @response.body
@@ -64,14 +64,14 @@ class LayoutAutoDiscoveryTest < ActionController::TestCase
   def test_namespaced_controllers_auto_detect_layouts
     @controller = ControllerNameSpace::NestedController.new
     get :hello
-    assert_equal 'layouts/controller_name_space/nested', @controller.active_layout
+    assert_equal 'layouts/controller_name_space/nested', @controller.active_layout.to_s
     assert_equal 'controller_name_space/nested.rhtml hello.rhtml', @response.body
   end
 
   def test_namespaced_controllers_auto_detect_layouts
     @controller = MultipleExtensions.new
     get :hello
-    assert_equal 'layouts/multiple_extensions', @controller.active_layout
+    assert_equal 'layouts/multiple_extensions.html.erb', @controller.active_layout.to_s
     assert_equal 'multiple_extensions.html.erb hello.rhtml', @response.body.strip
   end
 end
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 2c0caef583..7597927f6d 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -359,6 +359,46 @@ class AssetTagHelperTest < ActionView::TestCase
     FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'secure.js'))
   end
 
+  def test_caching_javascript_include_tag_when_caching_on_with_2_argument_object_asset_host
+    ENV['RAILS_ASSET_ID'] = ''
+    ActionController::Base.asset_host = Class.new do
+      def call(source, request)
+        if request.ssl?
+          "#{request.protocol}#{request.host_with_port}"
+        else
+          "#{request.protocol}assets#{source.length}.example.com"
+        end
+      end
+    end.new
+
+    ActionController::Base.perform_caching = true
+
+    assert_equal '/javascripts/vanilla.js'.length, 23
+    assert_dom_equal(
+      %(<script src="http://assets23.example.com/javascripts/vanilla.js" type="text/javascript"></script>),
+      javascript_include_tag(:all, :cache => 'vanilla')
+    )
+
+    assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'vanilla.js'))
+
+    class << @controller.request
+      def protocol() 'https://' end
+      def ssl?() true end
+    end
+
+    assert_equal '/javascripts/secure.js'.length, 22
+    assert_dom_equal(
+      %(<script src="https://localhost/javascripts/secure.js" type="text/javascript"></script>),
+      javascript_include_tag(:all, :cache => 'secure')
+    )
+
+    assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'secure.js'))
+
+  ensure
+    FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'vanilla.js'))
+    FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'secure.js'))
+  end
+
   def test_caching_javascript_include_tag_when_caching_on_and_using_subdirectory
     ENV["RAILS_ASSET_ID"] = ""
     ActionController::Base.asset_host = 'http://a%d.example.com'
diff --git a/actionpack/test/template/compiled_templates_test.rb b/actionpack/test/template/compiled_templates_test.rb
index f7688b2072..a68b09bb45 100644
--- a/actionpack/test/template/compiled_templates_test.rb
+++ b/actionpack/test/template/compiled_templates_test.rb
@@ -30,8 +30,8 @@ uses_mocha 'TestTemplateRecompilation' do
       assert_equal "Hello world!", render(:file => "test/hello_world.erb")
     end
 
-    def test_compiled_template_will_always_be_recompiled_when_eager_loaded_templates_is_off
-      ActionView::PathSet::Path.expects(:eager_load_templates?).times(4).returns(false)
+    def test_compiled_template_will_always_be_recompiled_when_template_is_not_cached
+      ActionView::Template.any_instance.expects(:loaded?).times(3).returns(false)
       assert_equal 0, @compiled_templates.instance_methods.size
       assert_equal "Hello world!", render(:file => "#{FIXTURE_LOAD_PATH}/test/hello_world.erb")
       ActionView::Template.any_instance.expects(:compile!).times(3)
@@ -39,9 +39,48 @@ uses_mocha 'TestTemplateRecompilation' do
       assert_equal 1, @compiled_templates.instance_methods.size
     end
 
+    def test_template_changes_are_not_reflected_with_cached_templates
+      assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+      modify_template "test/hello_world.erb", "Goodbye world!" do
+        assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+      end
+      assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+    end
+
+    def test_template_changes_are_reflected_with_uncached_templates
+      assert_equal "Hello world!", render_without_cache(:file => "test/hello_world.erb")
+      modify_template "test/hello_world.erb", "Goodbye world!" do
+        assert_equal "Goodbye world!", render_without_cache(:file => "test/hello_world.erb")
+      end
+      assert_equal "Hello world!", render_without_cache(:file => "test/hello_world.erb")
+    end
+
     private
       def render(*args)
-        ActionView::Base.new(ActionController::Base.view_paths, {}).render(*args)
+        render_with_cache(*args)
+      end
+
+      def render_with_cache(*args)
+        view_paths = ActionController::Base.view_paths
+        assert view_paths.first.loaded?
+        ActionView::Base.new(view_paths, {}).render(*args)
+      end
+
+      def render_without_cache(*args)
+        view_paths = ActionView::Base.process_view_paths(FIXTURE_LOAD_PATH)
+        assert !view_paths.first.loaded?
+        ActionView::Base.new(view_paths, {}).render(*args)
+      end
+
+      def modify_template(template, content)
+        filename = "#{FIXTURE_LOAD_PATH}/#{template}"
+        old_content = File.read(filename)
+        begin
+          File.open(filename, "wb+") { |f| f.write(content) }
+          yield
+        ensure
+          File.open(filename, "wb+") { |f| f.write(old_content) }
+        end
       end
   end
 end
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index b316d5c23e..9e827abbca 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -1,10 +1,10 @@
 require 'abstract_unit'
 require 'controller/fake_models'
 
-class ViewRenderTest < Test::Unit::TestCase
-  def setup
+module RenderTestCases
+  def setup_view(paths)
     @assigns = { :secret => 'in the sauce' }
-    @view = ActionView::Base.new(ActionController::Base.view_paths, @assigns)
+    @view = ActionView::Base.new(paths, @assigns)
   end
 
   def test_render_file
@@ -157,7 +157,7 @@ class ViewRenderTest < Test::Unit::TestCase
   end
 
   def test_render_fallbacks_to_erb_for_unknown_types
-    assert_equal "Hello, World!", @view.render(:inline => "Hello, World!", :type => :foo)
+    assert_equal "Hello, World!", @view.render(:inline => "Hello, World!", :type => :bar)
   end
 
   CustomHandler = lambda do |template|
@@ -196,3 +196,26 @@ class ViewRenderTest < Test::Unit::TestCase
       @view.render(:file => "test/nested_layout.erb", :layout => "layouts/yield")
   end
 end
+
+class CachedViewRenderTest < Test::Unit::TestCase
+  include RenderTestCases
+
+  # Ensure view path cache is primed
+  def setup
+    view_paths = ActionController::Base.view_paths
+    assert view_paths.first.loaded?
+    setup_view(view_paths)
+  end
+end
+
+class LazyViewRenderTest < Test::Unit::TestCase
+  include RenderTestCases
+
+  # Test the same thing as above, but make sure the view path
+  # is not eager loaded
+  def setup
+    view_paths = ActionView::Base.process_view_paths(FIXTURE_LOAD_PATH)
+    assert !view_paths.first.loaded?
+    setup_view(view_paths)
+  end
+end