Clean up options setting in tests

dependabot · Apr 6, 2021 · c325d57 · c325d57
1 parent ffcc1ac
commit c325d57
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 17 deletions.
diff --git a/bundler/lib/dependabot/bundler/helpers.rb b/bundler/lib/dependabot/bundler/helpers.rb
@@ -15,7 +15,6 @@ module Helpers
 
       BUNDLER_MAJOR_VERSION_REGEX = /BUNDLED WITH\s+(?<version>\d+)\./m.freeze
 
-      # NOTE: options is a manditory argument to ensure we pass it from all calling classes
       def self.bundler_version(lockfile)
         return DEFAULT unless lockfile
 

diff --git a/bundler/spec/dependabot/bundler/file_parser_spec.rb b/bundler/spec/dependabot/bundler/file_parser_spec.rb
@@ -13,8 +13,7 @@
     described_class.new(
       dependency_files: dependency_files,
       source: source,
-      reject_external_code: reject_external_code,
-      options: { bundler_2_available: PackageManagerHelper.use_bundler_2? }
+      reject_external_code: reject_external_code
     )
   end
   let(:source) do

diff --git a/bundler/spec/dependabot/bundler/file_updater_spec.rb b/bundler/spec/dependabot/bundler/file_updater_spec.rb
@@ -20,10 +20,7 @@
         "type" => "git_source",
         "host" => "github.com"
       }],
-      repo_contents_path: repo_contents_path,
-      options: {
-        bundler_2_available: PackageManagerHelper.use_bundler_2?
-      }
+      repo_contents_path: repo_contents_path
     )
   end
   let(:dependencies) { [dependency] }

diff --git a/bundler/spec/dependabot/bundler/update_checker/conflicting_dependency_resolver_spec.rb b/bundler/spec/dependabot/bundler/update_checker/conflicting_dependency_resolver_spec.rb
@@ -19,7 +19,7 @@
         "username" => "x-access-token",
         "password" => "token"
       }],
-      options: { bundler_2_available: PackageManagerHelper.use_bundler_2? }
+      options: {}
     )
   end
   let(:dependency_files) do

diff --git a/bundler/spec/dependabot/bundler/update_checker/force_updater_spec.rb b/bundler/spec/dependabot/bundler/update_checker/force_updater_spec.rb
@@ -21,7 +21,7 @@
         "username" => "x-access-token",
         "password" => "token"
       }],
-      options: { bundler_2_available: PackageManagerHelper.use_bundler_2? }
+      options: {}
     )
   end
   let(:dependency_files) { bundler_project_dependency_files("gemfile") }

diff --git a/bundler/spec/dependabot/bundler/update_checker/latest_version_finder_spec.rb b/bundler/spec/dependabot/bundler/update_checker/latest_version_finder_spec.rb
@@ -20,9 +20,7 @@
         "username" => "x-access-token",
         "password" => "token"
       }],
-      options: {
-        bundler_2_available: PackageManagerHelper.use_bundler_2?
-      }
+      options: {}
     )
   end
   let(:dependency_files) { bundler_project_dependency_files("gemfile") }

diff --git a/bundler/spec/dependabot/bundler/update_checker/version_resolver_spec.rb b/bundler/spec/dependabot/bundler/update_checker/version_resolver_spec.rb
@@ -20,7 +20,7 @@
       }],
       unlock_requirement: unlock_requirement,
       latest_allowable_version: latest_allowable_version,
-      options: { bundler_2_available: PackageManagerHelper.use_bundler_2? }
+      options: {}
     )
   end
   let(:ignored_versions) { [] }

diff --git a/bundler/spec/dependabot/bundler/update_checker_spec.rb b/bundler/spec/dependabot/bundler/update_checker_spec.rb
@@ -16,10 +16,7 @@
       dependency_files: dependency_files,
       credentials: credentials,
       ignored_versions: ignored_versions,
-      security_advisories: security_advisories,
-      options: {
-        bundler_2_available: PackageManagerHelper.use_bundler_2?
-      }
+      security_advisories: security_advisories
     )
   end
   let(:credentials) do