mirror of
https://git.vectorsigma.ru/public/atlantis.git
synced 2026-07-28 23:18:15 +00:00
test: update test expectations to match fixed error messages
This commit is contained in:
@@ -467,7 +467,7 @@ func TestStep_Validate(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
expErr: "\"run\" step \"shellArgs\" option must be a string or a list of strings, found [42 42]\n",
|
expErr: "\"run\" step \"shellArgs\" option must be a string or a list of strings, found [42 42]",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
description: "run step with shellArgs contain not strings",
|
description: "run step with shellArgs contain not strings",
|
||||||
@@ -481,7 +481,7 @@ func TestStep_Validate(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
expErr: "\"run\" step \"shellArgs\" option must contain only strings, found 42\n",
|
expErr: "\"run\" step \"shellArgs\" option must contain only strings, found 42",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
// For atlantis.yaml v2, this wouldn't parse, but now there should
|
// For atlantis.yaml v2, this wouldn't parse, but now there should
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ func TestMultiEnvStepRunner_Run(t *testing.T) {
|
|||||||
{
|
{
|
||||||
Command: `echo 'TF_VAR_REPODEFINEDVARIABLE_NO_VALUE'`,
|
Command: `echo 'TF_VAR_REPODEFINEDVARIABLE_NO_VALUE'`,
|
||||||
Output: valid.PostProcessRunOutputShow,
|
Output: valid.PostProcessRunOutputShow,
|
||||||
ExpErr: "Invalid environment variable definition: TF_VAR_REPODEFINEDVARIABLE_NO_VALUE",
|
ExpErr: "invalid environment variable definition: TF_VAR_REPODEFINEDVARIABLE_NO_VALUE",
|
||||||
ExpEnv: map[string]string{},
|
ExpEnv: map[string]string{},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1060,7 +1060,7 @@ func TestGithubClient_MergePullCorrectMethod(t *testing.T) {
|
|||||||
allowSquash: true,
|
allowSquash: true,
|
||||||
mergeMethodOption: "merge",
|
mergeMethodOption: "merge",
|
||||||
expMethod: "",
|
expMethod: "",
|
||||||
expErr: "Merge method 'merge' is not allowed by the repository Pull Request settings",
|
expErr: "merge method 'merge' is not allowed by the repository Pull Request settings",
|
||||||
},
|
},
|
||||||
"merge with rebase: overridden by command: rebase not allowed": {
|
"merge with rebase: overridden by command: rebase not allowed": {
|
||||||
allowMerge: true,
|
allowMerge: true,
|
||||||
@@ -1068,7 +1068,7 @@ func TestGithubClient_MergePullCorrectMethod(t *testing.T) {
|
|||||||
allowSquash: true,
|
allowSquash: true,
|
||||||
mergeMethodOption: "rebase",
|
mergeMethodOption: "rebase",
|
||||||
expMethod: "",
|
expMethod: "",
|
||||||
expErr: "Merge method 'rebase' is not allowed by the repository Pull Request settings",
|
expErr: "merge method 'rebase' is not allowed by the repository Pull Request settings",
|
||||||
},
|
},
|
||||||
"merge with squash: overridden by command: squash not allowed": {
|
"merge with squash: overridden by command: squash not allowed": {
|
||||||
allowMerge: true,
|
allowMerge: true,
|
||||||
@@ -1076,7 +1076,7 @@ func TestGithubClient_MergePullCorrectMethod(t *testing.T) {
|
|||||||
allowSquash: false,
|
allowSquash: false,
|
||||||
mergeMethodOption: "squash",
|
mergeMethodOption: "squash",
|
||||||
expMethod: "",
|
expMethod: "",
|
||||||
expErr: "Merge method 'squash' is not allowed by the repository Pull Request settings",
|
expErr: "merge method 'squash' is not allowed by the repository Pull Request settings",
|
||||||
},
|
},
|
||||||
"merge with unknown: overridden by command: unknown doesn't exist": {
|
"merge with unknown: overridden by command: unknown doesn't exist": {
|
||||||
allowMerge: true,
|
allowMerge: true,
|
||||||
@@ -1084,7 +1084,7 @@ func TestGithubClient_MergePullCorrectMethod(t *testing.T) {
|
|||||||
allowSquash: true,
|
allowSquash: true,
|
||||||
mergeMethodOption: "unknown",
|
mergeMethodOption: "unknown",
|
||||||
expMethod: "",
|
expMethod: "",
|
||||||
expErr: "Merge method 'unknown' is unknown. Specify one of the valid values: 'merge, rebase, squash'",
|
expErr: "merge method 'unknown' is unknown. Specify one of the valid values: 'merge, rebase, squash'",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user