8 files changed, 136 insertions, 34 deletions
diff --git a/spec/bin/rspec b/spec/bin/rspec
new file mode 100755
index 0000000000..1f61e3c64c
--- /dev/null
+++ b/spec/bin/rspec
@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative "../bundler/support/rubygems_ext"
+
+Spec::Rubygems.gem_load("rspec-core", "rspec")
diff --git a/spec/bundler/bundler/friendly_errors_spec.rb b/spec/bundler/bundler/friendly_errors_spec.rb
index e0310344fd..d6a9d4813d 100644
--- a/spec/bundler/bundler/friendly_errors_spec.rb
+++ b/spec/bundler/bundler/friendly_errors_spec.rb
@@ -2,7 +2,8 @@
 
 require "bundler"
 require "bundler/friendly_errors"
-require "cgi"
+require "cgi/escape"
+require "cgi/util" unless defined?(CGI::EscapeExt)
 
 RSpec.describe Bundler, "friendly errors" do
   context "with invalid YAML in .gemrc" do
diff --git a/spec/bundler/commands/install_spec.rb b/spec/bundler/commands/install_spec.rb
index 41aa903f27..98883b1e72 100644
--- a/spec/bundler/commands/install_spec.rb
+++ b/spec/bundler/commands/install_spec.rb
@@ -1500,6 +1500,55 @@ RSpec.describe "bundle install with gem sources" do
     end
   end
 
+  context "when lockfile has incorrect dependencies" do
+    before do
+      build_repo2
+
+      gemfile <<-G
+        source "https://gem.repo2"
+        gem "myrack_middleware"
+      G
+
+      system_gems "myrack_middleware-1.0", path: default_bundle_path
+
+      # we want to raise when the 1.0 line should be followed by "            myrack (= 0.9.1)" but isn't
+      lockfile <<-L
+        GEM
+          remote: https://gem.repo2/
+          specs:
+            myrack_middleware (1.0)
+
+        PLATFORMS
+          #{lockfile_platforms}
+
+        DEPENDENCIES
+          myrack_middleware
+
+        BUNDLED WITH
+          #{Bundler::VERSION}
+      L
+    end
+
+    it "raises a clear error message when frozen" do
+      bundle "config set frozen true"
+      bundle "install", raise_on_error: false
+
+      expect(exitstatus).to eq(41)
+      expect(err).to eq("Bundler found incorrect dependencies in the lockfile for myrack_middleware-1.0")
+    end
+
+    it "updates the lockfile when not frozen" do
+      missing_dep = "myrack (0.9.1)"
+      expect(lockfile).not_to include(missing_dep)
+
+      bundle "config set frozen false"
+      bundle :install
+
+      expect(lockfile).to include(missing_dep)
+      expect(out).to include("now installed")
+    end
+  end
+
   context "with --local flag" do
     before do
       system_gems "myrack-1.0.0", path: default_bundle_path
diff --git a/spec/ruby/core/file/birthtime_spec.rb b/spec/ruby/core/file/birthtime_spec.rb
index ff43aa7cef..f82eaf7cca 100644
--- a/spec/ruby/core/file/birthtime_spec.rb
+++ b/spec/ruby/core/file/birthtime_spec.rb
@@ -1,6 +1,11 @@
 require_relative '../../spec_helper'
 
 platform_is :windows, :darwin, :freebsd, :netbsd, :linux do
+  not_implemented_messages = [
+    "birthtime() function is unimplemented", # unsupported OS/version
+    "birthtime is unimplemented",            # unsupported filesystem
+  ]
+
   describe "File.birthtime" do
     before :each do
       @file = __FILE__
@@ -14,20 +19,20 @@ platform_is :windows, :darwin, :freebsd, :netbsd, :linux do
       File.birthtime(@file)
       File.birthtime(@file).should be_kind_of(Time)
     rescue NotImplementedError => e
