3 files changed, 36 insertions, 30 deletions
diff --git a/spec/ruby/library/net-http/HTTPServerException_spec.rb b/spec/ruby/library/net-http/HTTPServerException_spec.rb
index 5e0a833fee..020d3cce85 100644
--- a/spec/ruby/library/net-http/HTTPServerException_spec.rb
+++ b/spec/ruby/library/net-http/HTTPServerException_spec.rb
@@ -3,10 +3,10 @@ require 'net/http'
 
 describe "Net::HTTPServerException" do
   it "is a subclass of Net::ProtoServerError and is warned as deprecated" do
-    -> { Net::HTTPServerException.should < Net::ProtoServerError }.should complain(/warning: constant Net::HTTPServerException is deprecated/)
+    -> { eval("Net::HTTPServerException").should < Net::ProtoServerError }.should complain(/warning: constant Net::HTTPServerException is deprecated/)
   end
 
   it "includes the Net::HTTPExceptions module and is warned as deprecated" do
-    -> { Net::HTTPServerException.should < Net::HTTPExceptions }.should complain(/warning: constant Net::HTTPServerException is deprecated/)
+    -> { eval("Net::HTTPServerException").should < Net::HTTPExceptions }.should complain(/warning: constant Net::HTTPServerException is deprecated/)
   end
 end
diff --git a/spec/ruby/library/net-http/http/post_spec.rb b/spec/ruby/library/net-http/http/post_spec.rb
index ac020bd6be..b8b8d16ad1 100644
--- a/spec/ruby/library/net-http/http/post_spec.rb
+++ b/spec/ruby/library/net-http/http/post_spec.rb
@@ -25,9 +25,11 @@ describe "Net::HTTP.post" do
     response.should be_kind_of(Net::HTTPResponse)
   end
 
-  it "sends Content-Type: application/x-www-form-urlencoded by default" do
-    response = Net::HTTP.post(URI("http://localhost:#{NetHTTPSpecs.port}/request/header"), "test=test")
-    response.body.should include({ "Content-Type" => "application/x-www-form-urlencoded" }.inspect.delete("{}"))
+  ruby_version_is ""..."4.0" do
+    it "sends Content-Type: application/x-www-form-urlencoded by default" do
+      response = Net::HTTP.post(URI("http://localhost:#{NetHTTPSpecs.port}/request/header"), "test=test")
+      response.body.should include({ "Content-Type" => "application/x-www-form-urlencoded" }.inspect.delete("{}"))
+    end
   end
 
   it "does not support HTTP Basic Auth" do
diff --git a/spec/ruby/library/net-http/httpgenericrequest/exec_spec.rb b/spec/ruby/library/net-http/httpgenericrequest/exec_spec.rb
index 7de03d7da0..a09f9d5bec 100644
--- a/spec/ruby/library/net-http/httpgenericrequest/exec_spec.rb
+++ b/spec/ruby/library/net-http/httpgenericrequest/exec_spec.rb
@@ -31,18 +31,20 @@ describe "Net::HTTPGenericRequest#exec when passed socket, version, path" do
   end
 
   describe "when a request body is set" do
-    it "sets the 'Content-Type' header to 'application/x-www-form-urlencoded' unless the 'Content-Type' header is supplied" do
-      request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path")
-      request.body = "Some Content"
-
-      request.exec(@buffered_socket, "1.1", "/some/other/path")
-      str = @socket.string
-
-      str.should =~ %r[POST /some/other/path HTTP/1.1\r\n]
-      str.should =~ %r[Accept: \*/\*\r\n]
-      str.should =~ %r[Content-Type: application/x-www-form-urlencoded\r\n]
-      str.should =~ %r[Content-Length: 12\r\n]
-      str[-16..-1].should == "\r\n\r\nSome Content"
+    ruby_version_is ""..."4.0" do
+      it "sets the 'Content-Type' header to 'application/x-www-form-urlencoded' unless the 'Content-Type' header is supplied" do
+        request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path")
+        request.body = "Some Content"
+
+        request.exec(@buffered_socket, "1.1", "/some/other/path")
+        str = @socket.string
+
+        str.should =~ %r[POST /some/other/path HTTP/1.1\r\n]
+        str.should =~ %r[Accept: \*/\*\r\n]
+        str.should =~ %r[Content-Type: application/x-www-form-urlencoded\r\n]
+        str.should =~ %r[Content-Length: 12\r\n]
+        str[-16..-1].should == "\r\n\r\nSome Content"
+      end
     end
 
     it "correctly sets the 'Content-Length' header and includes the body" do
@@ -62,19 +64,21 @@ describe "Net::HTTPGenericRequest#exec when passed socket, version, path" do
   end
 
   describe "when a body stream is set" do
-    it "sets the 'Content-Type' header to 'application/x-www-form-urlencoded' unless the 'Content-Type' header is supplied" do
-      request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path",
-                                            "Content-Length" => "10")
-      request.body_stream = StringIO.new("a" * 20)
-
-      request.exec(@buffered_socket, "1.1", "/some/other/path")
-      str = @socket.string
-
-      str.should =~ %r[POST /some/other/path HTTP/1.1\r\n]
-      str.should =~ %r[Accept: \*/\*\r\n]
-      str.should =~ %r[Content-Type: application/x-www-form-urlencoded\r\n]
-      str.should =~ %r[Content-Length: 10\r\n]
-      str[-24..-1].should == "\r\n\r\naaaaaaaaaaaaaaaaaaaa"
+    ruby_version_is ""..."4.0" do
+      it "sets the 'Content-Type' header to 'application/x-www-form-urlencoded' unless the 'Content-Type' header is supplied" do
+        request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path",
+                                              "Content-Length" => "10")
+        request.body_stream = StringIO.new("a" * 20)
+
+        request.exec(@buffered_socket, "1.1", "/some/other/path")
+        str = @socket.string
+
+        str.should =~ %r[POST /some/other/path HTTP/1.1\r\n]
+        str.should =~ %r[Accept: \*/\*\r\n]
+        str.should =~ %r[Content-Type: application/x-www-form-urlencoded\r\n]
+        str.should =~ %r[Content-Length: 10\r\n]
+        str[-24..-1].should == "\r\n\r\naaaaaaaaaaaaaaaaaaaa"
+      end
     end
 
     it "sends the whole stream, regardless of the 'Content-Length' header" do