Add catalog check to pnpm_lock_changed (dependabot#11466)

* add catalog check to pnpm_lock_changed

* fixing tests

npm_and_yarn/lib/dependabot/npm_and_yarn/file_updater.rb

@@ -116,7 +116,7 @@ def update_pnpm_workspace_and_locks
       def update_pnpm_locks(is_catalog: false)
         updated_files = []
         pnpm_locks.each do |pnpm_lock|
-          next unless pnpm_lock_changed?(pnpm_lock)
+          next unless pnpm_lock_changed?(pnpm_lock, is_catalog: is_catalog)
 
           updated_files << updated_file(
             file: pnpm_lock,
@@ -282,9 +282,9 @@ def yarn_lock_changed?(yarn_lock)
         yarn_lock.content != updated_yarn_lock_content(yarn_lock)
       end
 
-      sig { params(pnpm_lock: Dependabot::DependencyFile).returns(T::Boolean) }
-      def pnpm_lock_changed?(pnpm_lock)
-        pnpm_lock.content != updated_pnpm_lock_content(pnpm_lock)
+      sig { params(pnpm_lock: Dependabot::DependencyFile, is_catalog: T::Boolean).returns(T::Boolean) }
+      def pnpm_lock_changed?(pnpm_lock, is_catalog: false)
+        pnpm_lock.content != updated_pnpm_lock_content(pnpm_lock, is_catalog: is_catalog)
       end
 
       sig { params(bun_lock: Dependabot::DependencyFile).returns(T::Boolean) }

npm_and_yarn/spec/dependabot/npm_and_yarn/file_updater/pnpm_workspace_updater_spec.rb

@@ -26,15 +26,15 @@
       file: "pnpm-workspace.yaml",
       name: "prettier",
       version: "3.3.0",
-      required_version: "3.3.3",
-      previous_required_version: "3.3.0"
+      required_version: "^3.3.3",
+      previous_required_version: "^3.3.0"
     )
   end
 
   describe "#updated_pnmp_workspace" do
     subject(:updated_package_json) { pnpm_workspace_updater.updated_pnpm_workspace }
 
-    its(:content) { is_expected.to include "prettier: 3.3.3" }
+    its(:content) { is_expected.to include "prettier: ^3.3.3" }
 
     context("with multiple dependencies") do
       let(:project_name) { "pnpm/catalog_multiple" }

npm_and_yarn/spec/dependabot/npm_and_yarn/file_updater_spec.rb

@@ -4151,16 +4151,16 @@
               create_dependency(
                 file: "pnpm-workspace.yaml",
                 name: "prettier",
-                version: "3.3.0",
-                required_version: "3.3.3",
-                previous_required_version: "3.3.0"
+                version: "3.3.3",
+                required_version: "^3.3.3",
+                previous_required_version: "^3.3.0"
               )
             ]
           end
 
           it "updates the workspace" do
-            expect(updated_files.map(&:name)).to eq(%w(pnpm-workspace.yaml pnpm-lock.yaml))
-            expect(updated_pnpm_workspace.content).to include("prettier: 3.3.3")
+            expect(updated_files.map(&:name)).to eq(%w(pnpm-workspace.yaml))
+            expect(updated_pnpm_workspace.content).to include("prettier: ^3.3.3")
           end
         end
 
@@ -4276,8 +4276,8 @@
                   file: "pnpm-workspace.yaml",
                   name: "prettier",
                   version: "3.3.0",
-                  required_version: "3.3.3",
-                  previous_required_version: "3.3.0"
+                  required_version: "^3.3.3",
+                  previous_required_version: "^3.3.0"
                 )
               ]
             end

npm_and_yarn/spec/fixtures/projects/pnpm/catalog_prettier/package.json

@@ -4,8 +4,10 @@
   "description": "",
   "main": "index.js",
   "author": "",
+  "packageManager": "[email protected]",
   "dependencies": {
   },
   "devDependencies": {
+    "prettier": "catalog:"
   }
 }

npm_and_yarn/spec/fixtures/projects/pnpm/catalog_prettier/pnpm-workspace.yaml

@@ -2,4 +2,4 @@ packages:
   - packages/*
 
 catalog:
-  prettier: 3.3.0
+  prettier: ^3.3.0