-      skip e.message if e.message.start_with?("birthtime() function")
+      e.message.should.start_with?(*not_implemented_messages)
     end
 
     it "accepts an object that has a #to_path method" do
       File.birthtime(@file) # Avoid to failure of mock object with old Kernel and glibc
       File.birthtime(mock_to_path(@file))
     rescue NotImplementedError => e
-      e.message.should.start_with?("birthtime() function")
+      e.message.should.start_with?(*not_implemented_messages)
     end
 
     it "raises an Errno::ENOENT exception if the file is not found" do
       -> { File.birthtime('bogus') }.should raise_error(Errno::ENOENT)
     rescue NotImplementedError => e
-      e.message.should.start_with?("birthtime() function")
+      e.message.should.start_with?(*not_implemented_messages)
     end
   end
 
@@ -45,7 +50,7 @@ platform_is :windows, :darwin, :freebsd, :netbsd, :linux do
       @file.birthtime
       @file.birthtime.should be_kind_of(Time)
     rescue NotImplementedError => e
-      e.message.should.start_with?("birthtime() function")
+      e.message.should.start_with?(*not_implemented_messages)
     end
   end
 end
diff --git a/spec/ruby/core/file/stat/birthtime_spec.rb b/spec/ruby/core/file/stat/birthtime_spec.rb
index 5350a571aa..adecee15b0 100644
--- a/spec/ruby/core/file/stat/birthtime_spec.rb
+++ b/spec/ruby/core/file/stat/birthtime_spec.rb
@@ -3,6 +3,11 @@ require_relative '../../../spec_helper'
 platform_is(:windows, :darwin, :freebsd, :netbsd,
             *ruby_version_is("3.5") { :linux },
            ) do
+  not_implemented_messages = [
+    "birthtime() function is unimplemented", # unsupported OS/version
+    "birthtime is unimplemented",            # unsupported filesystem
+  ]
+
   describe "File::Stat#birthtime" do
     before :each do
       @file = tmp('i_exist')
@@ -18,7 +23,7 @@ platform_is(:windows, :darwin, :freebsd, :netbsd,
       st.birthtime.should be_kind_of(Time)
       st.birthtime.should <= Time.now
     rescue NotImplementedError => e
-      e.message.should.start_with?("birthtime() function")
+      e.message.should.start_with?(*not_implemented_messages)
     end
   end
 end
diff --git a/spec/ruby/core/kernel/inspect_spec.rb b/spec/ruby/core/kernel/inspect_spec.rb
index 1f9ce834ab..e60f7576c5 100644
--- a/spec/ruby/core/kernel/inspect_spec.rb
+++ b/spec/ruby/core/kernel/inspect_spec.rb
@@ -28,4 +28,34 @@ describe "Kernel#inspect" do
     end
     obj.inspect.should be_kind_of(String)
   end
+
+  ruby_version_is "3.5" do
+    it "calls #instance_variables_to_inspect private method to know which variables to display" do
+      obj = Object.new
+      obj.instance_eval do
+        @host = "localhost"
+        @user = "root"
+        @password = "hunter2"
+      end
+      obj.singleton_class.class_eval do
+        private def instance_variables_to_inspect = %i[@host @user @does_not_exist]
+      end
+
+      inspected = obj.inspect.sub(/^#<Object:0x[0-9a-f]+/, '#<Object:0x00')
+      inspected.should == '#<Object:0x00 @host="localhost", @user="root">'
+
+      obj = Object.new
+      obj.instance_eval do
+        @host = "localhost"
+        @user = "root"
+        @password = "hunter2"
+      end
+      obj.singleton_class.class_eval do
+        private def instance_variables_to_inspect = []
+      end
+
+      inspected = obj.inspect.sub(/^#<Object:0x[0-9a-f]+/, '#<Object:0x00')
+      inspected.should == "#<Object:0x00>"
+    end
+  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..cebbee4ff3 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 ""..."3.5" 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..0912e5a71f 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 ""..."3.5" 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 ""..."3.5" 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