Share GemNetHTTPAdapter between tests

kbukum1 · Apr 26, 2024 · 34fa5bb · 34fa5bb
1 parent 9573055
commit 34fa5bb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/...s/v1/spec/helpers/gem_net_http_adapter.rb → ...pers/spec_helpers/gem_net_http_adapter.rb b/...s/v1/spec/helpers/gem_net_http_adapter.rb → ...pers/spec_helpers/gem_net_http_adapter.rb
@@ -1,4 +1,5 @@
 # typed: false
+# frozen_string_literal: true
 
 require "rubygems/vendored_net_http"
 

diff --git a/bundler/helpers/v1/spec/native_spec_helper.rb b/bundler/helpers/v1/spec/native_spec_helper.rb
@@ -7,7 +7,7 @@
 
 $LOAD_PATH.unshift(File.expand_path("../lib", __dir__))
 $LOAD_PATH.unshift(File.expand_path("../monkey_patches", __dir__))
-$LOAD_PATH.unshift(File.expand_path("./helpers", __dir__))
+$LOAD_PATH.unshift(File.expand_path("../../spec_helpers", __dir__))
 
 # Bundler monkey patches
 require "definition_ruby_version_patch"
@@ -27,8 +27,6 @@
   config.raise_errors_for_deprecations!
 end
 
-WebMock.disable_net_connect!(allow_localhost: true)
-
 # Duplicated in lib/dependabot/bundler/file_updater/lockfile_updater.rb
 # TODO: Stop sanitizing the lockfile once we have bundler 2 installed
 LOCKFILE_ENDING = /(?<ending>\s*(?:RUBY VERSION|BUNDLED WITH).*)/m

diff --git a/bundler/helpers/v2/spec/native_spec_helper.rb b/bundler/helpers/v2/spec/native_spec_helper.rb
@@ -7,6 +7,7 @@
 
 $LOAD_PATH.unshift(File.expand_path("../lib", __dir__))
 $LOAD_PATH.unshift(File.expand_path("../monkey_patches", __dir__))
+$LOAD_PATH.unshift(File.expand_path("../../spec_helpers", __dir__))
 
 # Bundler monkey patches
 require "definition_ruby_version_patch"
@@ -15,6 +16,8 @@
 
 require "functions"
 
+require "gem_net_http_adapter"
+
 RSpec.configure do |config|
   config.color = true
   config.order = :rand