dependabot-bundler 0.154.1 → 0.154.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4c7a6dabbb638051a34a81c9763343a4e598ab7e87b91c870f54aa1e6312cd7
-  data.tar.gz: eb54e6a2653c30591b9030bc45af955e6a8686c4e6d9e1884c4c255a4322f8cd
+  metadata.gz: 9b31ba93254309940073353b581acd7631e6db21a6ffad47d3d88afe4b08a53d
+  data.tar.gz: bc63d0f4b4455ad8c2c08da23a3d47d5e8dd567061b415c386b0453b313776fb
 SHA512:
-  metadata.gz: '083566caefd79a0cb3ecea7fbae3c879e069b4a1271a861d3844e950b2315f7f02a57bd5da74e877d63b6788c9b4b4e9781495a832f9579da36027c1062c744d'
-  data.tar.gz: 6d737f4077de2c9715fc9f12b340b5e97e999ed19d6762eaea54061b15f9c48e2ab6285eab640c79207991a4357121c28e568e9d0b25ee8376f44ea2aeebbb7f
+  metadata.gz: dd79eec594396d1cb334ae5ef2020669b0e3edc96ac5284c2c5ee1ce65cb804ca9f266f3539e14daf7636fb752642f84d9d085f2f8e465a445a1e607b346f6e0
+  data.tar.gz: 49156e6d573d6290582776eaf7e76b1339d0341222e521d52c3f858e9de997474e0559a27382ef9f0ae49ae8140ee8c08d9fc3401a0bbb722a8360bb716c179c

data/helpers/v1/spec/functions/force_updater_spec.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require "native_spec_helper"
+require "shared_contexts"
+
+RSpec.describe Functions::ForceUpdater do
+  include_context "in a temporary bundler directory"
+  include_context "stub rubygems compact index"
+
+  let(:force_updater) do
+    described_class.new(
+      dependency_name: dependency_name,
+      target_version: target_version,
+      gemfile_name: gemfile_name,
+      lockfile_name: lockfile_name,
+      update_multiple_dependencies: update_multiple_dependencies
+    )
+  end
+  let(:gemfile_name) { "Gemfile" }
+  let(:lockfile_name) { "Gemfile.lock" }
+  let(:update_multiple_dependencies) { true }
+
+  describe "#run" do
+    subject(:force_update) do
+      in_tmp_folder { force_updater.run }
+    end
+
+    context "with a version conflict" do
+      let(:target_version) { "3.6.0" }
+      let(:dependency_name) { "rspec-support" }
+      let(:project_name) { "version_conflict" }
+
+      it "updates the conflicting dependencies" do
+        updated_deps, _specs = force_update
+        expect(updated_deps).to eq([{ name: "rspec-support" }, { name: "rspec-mocks" }])
+      end
+
+      context "when updating a single dependency" do
+        let(:update_multiple_dependencies) { false }
+
+        it { expect { force_update }.to raise_error(Bundler::VersionConflict) }
+      end
+    end
+
+    context "with a version conflict in gems rb" do
+      let(:target_version) { "3.6.0" }
+      let(:dependency_name) { "rspec-support" }
+      let(:project_name) { "version_conflict_gems_rb" }
+      let(:gemfile_name) { "gems.rb" }
+      let(:lockfile_name) { "gems.locked" }
+
+      it "updates the conflicting dependencies" do
+        updated_deps, _specs = force_update
+        expect(updated_deps).to eq([{ name: "rspec-support" }, { name: "rspec-mocks" }])
+      end
+    end
+  end
+end

data/helpers/v1/spec/functions/version_resolver_spec.rb

@@ -92,5 +92,13 @@ RSpec.describe Functions::VersionResolver do
       its([:version]) { is_expected.to eq(Gem::Version.new("1.4.0")) }
       its([:fetcher]) { is_expected.to eq("Bundler::Fetcher::Dependency") }
     end
