Skip to content

Commit edba306

Browse files
committed
fixup! Record package manager in package.json engines field
1 parent edf617d commit edba306

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

apps/spfx-cli/src/cli/actions/tests/CreateAction.test.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ const MockedLocal = LocalFileSystemRepositorySource as jest.MockedClass<
5353
typeof LocalFileSystemRepositorySource
5454
>;
5555
const MockedExecutable = Executable as unknown as { spawn: jest.Mock; waitForExitAsync: jest.Mock };
56-
const MockedTryRead = tryReadPackageManagerFromPackageJsonEnginesAsync as jest.Mock;
56+
const MockedTryReadPackageManagerFromPackageJsonEnginesAsync =
57+
tryReadPackageManagerFromPackageJsonEnginesAsync as jest.Mock;
5758
const MockedScaffoldLog = SPFxScaffoldLog as jest.MockedClass<typeof SPFxScaffoldLog> & {
5859
loadFromFolderAsync: jest.Mock;
5960
};
@@ -160,7 +161,7 @@ describe('CreateAction', () => {
160161
MockedScaffoldLog.loadFromFolderAsync.mockResolvedValue(
161162
createMockScaffoldLogInstance(false) as unknown as SPFxScaffoldLog
162163
);
163-
MockedTryRead.mockResolvedValue(undefined);
164+
MockedTryReadPackageManagerFromPackageJsonEnginesAsync.mockResolvedValue(undefined);
164165
});
165166

166167
afterEach(() => {
@@ -674,7 +675,7 @@ describe('CreateAction', () => {
674675
it('overrides --package-manager with engines value and warns', async () => {
675676
const mockInstance = createMockScaffoldLogInstance(true);
676677
MockedScaffoldLog.loadFromFolderAsync.mockResolvedValue(mockInstance as unknown as SPFxScaffoldLog);
677-
MockedTryRead.mockResolvedValue('pnpm');
678+
MockedTryReadPackageManagerFromPackageJsonEnginesAsync.mockResolvedValue('pnpm');
678679

679680
await runCreateAsync(['--package-manager', 'npm']);
680681

@@ -694,7 +695,7 @@ describe('CreateAction', () => {
694695
MockedScaffoldLog.loadFromFolderAsync.mockResolvedValue(
695696
createMockScaffoldLogInstance(true) as unknown as SPFxScaffoldLog
696697
);
697-
MockedTryRead.mockResolvedValue('npm');
698+
MockedTryReadPackageManagerFromPackageJsonEnginesAsync.mockResolvedValue('npm');
698699

699700
await runCreateAsync(['--package-manager', 'npm']);
700701

@@ -708,7 +709,7 @@ describe('CreateAction', () => {
708709
it('does not warn and skips install when --package-manager is "none"', async () => {
709710
const mockInstance = createMockScaffoldLogInstance(true);
710711
MockedScaffoldLog.loadFromFolderAsync.mockResolvedValue(mockInstance as unknown as SPFxScaffoldLog);
711-
MockedTryRead.mockResolvedValue('npm');
712+
MockedTryReadPackageManagerFromPackageJsonEnginesAsync.mockResolvedValue('npm');
712713

713714
await runCreateAsync(['--package-manager', 'none']);
714715
expect(MockedExecutable.spawn).not.toHaveBeenCalled();
@@ -722,7 +723,7 @@ describe('CreateAction', () => {
722723
it('does not warn and skips install when --package-manager is omitted', async () => {
723724
const mockInstance = createMockScaffoldLogInstance(true);
724725
MockedScaffoldLog.loadFromFolderAsync.mockResolvedValue(mockInstance as unknown as SPFxScaffoldLog);
725-
MockedTryRead.mockResolvedValue('npm');
726+
MockedTryReadPackageManagerFromPackageJsonEnginesAsync.mockResolvedValue('npm');
726727

727728
await runCreateAsync();
728729
expect(MockedExecutable.spawn).not.toHaveBeenCalled();
@@ -751,7 +752,7 @@ describe('CreateAction', () => {
751752
it('saves the scaffold log after scaffolding', async () => {
752753
const mockInstance = createMockScaffoldLogInstance(true);
753754
MockedScaffoldLog.loadFromFolderAsync.mockResolvedValue(mockInstance as unknown as SPFxScaffoldLog);
754-
MockedTryRead.mockResolvedValue('npm');
755+
MockedTryReadPackageManagerFromPackageJsonEnginesAsync.mockResolvedValue('npm');
755756

756757
await runCreateAsync(['--package-manager', 'npm']);
757758

0 commit comments

Comments
 (0)