forked from lerna/lerna
-
Notifications
You must be signed in to change notification settings - Fork 0
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
23 changed files
with
69 additions
and
67 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
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 |
---|---|---|
|
@@ -3,7 +3,7 @@ | |
exports[`VersionCommand --exact updates existing exact versions 1`] = ` | ||
"v1.0.1 | ||
HEAD -> master, tag: v1.0.1 | ||
HEAD -> main, tag: v1.0.1 | ||
diff --git a/lerna.json b/lerna.json | ||
index SHA..SHA 100644 | ||
|
@@ -61,7 +61,7 @@ index SHA..SHA 100644 | |
exports[`VersionCommand --exact updates matching local dependencies of published packages with exact versions 1`] = ` | ||
"v1.0.1 | ||
HEAD -> master, tag: v1.0.1 | ||
HEAD -> main, tag: v1.0.1 | ||
diff --git a/lerna.json b/lerna.json | ||
index SHA..SHA 100644 | ||
|
@@ -129,7 +129,7 @@ Object { | |
exports[`VersionCommand --no-push versions changed packages without git push 1`] = ` | ||
"v1.0.1 | ||
HEAD -> master, tag: v1.0.1 | ||
HEAD -> main, tag: v1.0.1 | ||
diff --git a/lerna.json b/lerna.json | ||
index SHA..SHA 100644 | ||
|
@@ -196,7 +196,7 @@ exports[`VersionCommand independent mode versions changed packages: commit 1`] = | |
- [email protected] | ||
- [email protected] | ||
HEAD -> master, tag: [email protected], tag: [email protected], tag: [email protected], tag: [email protected], tag: [email protected] | ||
HEAD -> main, tag: [email protected], tag: [email protected], tag: [email protected], tag: [email protected], tag: [email protected] | ||
diff --git a/packages/package-1/package.json b/packages/package-1/package.json | ||
index SHA..SHA 100644 | ||
|
@@ -265,7 +265,7 @@ Object { | |
exports[`VersionCommand normal mode bumps all packages when major version selected 1`] = ` | ||
"v2.0.0 | ||
HEAD -> master, tag: v2.0.0 | ||
HEAD -> main, tag: v2.0.0 | ||
diff --git a/lerna.json b/lerna.json | ||
index SHA..SHA 100644 | ||
|
@@ -326,7 +326,7 @@ index SHA..SHA 100644 | |
exports[`VersionCommand normal mode only bumps changed packages when non-major version selected 1`] = ` | ||
"v1.1.0 | ||
HEAD -> master, tag: v1.1.0 | ||
HEAD -> main, tag: v1.1.0 | ||
diff --git a/lerna.json b/lerna.json | ||
index SHA..SHA 100644 | ||
|
@@ -347,7 +347,7 @@ index SHA..SHA 100644 | |
exports[`VersionCommand normal mode versions changed packages: commit 1`] = ` | ||
"v1.0.1 | ||
HEAD -> master, tag: v1.0.1 | ||
HEAD -> main, tag: v1.0.1 | ||
diff --git a/lerna.json b/lerna.json | ||
index SHA..SHA 100644 | ||
|
@@ -470,7 +470,7 @@ Array [ | |
exports[`VersionCommand versions all transitive dependents after change 1`] = ` | ||
"v2.0.0 | ||
HEAD -> master, tag: v2.0.0 | ||
HEAD -> main, tag: v2.0.0 | ||
diff --git a/lerna.json b/lerna.json | ||
index SHA..SHA 100644 | ||
|
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 |
---|---|---|
|
@@ -3,7 +3,7 @@ | |
exports[`--conventional-commits fixed mode should guess prerelease version bumps and generate CHANGELOG 1`] = ` | ||
"v2.0.0-alpha.0 | ||
HEAD -> master, tag: v2.0.0-alpha.0 | ||
HEAD -> main, tag: v2.0.0-alpha.0 | ||
CHANGELOG.md | ||
lerna.json | ||
|
@@ -22,7 +22,7 @@ packages/package-5/package.json" | |
exports[`--conventional-commits fixed mode should use conventional-commits utility to guess version bump and generate CHANGELOG 1`] = ` | ||
"v2.0.0 | ||
HEAD -> master, tag: v2.0.0 | ||
HEAD -> main, tag: v2.0.0 | ||
CHANGELOG.md | ||
lerna.json | ||
|
@@ -47,7 +47,7 @@ exports[`--conventional-commits independent should graduate prerelease version b | |
- [email protected] | ||
- [email protected] | ||
HEAD -> master, tag: [email protected], tag: [email protected], tag: [email protected], tag: [email protected], tag: [email protected] | ||
HEAD -> main, tag: [email protected], tag: [email protected], tag: [email protected], tag: [email protected], tag: [email protected] | ||
packages/package-1/CHANGELOG.md | ||
packages/package-1/package.json | ||
|
@@ -70,7 +70,7 @@ exports[`--conventional-commits independent should guess prerelease version bump | |
- [email protected] | ||
- [email protected] | ||
HEAD -> master, tag: [email protected], tag: [email protected], tag: [email protected], tag: [email protected], tag: [email protected] | ||
HEAD -> main, tag: [email protected], tag: [email protected], tag: [email protected], tag: [email protected], tag: [email protected] | ||
packages/package-1/CHANGELOG.md | ||
packages/package-1/package.json | ||
|
@@ -93,7 +93,7 @@ exports[`--conventional-commits independent should use conventional-commits util | |
- [email protected] | ||
- [email protected] | ||
HEAD -> master, tag: [email protected], tag: [email protected], tag: [email protected], tag: [email protected], tag: [email protected] | ||
HEAD -> main, tag: [email protected], tag: [email protected], tag: [email protected], tag: [email protected], tag: [email protected] | ||
packages/package-1/CHANGELOG.md | ||
packages/package-1/package.json | ||
|
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 |
---|---|---|
|
@@ -26,11 +26,11 @@ test("gitPush", async () => { | |
await execa("git", ["tag", "[email protected]", "-m", "[email protected]"], { cwd }); | ||
await execa("git", ["tag", "[email protected]", "-m", "[email protected]"], { cwd }); | ||
|
||
await gitPush("origin", "master", { cwd }); | ||
await gitPush("origin", "main", { cwd }); | ||
|
||
expect(childProcess.exec).toHaveBeenLastCalledWith( | ||
"git", | ||
["push", "--follow-tags", "--no-verify", "--atomic", "origin", "master"], | ||
["push", "--follow-tags", "--no-verify", "--atomic", "origin", "main"], | ||
{ cwd } | ||
); | ||
|
||
|
@@ -50,7 +50,7 @@ test("remote that does not support --atomic", async () => { | |
childProcess.exec.mockImplementationOnce(async () => { | ||
const stderr = "fatal: the receiving end does not support --atomic push"; | ||
const error = new Error( | ||
["Command failed: git push --follow-tags --atomic --no-verify origin master", stderr].join("\n") | ||
["Command failed: git push --follow-tags --atomic --no-verify origin main", stderr].join("\n") | ||
); | ||
|
||
error.stderr = stderr; | ||
|
@@ -59,12 +59,12 @@ test("remote that does not support --atomic", async () => { | |
}); | ||
|
||
// this call should _not_ throw | ||
await gitPush("origin", "master", { cwd }); | ||
await gitPush("origin", "main", { cwd }); | ||
|
||
expect(childProcess.exec).toHaveBeenCalledTimes(2); | ||
expect(childProcess.exec).toHaveBeenLastCalledWith( | ||
"git", | ||
["push", "--follow-tags", "--no-verify", "origin", "master"], | ||
["push", "--follow-tags", "--no-verify", "origin", "main"], | ||
{ cwd } | ||
); | ||
|
||
|
@@ -84,7 +84,7 @@ test("remote that does not support --atomic and git stderr redirected to stdout | |
childProcess.exec.mockImplementationOnce(async () => { | ||
const stdout = "fatal: the receiving end does not support --atomic push"; | ||
const error = new Error( | ||
["Command failed: git push --follow-tags --atomic --no-verify origin master", stdout].join("\n") | ||
["Command failed: git push --follow-tags --atomic --no-verify origin main", stdout].join("\n") | ||
); | ||
|
||
error.stdout = stdout; | ||
|
@@ -93,12 +93,12 @@ test("remote that does not support --atomic and git stderr redirected to stdout | |
}); | ||
|
||
// this call should _not_ throw | ||
await gitPush("origin", "master", { cwd }); | ||
await gitPush("origin", "main", { cwd }); | ||
|
||
expect(childProcess.exec).toHaveBeenCalledTimes(2); | ||
expect(childProcess.exec).toHaveBeenLastCalledWith( | ||
"git", | ||
["push", "--follow-tags", "--no-verify", "origin", "master"], | ||
["push", "--follow-tags", "--no-verify", "origin", "main"], | ||
{ cwd } | ||
); | ||
|
||
|
@@ -116,15 +116,15 @@ test("git cli that does not support --atomic", async () => { | |
childProcess.exec.mockImplementationOnce(async () => { | ||
const stderr = "error: unknown option `atomic'"; | ||
const error = new Error( | ||
["Command failed: git push --follow-tags --atomic --no-verify origin master", stderr].join("\n") | ||
["Command failed: git push --follow-tags --atomic --no-verify origin main", stderr].join("\n") | ||
); | ||
|
||
error.stderr = stderr; | ||
|
||
throw error; | ||
}); | ||
|
||
await gitPush("origin", "master", { cwd }); | ||
await gitPush("origin", "main", { cwd }); | ||
|
||
await expect(listRemoteTags(cwd)).resolves.toMatch("v7.8.9"); | ||
}); | ||
|
@@ -135,13 +135,13 @@ test("unexpected git error", async () => { | |
childProcess.exec.mockImplementationOnce(async () => { | ||
const stderr = "fatal: some unexpected error"; | ||
const error = new Error( | ||
["Command failed: git push --follow-tags --atomic --no-verify origin master", stderr].join("\n") | ||
["Command failed: git push --follow-tags --atomic --no-verify origin main", stderr].join("\n") | ||
); | ||
|
||
error.stderr = stderr; | ||
|
||
throw error; | ||
}); | ||
|
||
await expect(gitPush("origin", "master", { cwd })).rejects.toThrowError(/some unexpected error/); | ||
await expect(gitPush("origin", "main", { cwd })).rejects.toThrowError(/some unexpected error/); | ||
}); |
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 |
---|---|---|
|
@@ -228,7 +228,7 @@ test("independent version prerelease respects --no-private", async () => { | |
- [email protected] | ||
HEAD -> master, tag: [email protected] | ||
HEAD -> main, tag: [email protected] | ||
packages/pkg-1/package.json | ||
`); | ||
|
Oops, something went wrong.