live response headers can be merged with a hash

rails · Aug 13, 2012 · 8f0541b · 8f0541b
1 parent 621e079
commit 8f0541b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb
@@ -72,6 +72,10 @@ def []=(k,v)
           super
         end
 
+        def merge(other)
+          self.class.new @response, __getobj__.merge(other)
+        end
+
         def to_hash
           __getobj__.dup
         end

diff --git a/actionpack/test/dispatch/live_response_test.rb b/actionpack/test/dispatch/live_response_test.rb
@@ -8,6 +8,12 @@ def setup
         @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