Merge branch 'main' into revert-9979-deivid-rodriguez/easier-bundler-…

…setup
dependabot · Jun 24, 2024 · d4551a2 · d4551a2
2 parents f465196 + 905d522
commit d4551a2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/cargo/lib/dependabot/cargo/update_checker/requirements_updater.rb b/cargo/lib/dependabot/cargo/update_checker/requirements_updater.rb
@@ -142,7 +142,7 @@ def update_range_requirements(string_reqs)
 
             req.sub(VERSION_REGEX) do |old_version|
               if req.start_with?("<=")
-                target_version
+                update_version_string(old_version)
               else
                 update_greatest_version(old_version, target_version)
               end

diff --git a/cargo/spec/dependabot/cargo/update_checker/requirements_updater_spec.rb b/cargo/spec/dependabot/cargo/update_checker/requirements_updater_spec.rb
@@ -184,6 +184,12 @@
 
               its([:requirement]) { is_expected.to eq(">=1.2.0, <1.6.0") }
             end
+
+            context "when patch version is missing" do
+              let(:req_string) { "> 1.0, < 1.2" }
+
+              its([:requirement]) { is_expected.to eq("> 1.0, < 1.6") }
+            end
           end
 
           context "with `less than equal`" do
@@ -202,6 +208,12 @@
 
               its([:requirement]) { is_expected.to eq(">=1.2.0, <=1.5.0") }
             end
+
+            context "when patch version is missing" do
+              let(:req_string) { "> 1.0, <= 1.2" }
+
+              its([:requirement]) { is_expected.to eq("> 1.0, <= 1.5") }
+            end
           end
         end