Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions integration-tests/variable_write_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,49 @@ func TestVariableCreateDefaultEnvironment(t *testing.T) {
assertTrimmed(t, "bar foo", f.Run("var:get", "-p", p, "-e", "main", "env:FOOBAR", "-P", "value"))
}

func TestVariableCreateUpdateWithLevel(t *testing.T) {
// Regression test for CLI-194: "var:create --update" must forward --level to var:update.
s := setupVariableTest(t)
s.apiHandler.SetEnvironments([]*mockapi.Environment{s.mainEnv})

f, p := s.factory, s.projectID

f.Run("var:create", "-p", p, "-l", "e", "-e", "main", "env:TEST", "--value", "e0")
f.Run("var:create", "-p", p, "-l", "p", "env:TEST", "--value", "p0")

//nolint:lll
_, stdErr, err := f.RunCombinedOutput("var:create", "-p", p, "-u", "-e", "main", "-l", "e", "env:TEST", "--value", "e1")
assert.NoError(t, err)
assert.NotContains(t, stdErr, "found at both")
assertTrimmed(t, "e1", f.Run("var:get", "-p", p, "-e", "main", "env:TEST", "-l", "e", "-P", "value"))
assertTrimmed(t, "p0", f.Run("var:get", "-p", p, "-e", "main", "env:TEST", "-l", "p", "-P", "value"))

_, _, err = f.RunCombinedOutput("var:create", "-p", p, "-u", "-e", "main", "-l", "p", "env:TEST", "--value", "p1")
assert.NoError(t, err)
assertTrimmed(t, "p1", f.Run("var:get", "-p", p, "-e", "main", "env:TEST", "-l", "p", "-P", "value"))
assertTrimmed(t, "e1", f.Run("var:get", "-p", p, "-e", "main", "env:TEST", "-l", "e", "-P", "value"))

// Project level, without an environment.
s = setupVariableTest(t)
s.apiHandler.SetEnvironments([]*mockapi.Environment{s.mainEnv})
f, p = s.factory, s.projectID

f.Run("var:create", "-p", p, "-l", "p", "env:P", "--value", "p0")
_, _, err = f.RunCombinedOutput("var:create", "-p", p, "-u", "-l", "p", "env:P", "--value", "p1")
assert.NoError(t, err)
assertTrimmed(t, "p1", f.Run("var:get", "-p", p, "env:P", "-l", "p", "-P", "value"))

// Without --level.
s = setupVariableTest(t)
s.apiHandler.SetEnvironments([]*mockapi.Environment{s.mainEnv})
f, p = s.factory, s.projectID

f.Run("var:create", "-p", p, "-l", "e", "-e", "main", "env:E", "--value", "e0")
_, _, err = f.RunCombinedOutput("var:create", "-p", p, "-u", "-e", "main", "env:E", "--value", "e1")
assert.NoError(t, err)
assertTrimmed(t, "e1", f.Run("var:get", "-p", p, "-e", "main", "env:E", "-l", "e", "-P", "value"))
}

func TestVariableCreateWithAppScope(t *testing.T) {
s := setupVariableTest(t)

Expand Down
2 changes: 1 addition & 1 deletion legacy/src/Command/Variable/VariableCreateCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
foreach ($this->form->getFields() as $field) {
$argName = '--' . $field->getOptionName();
$value = $field->getValueFromInput($input, false);
if ($value !== null && !in_array($argName, ['--name', '--level', '--prefix'])) {
if ($value !== null && !in_array($argName, ['--name', '--prefix'])) {
$arguments[$argName] = $value;
}
}
Expand Down
Loading