ci: fix ci - remove append_as_bytes logic, misc changes (#3861)

MSP-Greg · web-flow · commit b8c4783cc1ed · 2026-01-20T11:03:06.000+09:00
* ci: puma_socket.rb - remove `append_as_bytes` logic

* ci: response.rb - misc update

* ci: test_puma_server.rb  - use `assert_includes`

* ci: test_puma_server_hijack.rb - use `headers`
diff --git a/test/helpers/test_puma/puma_socket.rb b/test/helpers/test_puma/puma_socket.rb
@@ -239,22 +239,14 @@ def skt_closed_by_server(socket)
             end
             if no_body && part.end_with?(RESP_SPLIT)
               response.times = times
-              if HAS_APPEND_AS_BYTES
-                return response.append_as_bytes(part)
-              else
-                return response << part.b
-              end
+              return response << part
             end
 
             unless content_length || chunked
               chunked ||= part.downcase.include? "\r\ntransfer-encoding: chunked\r\n"
               content_length = (t = part[/^Content-Length: (\d+)/i , 1]) ? t.to_i : nil
             end
-            if HAS_APPEND_AS_BYTES
-              response.append_as_bytes part
-            else
-              response << part.b
-            end
+            response << part
             hdrs, body = response.split RESP_SPLIT, 2
             unless body.nil?
               # below could be simplified, but allows for debugging...
@@ -278,12 +270,9 @@ def skt_closed_by_server(socket)
             to = time_end - Process.clock_gettime(Process::CLOCK_MONOTONIC)
             self.to_io.wait_writable to
           when nil
-            if response.empty?
-              raise EOFError
-            else
-              response.times = times
-              return response
-            end
+            raise EOFError if response.empty?
+            response.times = times
+            return response
           end
           timeout = time_end - Process.clock_gettime(Process::CLOCK_MONOTONIC)
           if timeout <= 0
diff --git a/test/helpers/test_puma/response.rb b/test/helpers/test_puma/response.rb
@@ -28,7 +28,7 @@ def headers_hash
     end
 
     def status
-      headers
+      headers unless @status
       @status
     end
 
diff --git a/test/test_puma_server.rb b/test/test_puma_server.rb
@@ -1630,7 +1630,7 @@ def assert_does_not_allow_http_injection(app, opts = {})
 
     response = send_http_read_response "HEAD / HTTP/1.0\r\n\r\n"
 
-    refute_match(/[\r\n]Cookie: hack[\r\n]/, response)
+    refute_includes response.headers, 'Cookie: hack'
   end
 
   # HTTP Injection Tests
diff --git a/test/test_puma_server_hijack.rb b/test/test_puma_server_hijack.rb
@@ -100,7 +100,7 @@ def test_101_body
     echo_msg = "This should echo..."
     sock.syswrite echo_msg
 
-    assert_includes response, 'connection: Upgrade'
+    assert_includes response.headers, 'connection: Upgrade'
     sock.wait_readable 0.2 # for TruffleRuby Errno::EAGAIN
     assert_equal echo_msg, sock.sysread(256)
   end
@@ -129,7 +129,7 @@ def test_101_header
     echo_msg = "This should echo..."
     sock.syswrite echo_msg
 
-    assert_includes response, 'connection: Upgrade'
+    assert_includes response.headers, 'connection: Upgrade'
     sock.wait_readable 0.2 # for TruffleRuby Errno::EAGAIN
     assert_equal echo_msg, sock.sysread(256)
   end