+
+    context "with no update possible due to a version conflict" do
+      let(:project_name) { "version_conflict_with_listed_subdep" }
+      let(:dependency_name) { "rspec-mocks" }
+      let(:requirement_string) { ">= 0" }
+
+      its([:version]) { is_expected.to eq(Gem::Version.new("3.6.0")) }
+    end
   end
 end

data/helpers/v2/spec/functions/force_updater_spec.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require "native_spec_helper"
+require "shared_contexts"
+
+RSpec.describe Functions::ForceUpdater do
+  include_context "in a temporary bundler directory"
+  include_context "stub rubygems compact index"
+
+  let(:force_updater) do
+    described_class.new(
+      dependency_name: dependency_name,
+      target_version: target_version,
+      gemfile_name: gemfile_name,
+      lockfile_name: lockfile_name,
+      update_multiple_dependencies: update_multiple_dependencies
+    )
+  end
+  let(:gemfile_name) { "Gemfile" }
+  let(:lockfile_name) { "Gemfile.lock" }
+  let(:update_multiple_dependencies) { true }
+
+  describe "#run" do
+    subject(:force_update) do
+      in_tmp_folder { force_updater.run }
+    end
+
+    context "with a version conflict" do
+      let(:target_version) { "3.6.0" }
+      let(:dependency_name) { "rspec-support" }
+      let(:project_name) { "version_conflict" }
+
+      it "updates the conflicting dependencies" do
+        updated_deps, _specs = force_update
+        expect(updated_deps).to eq([{ name: "rspec-support" }, { name: "rspec-mocks" }])
+      end
+
+      context "when updating a single dependency" do
+        let(:update_multiple_dependencies) { false }
+
+        it { expect { force_update }.to raise_error(Bundler::VersionConflict) }
+      end
+    end
+
+    context "with a version conflict in gems rb" do
+      let(:target_version) { "3.6.0" }
+      let(:dependency_name) { "rspec-support" }
+      let(:project_name) { "version_conflict_gems_rb" }
+      let(:gemfile_name) { "gems.rb" }
+      let(:lockfile_name) { "gems.locked" }
+
+      it "updates the conflicting dependencies" do
+        updated_deps, _specs = force_update
+        expect(updated_deps).to eq([{ name: "rspec-support" }, { name: "rspec-mocks" }])
+      end
+    end
+  end
+end

data/helpers/v2/spec/functions/version_resolver_spec.rb

@@ -92,5 +92,13 @@ RSpec.describe Functions::VersionResolver do
       its([:version]) { is_expected.to eq(Gem::Version.new("1.4.0")) }
       its([:fetcher]) { is_expected.to eq("Bundler::Fetcher::Dependency") }
     end
+
+    context "with no update possible due to a version conflict" do
+      let(:project_name) { "version_conflict_with_listed_subdep" }
+      let(:dependency_name) { "rspec-mocks" }
+      let(:requirement_string) { ">= 0" }
+
+      its([:version]) { is_expected.to eq(Gem::Version.new("3.6.0")) }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-bundler
 version: !ruby/object:Gem::Version
-  version: 0.154.1
+  version: 0.154.2
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.154.1
+        version: 0.154.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.154.1
+        version: 0.154.2
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +202,7 @@ files:
 - helpers/v1/spec/functions/conflicting_dependency_resolver_spec.rb
 - helpers/v1/spec/functions/dependency_source_spec.rb
 - helpers/v1/spec/functions/file_parser_spec.rb
+- helpers/v1/spec/functions/force_updater_spec.rb
 - helpers/v1/spec/functions/version_resolver_spec.rb
 - helpers/v1/spec/native_spec_helper.rb
 - helpers/v1/spec/shared_contexts.rb
@@ -222,6 +223,7 @@ files:
 - helpers/v2/spec/functions/conflicting_dependency_resolver_spec.rb
 - helpers/v2/spec/functions/dependency_source_spec.rb
 - helpers/v2/spec/functions/file_parser_spec.rb
+- helpers/v2/spec/functions/force_updater_spec.rb
 - helpers/v2/spec/functions/version_resolver_spec.rb
 - helpers/v2/spec/functions_spec.rb
 - helpers/v2/spec/native_spec_helper.rb