fix: update frozen lockfile test expectations for imara-diff

bartlomieju · claude · bartlomieju · commit 6ac9249cfa3b · 2026-03-12T16:47:55.000+01:00
The imara-diff algorithm matches identical lines (like closing braces)
as unchanged context rather than delete/insert pairs, producing more
minimal diffs. Update .out files to match.

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/libs/resolver/display.rs b/libs/resolver/display.rs
@@ -263,6 +263,54 @@ mod tests {
     run_test("test\n", "test\r\n", " | Text differed by line endings.\n");
   }
 
+  #[test]
+  fn test_lockfile_diff() {
+    // Simulates the frozen lockfile diff scenario where adding a new
+    // dependency inserts lines while matching braces remain unchanged.
+    let before = r#"{
+  "version": "5",
+  "packages": {
+    "npm:@denotest/add@1": "1.0.0"
+  },
+  "npm": {
+    "@denotest/add@1.0.0": {
+      "integrity": "abc",
+      "tarball": "http://localhost/add/1.0.0.tgz"
+    }
+  }
+}"#;
+    let after = r#"{
+  "version": "5",
+  "packages": {
+    "npm:@denotest/add@1": "1.0.0",
+    "npm:@denotest/subtract@1": "1.0.0"
+  },
+  "npm": {
+    "@denotest/add@1.0.0": {
+      "integrity": "abc",
+      "tarball": "http://localhost/add/1.0.0.tgz"
+    },
+    "@denotest/subtract@1.0.0": {
+      "integrity": "def",
+      "tarball": "http://localhost/subtract/1.0.0.tgz"
+    }
+  }
+}"#;
+    run_test(
+      before,
+      after,
+      concat!(
+        " 4 | -    \"npm:@denotest/add@1\": \"1.0.0\"\n",
+        " 4 | +    \"npm:@denotest/add@1\": \"1.0.0\",\n",
+        " 5 | +    \"npm:@denotest/subtract@1\": \"1.0.0\"\n",
+        "11 | +    },\n",
+        "12 | +    \"@denotest/subtract@1.0.0\": {\n",
+        "13 | +      \"integrity\": \"def\",\n",
+        "14 | +      \"tarball\": \"http://localhost/subtract/1.0.0.tgz\"\n",
+      ),
+    );
+  }
+
   fn run_test(diff_text1: &str, diff_text2: &str, expected_output: &str) {
     assert_eq!(
       test_util::strip_ansi_codes(&diff(diff_text1, diff_text2,)),
diff --git a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_cache.out b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_cache.out
@@ -3,9 +3,7 @@ changes:
  4 | -    "npm:@denotest/add@1": "1.0.0"
  4 | +    "npm:@denotest/add@1": "1.0.0",
  5 | +    "npm:@denotest/subtract@1": "1.0.0"
-10 | -    }
 11 | +    },
 12 | +    "@denotest/subtract@1.0.0": {
 13 | +      "integrity": "[WILDCARD]",
 14 | +      "tarball": "http://localhost:4260/@denotest/subtract/1.0.0.tgz"
-15 | +    }
diff --git a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_dynamic_http.out b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_dynamic_http.out
@@ -1,11 +1,9 @@
 Download http://localhost:4545/welcome.ts
 error: Uncaught (in promise) TypeError: The lockfile is out of date. Run `deno install --frozen=false`, or rerun with `--frozen=false` to update it.
 changes:
-11 | -  }
 11 | +  },
 12 | +  "remote": {
 13 | +    "http://localhost:4545/welcome.ts": "7353d5fcbc36c45d26bcbca478cf973092523b07c45999f41319820092b4de31"
-14 | +  }
 const _ = await import(scheme + "localhost:4545/welcome.ts");
           ^
     at [WILDCARD]
diff --git a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_dynamic_jsr.out b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_dynamic_jsr.out
@@ -3,14 +3,12 @@ Download http://127.0.0.1:4250/@denotest/add/1.0.0_meta.json
 Download http://127.0.0.1:4250/@denotest/add/1.0.0/mod.ts
 error: Uncaught (in promise) TypeError: The lockfile is out of date. Run `deno install --frozen=false`, or rerun with `--frozen=false` to update it.
 changes:
- 4 | -    "npm:@denotest/add@1": "1.0.0"
  4 | +    "jsr:@denotest/add@1": "1.0.0",
- 5 | +    "npm:@denotest/add@1": "1.0.0"
- 6 | +  },
  7 | +  "jsr": {
  8 | +    "@denotest/add@1.0.0": {
  9 | +      "integrity": "[WILDCARD]"
 10 | +    }
+11 | +  },
 const { add } = await import(scheme + "@denotest/add@1");
                 ^
-    at [WILDCARD]
+    at [WILDCARD]
diff --git a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_dynamic_npm.out b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_dynamic_npm.out
@@ -4,12 +4,10 @@ changes:
  4 | -    "npm:@denotest/add@1": "1.0.0"
  4 | +    "npm:@denotest/add@1": "1.0.0",
  5 | +    "npm:@denotest/subtract@1": "1.0.0"
