Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {Json} from "../../../src/json";
import {RecipeSpec} from "../../../src/test";
import {withDir} from "tmp-promise";
import {findMarker, MarkersKind} from "../../../src";
import * as semver from "semver";

describe("AddDependency", () => {

Expand Down Expand Up @@ -346,10 +347,10 @@ describe("AddDependency", () => {
throw new Error(`Expected root dependency lodash to be ^4.17.21, got ${rootPkg?.dependencies?.["lodash"]}`);
}

// lodash should be in node_modules
// lodash should be in node_modules with a version satisfying ^4.17.21
const lodashPkg = lockData.packages["node_modules/lodash"];
if (!lodashPkg?.version?.startsWith("4.17.")) {
throw new Error(`Expected lodash version to start with 4.17., got ${lodashPkg?.version}`);
if (!lodashPkg?.version || !semver.satisfies(lodashPkg.version, "^4.17.21")) {
throw new Error(`Expected lodash version satisfying ^4.17.21, got ${lodashPkg?.version}`);
}

return actual;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {RecipeSpec} from "../../../src/test";
import {withDir} from "tmp-promise";
import * as fs from "fs";
import * as path from "path";
import * as semver from "semver";

describe("UpgradeDependencyVersion", () => {

Expand Down Expand Up @@ -505,9 +506,11 @@ describe("UpgradeDependencyVersion", () => {
const marker = findNodeResolutionResult(doc);
expect(marker).toBeDefined();
expect(marker!.dependencies[0].versionConstraint).toBe("^4.17.23");
// The resolved version should still be 4.17.23 (unchanged)
// The resolved version should still satisfy ^4.17.23 (unchanged)
// This proves we didn't run npm install - just updated the constraint
expect(marker!.resolvedDependencies?.[0]?.version).toBe("4.17.23");
const resolvedVersion = marker!.resolvedDependencies?.[0]?.version;
expect(resolvedVersion).toBeDefined();
expect(semver.satisfies(resolvedVersion!, "^4.17.23")).toBe(true);
}
}
)
Expand Down