From 8f0541b702f023c3c0841a47747ba0c793fcbb17 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 13 Aug 2012 13:57:26 -0400
Subject: live response headers can be merged with a hash

---
 actionpack/test/dispatch/live_response_test.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/live_response_test.rb b/actionpack/test/dispatch/live_response_test.rb
index 87a6b1383d..153f58c42c 100644
--- a/actionpack/test/dispatch/live_response_test.rb
+++ b/actionpack/test/dispatch/live_response_test.rb
@@ -8,6 +8,12 @@ module ActionController
         @response = Live::Response.new
       end
 
+      def test_header_merge
+        header = @response.header.merge('Foo' => 'Bar')
+        assert_kind_of(ActionController::Live::Response::Header, header)
+        refute_equal header, @response.header
+      end
+
       def test_parallel
         latch = ActiveSupport::Concurrency::Latch.new
 
-- 
cgit v1.2.3