1 files changed, 35 insertions, 27 deletions
diff --git a/actionpack/test/dispatch/header_test.rb b/actionpack/test/dispatch/header_test.rb
index 7f1ef121b7..bd2a5b35fb 100644
--- a/actionpack/test/dispatch/header_test.rb
+++ b/actionpack/test/dispatch/header_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "abstract_unit"
 
 class HeaderTest < ActiveSupport::TestCase
@@ -18,14 +20,14 @@ class HeaderTest < ActiveSupport::TestCase
       "HTTP_REFERER" => "/some/page",
       "Host" => "http://test.com")
 
-    assert_equal({"Content-Type" => "application/json",
+    assert_equal({ "Content-Type" => "application/json",
                   "HTTP_REFERER" => "/some/page",
-                  "Host" => "http://test.com"}, headers.env)
+                  "Host" => "http://test.com" }, headers.env)
   end
 
   test "#env returns the headers as env variables" do
-    assert_equal({"CONTENT_TYPE" => "text/plain",
-                  "HTTP_REFERER" => "/some/page"}, @headers.env)
+    assert_equal({ "CONTENT_TYPE" => "text/plain",
+                  "HTTP_REFERER" => "/some/page" }, @headers.env)
   end
 
   test "#each iterates through the env variables" do
@@ -44,20 +46,20 @@ class HeaderTest < ActiveSupport::TestCase
 
   test "add to multivalued headers" do
     # Sets header when not present
-    @headers.add 'Foo', '1'
-    assert_equal '1', @headers['Foo']
+    @headers.add "Foo", "1"
+    assert_equal "1", @headers["Foo"]
 
     # Ignores nil values
-    @headers.add 'Foo', nil
-    assert_equal '1', @headers['Foo']
+    @headers.add "Foo", nil
+    assert_equal "1", @headers["Foo"]
 
     # Converts value to string
-    @headers.add 'Foo', 1
-    assert_equal '1,1', @headers['Foo']
+    @headers.add "Foo", 1
+    assert_equal "1,1", @headers["Foo"]
 
     # Case-insensitive
-    @headers.add 'fOo', 2
-    assert_equal '1,1,2', @headers['foO']
+    @headers.add "fOo", 2
+    assert_equal "1,1,2", @headers["foO"]
   end
 
   test "headers can contain numbers" do
@@ -76,9 +78,9 @@ class HeaderTest < ActiveSupport::TestCase
 
   test "key?" do
     assert @headers.key?("CONTENT_TYPE")
-    assert @headers.include?("CONTENT_TYPE")
+    assert_includes @headers, "CONTENT_TYPE"
     assert @headers.key?("Content-Type")
-    assert @headers.include?("Content-Type")
+    assert_includes @headers, "Content-Type"
   end
 
   test "fetch with block" do
@@ -105,28 +107,28 @@ class HeaderTest < ActiveSupport::TestCase
   test "#merge! headers with mutation" do
     @headers.merge!("Host" => "http://example.test",
                     "Content-Type" => "text/html")
-    assert_equal({"HTTP_HOST" => "http://example.test",
+    assert_equal({ "HTTP_HOST" => "http://example.test",
                   "CONTENT_TYPE" => "text/html",
-                  "HTTP_REFERER" => "/some/page"}, @headers.env)
+                  "HTTP_REFERER" => "/some/page" }, @headers.env)
   end
 
   test "#merge! env with mutation" do
     @headers.merge!("HTTP_HOST" => "http://first.com",
                     "CONTENT_TYPE" => "text/html")
-    assert_equal({"HTTP_HOST" => "http://first.com",
+    assert_equal({ "HTTP_HOST" => "http://first.com",
                   "CONTENT_TYPE" => "text/html",
-                  "HTTP_REFERER" => "/some/page"}, @headers.env)
+                  "HTTP_REFERER" => "/some/page" }, @headers.env)
   end
 
   test "merge without mutation" do
     combined = @headers.merge("HTTP_HOST" => "http://example.com",
                               "CONTENT_TYPE" => "text/html")
-    assert_equal({"HTTP_HOST" => "http://example.com",
+    assert_equal({ "HTTP_HOST" => "http://example.com",
                   "CONTENT_TYPE" => "text/html",
-                  "HTTP_REFERER" => "/some/page"}, combined.env)
+                  "HTTP_REFERER" => "/some/page" }, combined.env)
 
-    assert_equal({"CONTENT_TYPE" => "text/plain",
-                  "HTTP_REFERER" => "/some/page"}, @headers.env)
+    assert_equal({ "CONTENT_TYPE" => "text/plain",
+                  "HTTP_REFERER" => "/some/page" }, @headers.env)
   end
 
   test "env variables with . are not modified" do
@@ -151,11 +153,17 @@ class HeaderTest < ActiveSupport::TestCase
   end
 
   test "headers directly modifies the passed environment" do
-    env = {"HTTP_REFERER" => "/"}
+    env = { "HTTP_REFERER" => "/" }
     headers = make_headers(env)
-    headers['Referer'] = "http://example.com/"
-    headers.merge! "CONTENT_TYPE" => "text/plain"
-    assert_equal({"HTTP_REFERER"=>"http://example.com/",
-                  "CONTENT_TYPE"=>"text/plain"}, env)
+    headers["Referer"] = "http://example.com/"
+    headers["CONTENT_TYPE"] = "text/plain"
+    assert_equal({ "HTTP_REFERER" => "http://example.com/",
+                  "CONTENT_TYPE" => "text/plain" }, env)
+  end
+
+  test "fetch exception" do
+    assert_raises KeyError do
+      @headers.fetch(:some_key_that_doesnt_exist)
+    end
   end
 end