bblimke · Feb 7, 2025 · Feb 11, 2025 · Feb 20, 2025 · Feb 20, 2025 · Mar 8, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+# 3.25.1
+
+* Fix FrozenError in Typhoeus streaming response body
+
+    Thanks to [Patrick Jaberg](https://github.com/patrickjaberg)
+
 # 3.25.0
 
 * Resolve net-http adapter deprecation Ruby 3.4

diff --git a/README.md b/README.md
@@ -1207,6 +1207,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * Jacob Frautschi
 * Christian Schmidt
 * Rodrigo Argumedo
+* Patrick Jaberg
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

diff --git a/lib/webmock/http_lib_adapters/typhoeus_hydra_adapter.rb b/lib/webmock/http_lib_adapters/typhoeus_hydra_adapter.rb
@@ -172,7 +172,7 @@ def self.request_hash(request_signature)
                 request.execute_headers_callbacks(response)
               end
               if request.respond_to?(:streaming?) && request.streaming?
-                response.options[:response_body] = ""
+                response.options[:response_body] = "".dup
                 request.on_body.each { |callback| callback.call(webmock_response.body, response) }
               end
               request.finish(response)

diff --git a/lib/webmock/version.rb b/lib/webmock/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WebMock
-  VERSION = '3.25.0' unless defined?(::WebMock::VERSION)
+  VERSION = '3.25.1' unless defined?(::WebMock::VERSION)
 end
diff --git a/spec/acceptance/async_http_client/async_http_client_spec.rb b/spec/acceptance/async_http_client/async_http_client_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 require 'acceptance/webmock_shared'
 require_relative './async_http_client_spec_helper'

diff --git a/spec/acceptance/em_http_request/em_http_request_spec.rb b/spec/acceptance/em_http_request/em_http_request_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 require 'acceptance/webmock_shared'
 require 'ostruct'

diff --git a/spec/acceptance/http_rb/http_rb_spec.rb b/spec/acceptance/http_rb/http_rb_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require "spec_helper"
 require "acceptance/webmock_shared"
 require "acceptance/http_rb/http_rb_spec_helper"

diff --git a/spec/acceptance/patron/patron_spec.rb b/spec/acceptance/patron/patron_spec.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 require 'acceptance/webmock_shared'
 

diff --git a/spec/acceptance/shared/stubbing_requests.rb b/spec/acceptance/shared/stubbing_requests.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 shared_examples_for "stubbing requests" do |*adapter_info|
   describe "when requests are stubbed" do
     describe "based on uri" do

diff --git a/spec/acceptance/typhoeus/typhoeus_hydra_spec.rb b/spec/acceptance/typhoeus/typhoeus_hydra_spec.rb
@@ -125,6 +125,19 @@
           expect(test_complete).to eq("")
         end
 
+        it "should initialize the streaming response body with a mutible (non-frozen) string" do
+          skip("This test requires a newer version of Typhoeus") unless @request.respond_to?(:on_body)
+
+          stub_request(:any, "example.com").to_return(body: "body")
+
+          @request.on_body do |body_chunk, response|
+            response.body << body_chunk
+          end
+          hydra.queue @request
+
+          expect{ hydra.run }.not_to raise_error
+        end
+
         it "should call on_headers with 2xx response" do
           body = "on_headers fired"
           stub_request(:any, "example.com").to_return(body: body, headers: {'X-Test' => '1'})

diff --git a/spec/unit/rack_response_spec.rb b/spec/unit/rack_response_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe WebMock::RackResponse do

diff --git a/spec/unit/util/parsers/json_spec.rb b/spec/unit/util/parsers/json_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe WebMock::Util::Parsers::JSON do

diff --git a/webmock.gemspec b/webmock.gemspec
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 $:.push File.expand_path('../lib', __FILE__)
 require 'webmock/version'
 
@@ -21,7 +20,7 @@ Gem::Specification.new do |s|
     'wiki_uri'          => 'https://github.com/bblimke/webmock/wiki'
   }
 
-  s.required_ruby_version = '>= 2.5'
+  s.required_ruby_version = '>= 2.6'
 
   s.add_dependency 'addressable', '>= 2.8.0'
   s.add_dependency 'crack', '>= 0.3.2'