-10 | -    }
 11 | +    },
 12 | +    "@denotest/subtract@1.0.0": {
 13 | +      "integrity": "[WILDCARD]",
 14 | +      "tarball": "http://localhost:4260/@denotest/subtract/1.0.0.tgz"
-15 | +    }
 const { subtract } = await import(scheme + "@denotest/subtract@1");
                      ^
     at [WILDCARD]
diff --git a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_jsr_cache.out b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_jsr_cache.out
@@ -1,12 +1,6 @@
 error: The lockfile is out of date. Run `deno install --frozen=false`, or rerun with `--frozen=false` to update it.
 changes:
- 4 | -    "jsr:@denotest/add@1": "1.0.0"
- 5 | -  },
- 6 | -  "jsr": {
  4 | +    "jsr:@denotest/add@0.2.0": "0.2.0",
- 5 | +    "jsr:@denotest/add@1": "1.0.0"
- 6 | +  },
- 7 | +  "jsr": {
  8 | +    "@denotest/add@0.2.0": {
  9 | +      "integrity": "[WILDCARD]"
 10 | +    },
diff --git a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_jsr_run.out b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_jsr_run.out
@@ -2,13 +2,7 @@ Download http://127.0.0.1:4250/@denotest/add/0.2.0_meta.json
 Download http://127.0.0.1:4250/@denotest/add/0.2.0/mod.ts
 error: The lockfile is out of date. Run `deno install --frozen=false`, or rerun with `--frozen=false` to update it.
 changes:
- 4 | -    "jsr:@denotest/add@1": "1.0.0"
- 5 | -  },
- 6 | -  "jsr": {
  4 | +    "jsr:@denotest/add@0.2.0": "0.2.0",
- 5 | +    "jsr:@denotest/add@1": "1.0.0"
- 6 | +  },
- 7 | +  "jsr": {
  8 | +    "@denotest/add@0.2.0": {
  9 | +      "integrity": "[WILDCARD]"
 10 | +    },
diff --git a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_run.out b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_run.out
@@ -4,9 +4,7 @@ changes:
  4 | -    "npm:@denotest/add@1": "1.0.0"
  4 | +    "npm:@denotest/add@1": "1.0.0",
  5 | +    "npm:@denotest/subtract@1": "1.0.0"
-10 | -    }
 11 | +    },
 12 | +    "@denotest/subtract@1.0.0": {
 13 | +      "integrity": "[WILDCARD]",
 14 | +      "tarball": "http://localhost:4260/@denotest/subtract/1.0.0.tgz"
-15 | +    }
diff --git a/tests/specs/lockfile/frozen_lockfile/frozen_package_json_changed.out b/tests/specs/lockfile/frozen_lockfile/frozen_package_json_changed.out
@@ -4,7 +4,6 @@ changes:
  4 | -    "npm:@denotest/add@1": "1.0.0"
  4 | +    "npm:@denotest/add@1": "1.0.0",
  5 | +    "npm:@denotest/bin@0.7.0": "0.7.0"
-10 | -    }
 11 | +    },
 12 | +    "@denotest/bin@0.7.0": {
 13 | +      "integrity": "sha512-RAE7sQrdTUuV4KdDAshObhsULXb2QjTjfRg/KbzE9asZV8dUmwbPZy2kfmE2CunPo8+6DvwPklXFJ4PQi0Usuw==",
@@ -17,4 +16,3 @@ changes:
 20 | +      "dependencies": [
 21 | +        "npm:@denotest/bin@0.7.0"
 22 | +      ]
-23 | +    }
diff --git a/tests/specs/lockfile/frozen_lockfile/frozen_package_json_changed_install.out b/tests/specs/lockfile/frozen_lockfile/frozen_package_json_changed_install.out
@@ -3,7 +3,6 @@ changes:
  4 | -    "npm:@denotest/add@1": "1.0.0"
  4 | +    "npm:@denotest/add@1": "1.0.0",
  5 | +    "npm:@denotest/bin@0.7.0": "0.7.0"
-10 | -    }
 11 | +    },
 12 | +    "@denotest/bin@0.7.0": {
 13 | +      "integrity": "sha512-RAE7sQrdTUuV4KdDAshObhsULXb2QjTjfRg/KbzE9asZV8dUmwbPZy2kfmE2CunPo8+6DvwPklXFJ4PQi0Usuw==",
@@ -16,4 +15,3 @@ changes:
 20 | +      "dependencies": [
 21 | +        "npm:@denotest/bin@0.7.0"
 22 | +      ]
-23 | +    }
diff --git a/tests/specs/lockfile/frozen_lockfile/no_lockfile_run.out b/tests/specs/lockfile/frozen_lockfile/no_lockfile_run.out
@@ -1,7 +1,6 @@
 Download http://localhost:4260/@denotest%2fadd
 error: The lockfile is out of date. Run `deno install --frozen=false`, or rerun with `--frozen=false` to update it.
 changes:
- 1 | -
  1 | +{
  2 | +  "version": "5",
  3 | +  "specifiers": {
@@ -14,4 +13,3 @@ changes:
 10 | +    }
 11 | +  }
 12 | +}
-13 | +
