push header merge down to a private method so that live responses can have their own header object

1 files changed, 11 insertions, 0 deletions

diff --git a/actionpack/test/dispatch/live_response_test.rb b/actionpack/test/dispatch/live_response_test.rb
index 153f58c42c..e16f23914b 100644
--- a/actionpack/test/dispatch/live_response_test.rb
+++ b/actionpack/test/dispatch/live_response_test.rb
@@ -14,6 +14,17 @@ module ActionController
         refute_equal header, @response.header
       end
 
+      def test_initialize_with_default_headers
+        r = Class.new(Live::Response) do
+          def self.default_headers
+            { 'omg' => 'g' }
+          end
+        end
+
+        header = r.new.header
+        assert_kind_of(ActionController::Live::Response::Header, header)
+      end
+
       def test_parallel
         latch = ActiveSupport::Concurrency::Latch.new