-
Notifications
You must be signed in to change notification settings - Fork 170
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
90 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,3 +10,5 @@ | |
|
|
||
| /shims | ||
| /coverage | ||
| package-lock.json | ||
| node_modules | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -79,6 +79,7 @@ const testedPackageManagers: Array<[string, string]> = [ | |
| [`pnpm`, `6.6.2`], | ||
| [`pnpm`, `6.6.2+sha1.7b4d6b176c1b93b5670ed94c24babb7d80c13854`], | ||
| [`pnpm`, `6.6.2+sha224.eb5c0acad3b0f40ecdaa2db9aa5a73134ad256e17e22d1419a2ab073`], | ||
| [`cnpm`, `9.3.1`], | ||
| [`npm`, `6.14.2`], | ||
| [`npm`, `6.14.2+sha1.f057d35cd4792c4c511bb1fa332edb43143d07b0`], | ||
| [`npm`, `6.14.2+sha224.50512c1eb404900ee78586faa6d756b8d867ff46a328e6fb4cdf3a87`], | ||
|
|
@@ -94,7 +95,7 @@ for (const [name, version] of testedPackageManagers) { | |
| await expect(runCli(cwd, [name, `--version`])).resolves.toMatchObject({ | ||
| exitCode: 0, | ||
| stderr: ``, | ||
| stdout: `${version.split(`+`, 1)[0]}\n`, | ||
| stdout: expect.stringMatching(new RegExp(version.split(`+`, 1)[0])), | ||
| }); | ||
| }); | ||
| }); | ||
|
|
@@ -221,6 +222,12 @@ it(`should use the pinned version when local projects don't list any spec`, asyn | |
| exitCode: 0, | ||
| }); | ||
|
|
||
| await expect(runCli(cwd, [`cnpm`, `--version`])).resolves.toMatchObject({ | ||
| stdout: expect.stringMatching(new RegExp(config.definitions.cnpm.default.split(`+`, 1)[0])), | ||
| stderr: ``, | ||
| exitCode: 0, | ||
| }); | ||
|
|
||
| await expect(runCli(cwd, [`npm`, `--version`])).resolves.toMatchObject({ | ||
| stdout: `${config.definitions.npm.default.split(`+`, 1)[0]}\n`, | ||
| stderr: ``, | ||
|
|
@@ -306,6 +313,11 @@ it(`should refuse to run a different package manager within a configured project | |
| exitCode: 1, | ||
| }); | ||
|
|
||
| await expect(runCli(cwd, [`cnpm`, `--version`])).resolves.toMatchObject({ | ||
| stdout: `Usage Error: This project is configured to use yarn\n\n$ cnpm ...\n`, | ||
| exitCode: 1, | ||
| }); | ||
|
|
||
| // Disable strict checking to workaround the UsageError. | ||
| process.env.COREPACK_ENABLE_STRICT = `0`; | ||
|
|
||
|
|
@@ -320,6 +332,11 @@ it(`should refuse to run a different package manager within a configured project | |
| stderr: ``, | ||
| exitCode: 0, | ||
| }); | ||
| await expect(runCli(cwd, [`cnpm`, `--version`])).resolves.toMatchObject({ | ||
| stdout: expect.stringMatching(new RegExp(config.definitions.cnpm.default.split(`+`, 1)[0])), | ||
| stderr: ``, | ||
| exitCode: 0, | ||
| }); | ||
| } finally { | ||
| delete process.env.COREPACK_ENABLE_STRICT; | ||
| delete process.env.FORCE_COLOR; | ||
|
|
@@ -346,6 +363,11 @@ it(`should always use fallback version when project spec env is disabled`, async | |
| stderr: ``, | ||
| exitCode: 0, | ||
| }); | ||
| await expect(runCli(cwd, [`cnpm`, `--version`])).resolves.toMatchObject({ | ||
| stdout: expect.stringMatching(new RegExp(config.definitions.cnpm.default.split(`+`, 1)[0])), | ||
| stderr: ``, | ||
| exitCode: 0, | ||
| }); | ||
| } finally { | ||
| delete process.env.COREPACK_ENABLE_PROJECT_SPEC; | ||
| } | ||
|
|
@@ -378,6 +400,12 @@ it(`should allow to call "corepack install -g --all" to prepare all package mana | |
| exitCode: 0, | ||
| }); | ||
|
|
||
| await expect(runCli(cwd, [`cnpm`, `--version`])).resolves.toMatchObject({ | ||
| stdout: expect.stringMatching(new RegExp(config.definitions.cnpm.default.split(`+`, 1)[0])), | ||
| stderr: ``, | ||
| exitCode: 0, | ||
| }); | ||
|
|
||
| await expect(runCli(cwd, [`npm`, `--version`])).resolves.toMatchObject({ | ||
| stdout: `${config.definitions.npm.default.split(`+`, 1)[0]}\n`, | ||
| stderr: ``, | ||
|
|
@@ -482,7 +510,7 @@ it(`should support hydrating package managers if cache folder was removed`, asyn | |
|
|
||
| it(`should support hydrating multiple package managers from cached archives`, async () => { | ||
| await xfs.mktempPromise(async cwd => { | ||
| await expect(runCli(cwd, [`pack`, `[email protected]`, `[email protected]`])).resolves.toMatchObject({ | ||
| await expect(runCli(cwd, [`pack`, `[email protected]`, `[email protected]`, `[email protected]`])).resolves.toMatchObject({ | ||
| exitCode: 0, | ||
| stderr: ``, | ||
| }); | ||
|
|
@@ -518,6 +546,16 @@ it(`should support hydrating multiple package managers from cached archives`, as | |
| stderr: ``, | ||
| exitCode: 0, | ||
| }); | ||
|
|
||
| await xfs.writeJsonPromise(ppath.join(cwd, `package.json` as Filename), { | ||
| packageManager: `[email protected]`, | ||
| }); | ||
|
|
||
| await expect(runCli(cwd, [`cnpm`, `--version`])).resolves.toMatchObject({ | ||
| stdout: expect.stringMatching(/cnpm@9\.3\.1/), | ||
| stderr: ``, | ||
| exitCode: 0, | ||
| }); | ||
| } finally { | ||
| delete process.env.COREPACK_ENABLE_NETWORK; | ||
| } | ||
|
|
||