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

1 files changed, 42 insertions, 24 deletions

diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
index 0a18741f0c..ddfa3df552 100644
--- a/actionpack/test/controller/log_subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -16,10 +16,6 @@ module Another
       send_data "cool data", :filename => "file.txt"
     end
 
-    def xfile_sender
-      send_file File.expand_path("company.rb", FIXTURE_LOAD_PATH), :x_sendfile => true
-    end
-
     def file_sender
       send_file File.expand_path("company.rb", FIXTURE_LOAD_PATH)
     end
@@ -28,10 +24,19 @@ module Another
       render :inline => "<%= cache('foo'){ 'bar' } %>"
     end
 
+    def with_fragment_cache_and_percent_in_key
+      render :inline => "<%= cache('foo%bar'){ 'Contains % sign in key' } %>"
+    end
+
     def with_page_cache
       cache_page("Super soaker", "/index.html")
       render :nothing => true
     end
+    
+    def with_exception
+      raise Exception
+    end
+    
   end
 end
 
@@ -72,8 +77,8 @@ class ACLogSubscriberTest < ActionController::TestCase
     get :show
     wait
     assert_equal 2, logs.size
-    assert_match /Completed/, logs.last
-    assert_match /200 OK/, logs.last
+    assert_match(/Completed/, logs.last)
+    assert_match(/200 OK/, logs.last)
   end
 
   def test_process_action_without_parameters
@@ -93,7 +98,7 @@ class ACLogSubscriberTest < ActionController::TestCase
   def test_process_action_with_view_runtime
     get :show
     wait
-    assert_match /\(Views: [\d\.]+ms\)/, logs[1]
+    assert_match(/\(Views: [\d.]+ms\)/, logs[1])
   end
 
   def test_process_action_with_filter_parameters
@@ -103,9 +108,9 @@ class ACLogSubscriberTest < ActionController::TestCase
     wait
 
     params = logs[1]
-    assert_match /"amount"=>"\[FILTERED\]"/, params
-    assert_match /"lifo"=>"\[FILTERED\]"/, params
-    assert_match /"step"=>"1"/, params
+    assert_match(/"amount"=>"\[FILTERED\]"/, params)
+    assert_match(/"lifo"=>"\[FILTERED\]"/, params)
+    assert_match(/"step"=>"1"/, params)
   end
 
   def test_redirect_to
@@ -121,7 +126,7 @@ class ACLogSubscriberTest < ActionController::TestCase
     wait
 
     assert_equal 3, logs.size
-    assert_match /Sent data file\.txt/, logs[1]
+    assert_match(/Sent data file\.txt/, logs[1])
   end
 
   def test_send_file
@@ -129,27 +134,30 @@ class ACLogSubscriberTest < ActionController::TestCase
     wait
 
     assert_equal 3, logs.size
-    assert_match /Sent file/, logs[1]
-    assert_match /test\/fixtures\/company\.rb/, logs[1]
+    assert_match(/Sent file/, logs[1])
+    assert_match(/test\/fixtures\/company\.rb/, logs[1])
   end
 
-  def test_send_xfile
-    assert_deprecated { get :xfile_sender }
+  def test_with_fragment_cache
+    @controller.config.perform_caching = true
+    get :with_fragment_cache
     wait
 
-    assert_equal 3, logs.size
-    assert_match /Sent file/, logs[1]
-    assert_match /test\/fixtures\/company\.rb/, logs[1]
+    assert_equal 4, logs.size
+    assert_match(/Read fragment views\/foo/, logs[1])
+    assert_match(/Write fragment views\/foo/, logs[2])
+  ensure
+    @controller.config.perform_caching = true
   end
 
-  def test_with_fragment_cache
+  def test_with_fragment_cache_and_percent_in_key
     @controller.config.perform_caching = true
-    get :with_fragment_cache
+    get :with_fragment_cache_and_percent_in_key
     wait
 
     assert_equal 4, logs.size
-    assert_match /Exist fragment\? views\/foo/, logs[1]
-    assert_match /Write fragment views\/foo/, logs[2]
+    assert_match(/Read fragment views\/foo/, logs[1])
+    assert_match(/Write fragment views\/foo/, logs[2])
   ensure
     @controller.config.perform_caching = true
   end
@@ -160,12 +168,22 @@ class ACLogSubscriberTest < ActionController::TestCase
     wait
 
     assert_equal 3, logs.size
-    assert_match /Write page/, logs[1]
-    assert_match /\/index\.html/, logs[1]
+    assert_match(/Write page/, logs[1])
+    assert_match(/\/index\.html/, logs[1])
   ensure
     @controller.config.perform_caching = true
   end
 
+  def test_process_action_with_exception_includes_http_status_code
+    begin
+      get :with_exception
+      wait
+    rescue Exception
+    end
+    assert_equal 2, logs.size
+    assert_match(/Completed 500/, logs.last)
+  end
+
   def logs
     @logs ||= @logger.logged(:info)
   end