From a1b1bd2b550e992b784776f671fa35cff3bba614 Mon Sep 17 00:00:00 2001
From: Philip Harrison <philip@mailharrison.com>
Date: Mon, 29 Mar 2021 15:52:20 +0100
Subject: [PATCH] Bundler: Use project fixture helpers in specs

Update the ForceUpdater and ConflictingDependencyResolver specs to use
the `bundler_project_dependency_files` helpers paving the way for
multiple bundler versions.
---
 .../conflicting_dependency_resolver_spec.rb   | 14 +++-----
 .../update_checker/force_updater_spec.rb      | 34 ++++---------------
 2 files changed, 10 insertions(+), 38 deletions(-)

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
index b28cfbe270..d55e0cc2f6 100644
--- a/bundler/spec/dependabot/bundler/update_checker/conflicting_dependency_resolver_spec.rb
+++ b/bundler/spec/dependabot/bundler/update_checker/conflicting_dependency_resolver_spec.rb
@@ -22,7 +22,9 @@
       options: { bundler_2_available: bundler_2_available? }
     )
   end
-  let(:dependency_files) { [gemfile, lockfile] }
+  let(:dependency_files) do
+    bundler_project_dependency_files("subdep_blocked_by_subdep")
+  end
 
   let(:dependency) do
     Dependabot::Dependency.new(
@@ -36,15 +38,6 @@
   let(:current_version) { "1.0.1" }
   let(:target_version) { "2.0.0" }
 
-  let(:gemfile) do
-    Dependabot::DependencyFile.new(content: gemfile_body, name: "Gemfile")
-  end
-  let(:lockfile) do
-    Dependabot::DependencyFile.new(content: lockfile_body, name: "Gemfile.lock")
-  end
-  let(:gemfile_body) { fixture("projects", "bundler1", "subdep_blocked_by_subdep", "Gemfile") }
-  let(:lockfile_body) { fixture("projects", "bundler1", "subdep_blocked_by_subdep", "Gemfile.lock") }
-
   describe "#conflicting_dependencies" do
     subject(:conflicting_dependencies) do
       resolver.conflicting_dependencies(
@@ -68,6 +61,7 @@
 
     context "with no blocking dependencies" do
       let(:target_version) { "1.5.0" }
+
       it "returns an empty array" do
         expect(conflicting_dependencies).to match_array([])
       end
diff --git a/bundler/spec/dependabot/bundler/update_checker/force_updater_spec.rb b/bundler/spec/dependabot/bundler/update_checker/force_updater_spec.rb
index ee1b07d2dd..e1ea5938a6 100644
--- a/bundler/spec/dependabot/bundler/update_checker/force_updater_spec.rb
+++ b/bundler/spec/dependabot/bundler/update_checker/force_updater_spec.rb
@@ -24,7 +24,7 @@
       options: { bundler_2_available: bundler_2_available? }
     )
   end
-  let(:dependency_files) { [gemfile, lockfile] }
+  let(:dependency_files) { bundler_project_dependency_files("gemfile") }
 
   let(:dependency) do
     Dependabot::Dependency.new(
@@ -55,21 +55,11 @@
     }]
   end
 
-  let(:gemfile) do
-    Dependabot::DependencyFile.new(content: gemfile_body, name: "Gemfile")
-  end
-  let(:lockfile) do
-    Dependabot::DependencyFile.new(content: lockfile_body, name: "Gemfile.lock")
-  end
-
   describe "#updated_dependencies" do
     subject(:updated_dependencies) { updater.updated_dependencies }
 
     context "when updating the dependency that requires the other" do
-      let(:gemfile_body) { fixture("projects", "bundler1", "version_conflict", "Gemfile") }
-      let(:lockfile_body) do
-        fixture("projects", "bundler1", "version_conflict", "Gemfile.lock")
-      end
+      let(:dependency_files) { bundler_project_dependency_files("version_conflict") }
       let(:target_version) { "3.6.0" }
       let(:dependency_name) { "rspec-mocks" }
       let(:requirements) do
@@ -114,10 +104,7 @@
     end
 
     context "when updating the dependency that is required by the other" do
-      let(:gemfile_body) { fixture("projects", "bundler1", "version_conflict", "Gemfile") }
-      let(:lockfile_body) do
-        fixture("projects", "bundler1", "version_conflict", "Gemfile.lock")
-      end
+      let(:dependency_files) { bundler_project_dependency_files("version_conflict") }
       let(:target_version) { "3.6.0" }
       let(:dependency_name) { "rspec-support" }
       let(:requirements) do
@@ -162,10 +149,7 @@
     end
 
     context "when two dependencies require the same subdependency" do
-      let(:gemfile_body) { fixture("projects", "bundler1", "version_conflict_mutual_sub", "Gemfile") }
-      let(:lockfile_body) do
-        fixture("projects", "bundler1", "version_conflict_mutual_sub", "Gemfile.lock")
-      end
+      let(:dependency_files) { bundler_project_dependency_files("version_conflict_mutual_sub") }
 
       let(:dependency_name) { "rspec-mocks" }
       let(:target_version) { "3.6.0" }
@@ -211,10 +195,7 @@
     end
 
     context "when another dependency would need to be downgraded" do
-      let(:gemfile_body) { fixture("projects", "bundler1", "subdep_blocked_by_subdep", "Gemfile") }
-      let(:lockfile_body) do
-        fixture("projects", "bundler1", "subdep_blocked_by_subdep", "Gemfile.lock")
-      end
+      let(:dependency_files) { bundler_project_dependency_files("subdep_blocked_by_subdep") }
       let(:target_version) { "2.0.0" }
       let(:dependency_name) { "dummy-pkg-a" }
 
@@ -225,10 +206,7 @@
     end
 
     context "when the ruby version would need to change" do
-      let(:gemfile_body) { fixture("projects", "bundler1", "legacy_ruby", "Gemfile") }
-      let(:lockfile_body) do
-        fixture("projects", "bundler1", "legacy_ruby", "Gemfile.lock")
-      end
+      let(:dependency_files) { bundler_project_dependency_files("legacy_ruby") }
       let(:target_version) { "2.0.5" }
       let(:dependency_name) { "public_suffix" }