Merge branch 'master' of https://github.com/rails/rails

1 files changed, 120 insertions, 13 deletions

diff --git a/actionpack/test/template/lookup_context_test.rb b/actionpack/test/template/lookup_context_test.rb
index cc71cb42d0..8d063e66b0 100644
--- a/actionpack/test/template/lookup_context_test.rb
+++ b/actionpack/test/template/lookup_context_test.rb
@@ -47,7 +47,7 @@ class LookupContextTest < ActiveSupport::TestCase
   end
 
   test "handles */* formats" do
-    @lookup_context.formats = [:"*/*"]
+    @lookup_context.formats = ["*/*"]
     assert_equal Mime::SET, @lookup_context.formats
   end
 
@@ -73,25 +73,25 @@ class LookupContextTest < ActiveSupport::TestCase
       assert_equal :pt, I18n.locale
       assert_equal :pt, @lookup_context.locale
     ensure
-      I18n.config = I18n.config.i18n_config
+      I18n.config = I18n.config.original_config
     end
 
     assert_equal :pt, I18n.locale
   end
 
   test "find templates using the given view paths and configured details" do
-    template = @lookup_context.find("hello_world", "test")
+    template = @lookup_context.find("hello_world", %w(test))
     assert_equal "Hello world!", template.source
 
     @lookup_context.locale = :da
-    template = @lookup_context.find("hello_world", "test")
+    template = @lookup_context.find("hello_world", %w(test))
     assert_equal "Hey verden", template.source
   end
 
   test "found templates respects given formats if one cannot be found from template or handler" do
     ActionView::Template::Handlers::ERB.expects(:default_format).returns(nil)
     @lookup_context.formats = [:text]
-    template = @lookup_context.find("hello_world", "test")
+    template = @lookup_context.find("hello_world", %w(test))
     assert_equal [:text], template.formats
   end
 
@@ -100,8 +100,8 @@ class LookupContextTest < ActiveSupport::TestCase
 
     @lookup_context.with_fallbacks do
       assert_equal 3, @lookup_context.view_paths.size
-      assert @lookup_context.view_paths.include?(ActionView::FileSystemResolver.new(""))
-      assert @lookup_context.view_paths.include?(ActionView::FileSystemResolver.new("/"))
+      assert @lookup_context.view_paths.include?(ActionView::FallbackFileSystemResolver.new(""))
+      assert @lookup_context.view_paths.include?(ActionView::FallbackFileSystemResolver.new("/"))
     end
   end
 
@@ -137,30 +137,137 @@ class LookupContextTest < ActiveSupport::TestCase
 
   test "gives the key forward to the resolver, so it can be used as cache key" do
     @lookup_context.view_paths = ActionView::FixtureResolver.new("test/_foo.erb" => "Foo")
-    template = @lookup_context.find("foo", "test", true)
+    template = @lookup_context.find("foo", %w(test), true)
     assert_equal "Foo", template.source
 
     # Now we are going to change the template, but it won't change the returned template
     # since we will hit the cache.
     @lookup_context.view_paths.first.hash["test/_foo.erb"] = "Bar"
-    template = @lookup_context.find("foo", "test", true)
+    template = @lookup_context.find("foo", %w(test), true)
     assert_equal "Foo", template.source
 
     # This time we will change the locale. The updated template should be picked since
     # lookup_context generated a new key after we changed the locale.
     @lookup_context.locale = :da
-    template = @lookup_context.find("foo", "test", true)
+    template = @lookup_context.find("foo", %w(test), true)
     assert_equal "Bar", template.source
 
     # Now we will change back the locale and it will still pick the old template.
     # This is expected because lookup_context will reuse the previous key for :en locale.
     @lookup_context.locale = :en
-    template = @lookup_context.find("foo", "test", true)
+    template = @lookup_context.find("foo", %w(test), true)
     assert_equal "Foo", template.source
 
     # Finally, we can expire the cache. And the expected template will be used.
     @lookup_context.view_paths.first.clear_cache
-    template = @lookup_context.find("foo", "test", true)
+    template = @lookup_context.find("foo", %w(test), true)
     assert_equal "Bar", template.source
   end
