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

Conflicts:
	activesupport/lib/active_support/testing/performance.rb

1 files changed, 11 insertions, 0 deletions

diff --git a/actionpack/test/template/lookup_context_test.rb b/actionpack/test/template/lookup_context_test.rb
index ff94cba59f..f34a40795a 100644
--- a/actionpack/test/template/lookup_context_test.rb
+++ b/actionpack/test/template/lookup_context_test.rb
@@ -51,6 +51,11 @@ class LookupContextTest < ActiveSupport::TestCase
     assert_equal Mime::SET, @lookup_context.formats
   end
 
+  test "handles explicitly defined */* formats fallback to :js" do
+    @lookup_context.formats = [:js, Mime::ALL]
+    assert_equal [:js, *Mime::SET.symbols], @lookup_context.formats
+  end
+
   test "adds :html fallback to :js formats" do
     @lookup_context.formats = [:js]
     assert_equal [:js, :html], @lookup_context.formats
@@ -180,6 +185,12 @@ class LookupContextTest < ActiveSupport::TestCase
 
     assert_not_equal template, old_template
   end
+  
+  test "responds to #prefixes" do
+    assert_equal [], @lookup_context.prefixes
+    @lookup_context.prefixes = ["foo"]
+    assert_equal ["foo"], @lookup_context.prefixes
+  end
 end
 
 class LookupContextWithFalseCaching < ActiveSupport::TestCase