Files
pnpm/installing/deps-installer/test/install/gitBranchLockfile.test.ts
Zoltan Kochan 187049055f chore: upgrade @typescript/native-preview to 7.0.0-dev.20260421.2 (#11332)
* chore: upgrade @typescript/native-preview to 7.0.0-dev.20260421.2

- Add explicit `types: ["node"]` to the shared tsconfig because tsgo
  20260421 no longer auto-acquires `@types/*` from `node_modules`.
- Refactor test files to explicitly import jest globals (`describe`,
  `it`, `test`, `expect`, `beforeEach`, etc.) from `@jest/globals`
  instead of relying on `@types/jest` ambient declarations. Under the
  new tsgo build, `import { jest } from '@jest/globals'` shadows the
  ambient `jest` namespace, breaking `@types/jest`'s `declare var
  describe: jest.Describe;` globals.
- Add `@jest/globals` to each package's devDependencies where tests
  now import from it, and add `@types/node` to packages that need it
  but were relying on hoisted resolution.
- Replace `fail()` calls with `throw new Error(...)` since `fail` is
  no longer globally available.

* chore: fix remaining tsgo type-strictness errors

- Strip `as <PnpmType>` casts on objects passed to toMatchObject /
  toStrictEqual / toEqual; @jest/globals rejects the typed objects
  (which include AsymmetricMatchers) vs. the repo-specific type.
- Type `jest.fn<...>()` explicitly where the mock's signature matters
  for toHaveBeenCalledWith.
- Replace `beforeEach(() => X)` with `beforeEach(() => { X })` so the
  return value is void, as the stricter jest typing requires.
- Use `expect.objectContaining({...})` in one place where the full
  expected object triggered stricter type resolution.
- Cast `prompt.mock.calls` arg through `as unknown as Record<...>[]`
  for patch.test.ts's nested-array matchers.
- Fix off-by-one `<reference path>` in pnpm/test/getConfig.test.ts
  that only surfaced now.
- Move `@jest/globals` from devDependencies to dependencies in the
  two `__utils__` packages that import it from `src/`.
- Clean up unused imports from the @jest/globals migration.

* chore: address Copilot review on #11332

- Move misplaced `@jest/globals` imports to the top import block in
  checkEngine, run.ts, and workspace/root-finder tests where the
  script dropped them below executable code.
- Replace `try { await x(); throw new Error('should have thrown') } catch`
  in bins/linker, lockfile/fs, and resolving/local-resolver tests with
  `await expect(x()).rejects.toMatchObject({...})`. The old pattern
  swallowed an unrelated `throw` if the under-test call silently
  succeeded, which would fail on the catch-block assertion with a
  misleading message.
2026-04-21 22:50:40 +02:00

251 lines
6.7 KiB
TypeScript

import fs from 'node:fs'
import path from 'node:path'
import { expect, jest, test } from '@jest/globals'
import { LOCKFILE_VERSION, WANTED_LOCKFILE } from '@pnpm/constants'
import { prepareEmpty, preparePackages } from '@pnpm/prepare'
import type { ProjectManifest, ProjectRootDir } from '@pnpm/types'
import { writeYamlFileSync } from 'write-yaml-file'
import { testDefaults } from '../utils/index.js'
jest.unstable_mockModule('@pnpm/network.git-utils', () => ({ getCurrentBranch: jest.fn() }))
const { getCurrentBranch } = await import('@pnpm/network.git-utils')
const { install, mutateModules } = await import('@pnpm/installing.deps-installer')
test('install with git-branch-lockfile = true', async () => {
prepareEmpty()
const branchName: string = 'main-branch'
jest.mocked(getCurrentBranch).mockReturnValue(Promise.resolve(branchName))
const opts = testDefaults({
useGitBranchLockfile: true,
})
await install({
dependencies: {
'is-positive': '^3.0.0',
},
}, opts)
expect(fs.existsSync(`pnpm-lock.${branchName}.yaml`)).toBe(true)
expect(fs.existsSync(WANTED_LOCKFILE)).toBe(false)
})
test('install with git-branch-lockfile = true and no lockfile changes', async () => {
prepareEmpty()
const branchName: string = 'main-branch'
jest.mocked(getCurrentBranch).mockReturnValue(Promise.resolve(branchName))
const manifest: ProjectManifest = {
dependencies: {
'is-positive': '^3.0.0',
},
}
const opts1 = testDefaults({
useGitBranchLockfile: false,
})
await install(manifest, opts1)
expect(fs.existsSync(WANTED_LOCKFILE)).toBe(true)
const opts2 = testDefaults({
useGitBranchLockfile: true,
})
await install(manifest, opts2)
expect(fs.existsSync(WANTED_LOCKFILE)).toBe(true)
// Git branch lockfile is created only if there are changes in the lockfile
expect(fs.existsSync(`pnpm-lock.${branchName}.yaml`)).toBe(false)
})
test('install a workspace with git-branch-lockfile = true', async () => {
const rootManifest: ProjectManifest = {
name: 'root',
}
const project1Manifest: ProjectManifest = {
name: 'project-1',
dependencies: { 'is-positive': '1.0.0' },
}
const project2Manifest: ProjectManifest = {
name: 'project-2',
dependencies: { 'is-positive': '1.0.0' },
}
preparePackages([
{
location: '.',
package: rootManifest,
},
{
location: 'project-1',
package: project1Manifest,
},
{
location: 'project-2',
package: project2Manifest,
},
])
const branchName: string = 'main-branch'
jest.mocked(getCurrentBranch).mockReturnValue(Promise.resolve(branchName))
const opts = testDefaults({
useGitBranchLockfile: true,
allProjects: [
{
buildIndex: 0,
manifest: rootManifest,
rootDir: process.cwd() as ProjectRootDir,
},
{
buildIndex: 0,
manifest: project1Manifest,
rootDir: path.resolve('project-1') as ProjectRootDir,
},
{
buildIndex: 0,
manifest: project2Manifest,
rootDir: path.resolve('project-2') as ProjectRootDir,
},
],
})
await mutateModules([
{
mutation: 'install',
rootDir: process.cwd() as ProjectRootDir,
},
{
mutation: 'install',
rootDir: path.resolve('project-1') as ProjectRootDir,
},
{
mutation: 'install',
rootDir: path.resolve('project-2') as ProjectRootDir,
},
], opts)
expect(fs.existsSync(`pnpm-lock.${branchName}.yaml`)).toBe(true)
expect(fs.existsSync(WANTED_LOCKFILE)).toBe(false)
})
test('install with --merge-git-branch-lockfiles', async () => {
prepareEmpty()
const branchName: string = 'main-branch'
jest.mocked(getCurrentBranch).mockReturnValue(Promise.resolve(branchName))
const otherLockfilePath: string = path.resolve('pnpm-lock.other.yaml')
writeYamlFileSync(otherLockfilePath, {
whatever: 'whatever',
})
expect(fs.existsSync(otherLockfilePath)).toBe(true)
expect(fs.existsSync(WANTED_LOCKFILE)).toBe(false)
const opts = testDefaults({
useGitBranchLockfile: true,
mergeGitBranchLockfiles: true,
})
await install({
dependencies: {
'is-positive': '^3.0.0',
},
}, opts)
expect(fs.existsSync(otherLockfilePath)).toBe(false)
expect(fs.existsSync(WANTED_LOCKFILE)).toBe(true)
})
test('install with --merge-git-branch-lockfiles when merged lockfile is up to date', async () => {
const project = prepareEmpty()
// @types/semver installed in the main branch
writeYamlFileSync(WANTED_LOCKFILE, {
importers: {
'.': {
dependencies: {
'@types/semver': {
specifier: '5.3.31',
version: '5.3.31',
},
},
},
},
lockfileVersion: LOCKFILE_VERSION,
packages: {
'@types/semver@5.3.31': {
resolution: {
integrity: 'sha512-WBv5F9HrWTyG800cB9M3veCVkFahqXN7KA7c3VUCYZm/xhNzzIFiXiq+rZmj75j7GvWelN3YNrLX7FjtqBvhMw==',
},
},
},
snapshots: {
'@types/semver@5.3.31': {},
},
}, { lineWidth: 1000 })
const branchName: string = 'main-branch'
jest.mocked(getCurrentBranch).mockReturnValue(Promise.resolve(branchName))
// is-positive installed in the other branch
const otherLockfilePath: string = path.resolve('pnpm-lock.other.yaml')
const otherLockfileContent = {
importers: {
'.': {
dependencies: {
'@types/semver': {
specifier: '5.3.31',
version: '5.3.31',
},
'is-positive': {
specifier: '^3.1.0',
version: '3.1.0',
},
},
},
},
lockfileVersion: LOCKFILE_VERSION,
packages: {
'@types/semver@5.3.31': {
resolution: {
integrity: 'sha512-WBv5F9HrWTyG800cB9M3veCVkFahqXN7KA7c3VUCYZm/xhNzzIFiXiq+rZmj75j7GvWelN3YNrLX7FjtqBvhMw==',
},
},
'is-positive@3.1.0': {
resolution: {
integrity: 'sha512-8ND1j3y9/HP94TOvGzr69/FgbkX2ruOldhLEsTWwcJVfo4oRjwemJmJxt7RJkKYH8tz7vYBP9JcKQY8CLuJ90Q==',
},
},
},
snapshots: {
'@types/semver@5.3.31': {},
'is-positive@3.1.0': {},
},
}
writeYamlFileSync(otherLockfilePath, otherLockfileContent, { lineWidth: 1000 })
// the other branch merged to the main branch
const projectManifest: ProjectManifest = {
dependencies: {
'@types/semver': '5.3.31',
'is-positive': '^3.1.0',
},
}
const opts = testDefaults({
useGitBranchLockfile: true,
mergeGitBranchLockfiles: true,
frozenLockfile: true,
})
await install(projectManifest, opts)
expect(fs.existsSync(otherLockfilePath)).toBe(false)
expect(fs.existsSync(WANTED_LOCKFILE)).toBe(true)
const wantedLockfileAfterMergeOther = project.readLockfile()
expect(wantedLockfileAfterMergeOther).toEqual(otherLockfileContent)
})