-end
\ No newline at end of file
+
+  test "can disable the cache on demand" do
+    @lookup_context.view_paths = ActionView::FixtureResolver.new("test/_foo.erb" => "Foo")
+    old_template = @lookup_context.find("foo", %w(test), true)
+
+    template = @lookup_context.find("foo", %w(test), true)
+    assert_equal template, old_template
+
+    assert @lookup_context.cache
+    template = @lookup_context.disable_cache do
+      assert !@lookup_context.cache
+      @lookup_context.find("foo", %w(test), true)
+    end
+    assert @lookup_context.cache
+
+    assert_not_equal template, old_template
+  end
+
+  test "data can be stored in cached templates" do
+    template = @lookup_context.find("hello_world", %w(test))
+    template.data["cached"] = "data"
+    assert_equal "Hello world!", template.source
+
+    template = @lookup_context.find("hello_world", %w(test))
+    assert_equal "data", template.data["cached"]
+    assert_equal "Hello world!", template.source
+  end
+end
+
+class LookupContextWithFalseCaching < ActiveSupport::TestCase
+  def setup
+    @resolver = ActionView::FixtureResolver.new("test/_foo.erb" => ["Foo", Time.utc(2000)])
+    @resolver.stubs(:caching?).returns(false)
+    @lookup_context = ActionView::LookupContext.new(@resolver, {})
+  end
+
+  test "templates are always found in the resolver but timestamp is checked before being compiled" do
+    template = @lookup_context.find("foo", %w(test), true)
+    assert_equal "Foo", template.source
+
+    # Now we are going to change the template, but it won't change the returned template
+    # since the timestamp is the same.
+    @resolver.hash["test/_foo.erb"][0] = "Bar"
+    template = @lookup_context.find("foo", %w(test), true)
+    assert_equal "Foo", template.source
+
+    # Now update the timestamp.
+    @resolver.hash["test/_foo.erb"][1] = Time.now.utc
+    template = @lookup_context.find("foo", %w(test), true)
+    assert_equal "Bar", template.source
+  end
+
+  test "if no template was found in the second lookup, with no cache, raise error" do
+    template = @lookup_context.find("foo", %w(test), true)
+    assert_equal "Foo", template.source
+
+    @resolver.hash.clear
+    assert_raise ActionView::MissingTemplate do
+      @lookup_context.find("foo", %w(test), true)
+    end
+  end
+
+  test "if no template was cached in the first lookup, retrieval should work in the second call" do
+    @resolver.hash.clear
+    assert_raise ActionView::MissingTemplate do
+      @lookup_context.find("foo", %w(test), true)
+    end
+
+    @resolver.hash["test/_foo.erb"] = ["Foo", Time.utc(2000)]
+    template = @lookup_context.find("foo", %w(test), true)
+    assert_equal "Foo", template.source
+  end
+
+  test "data can be stored as long as template was not updated" do
+    template = @lookup_context.find("foo", %w(test), true)
+    template.data["cached"] = "data"
+    assert_equal "Foo", template.source
+
+    template = @lookup_context.find("foo", %w(test), true)
+    assert_equal "data", template.data["cached"]
+    assert_equal "Foo", template.source
+
+    @resolver.hash["test/_foo.erb"][1] = Time.now.utc
+    template = @lookup_context.find("foo", %w(test), true)
+    assert_nil template.data["cached"]
+    assert_equal "Foo", template.source
+  end
+end
+
+class TestMissingTemplate < ActiveSupport::TestCase
+  def setup
+    @lookup_context = ActionView::LookupContext.new("/Path/to/views", {})
+  end
+
+  test "if no template was found we get a helpful error message including the inheritance chain" do
+    e = assert_raise ActionView::MissingTemplate do
+      @lookup_context.find("foo", %w(parent child))
+    end
+    assert_match %r{Missing template parent/foo, child/foo with .* Searched in:\n  \* "/Path/to/views"\n}, e.message
+  end
+
+  test "if no partial was found we get a helpful error message including the inheritance chain" do
+    e = assert_raise ActionView::MissingTemplate do
+      @lookup_context.find("foo", %w(parent child), true)
+    end
+    assert_match %r{Missing partial parent/foo, child/foo with .* Searched in:\n  \* "/Path/to/views"\n}, e.message
+  end
+end