From ae3f05e933ec4c42e215c853f17b5bf57e2ed451 Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Tue, 14 Jan 2020 09:49:11 +0900
Subject: [PATCH] Fix `test_vanilla_cookie_with_expires_set_relatively` failure

Lost the fix when resolving conflict.
---
 actionpack/test/dispatch/cookies_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
index 758c70737b13..d262dd869606 100644
--- a/actionpack/test/dispatch/cookies_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -1320,7 +1320,7 @@ def test_encrypted_cookie_does_not_embed_expiration_if_config_is_set_to_false
   def test_vanilla_cookie_with_expires_set_relatively
     travel_to Time.utc(2017, 8, 15) do
       get :cookie_expires_in_two_hours
-      assert_cookie_header "user_name=assain; path=/; expires=Tue, 15 Aug 2017 02:00:00 -0000"
+      assert_cookie_header "user_name=assain; path=/; expires=Tue, 15 Aug 2017 02:00:00 GMT"
     end
   end