Use .bundle gem paths for test deps with ruby/ruby repository.

Author: hsbt

spec/bundled_gems_spec.rb

@@ -24,11 +24,6 @@ def self.ruby=(ruby)
     require_relative "bundler/support/rubygems_ext"
     Spec::Helpers.install_dev_bundler
     FileUtils.mkdir_p Spec::Path.gem_path
-
-    %w[sinatra rack tilt rack-protection rack-session rack-test mustermann base64 logger compact_index].each do |gem|
-      path, = Dir[File.expand_path("../.bundle/gems/#{gem}-*/lib", __dir__)]
-      $LOAD_PATH.unshift(path) if path
-    end
   end
 
   config.around(:each) do |example|

spec/bundler/support/path.rb

@@ -319,8 +319,15 @@ def sinatra_dependency_paths
         base64
         logger
         cgi
+        compact_index
       ]
-      Dir[scoped_base_system_gem_path.join("gems/{#{deps.join(",")}}-*/lib")].map(&:to_s)
+      path = if ruby_core? && Dir.exist?(source_root.join(".bundle"))
+        source_root.join(".bundle")
+      else
+        scoped_base_system_gem_path
+      end
+
+      Dir[path.join("gems/{#{deps.join(',')}}-*/lib")].map(&:to_s)
     end
 
     private