tests

mtojek · mtojek · commit c503d1568607 · 2023-07-13T09:46:31.000+02:00
diff --git a/cli/templatepush.go b/cli/templatepush.go
@@ -189,11 +189,10 @@ func (r *RootCmd) templatePush() *clibase.Cmd {
 			var createTemplate bool
 			template, err := client.TemplateByName(inv.Context(), organization.ID, name)
 			if err != nil {
-				if create {
-					createTemplate = true
-				} else {
+				if !create {
 					return err
 				}
+				createTemplate = true
 			}
 
 			err = uploadFlags.checkForLockfile(inv)
diff --git a/cli/templatepush_test.go b/cli/templatepush_test.go
@@ -644,10 +644,13 @@ func TestTemplatePush(t *testing.T) {
 				write string
 			}{
 				{match: "Upload", write: "yes"},
+				{match: "template has been created"},
 			}
 			for _, m := range matches {
 				pty.ExpectMatch(m.match)
-				pty.WriteLine(m.write)
+				if m.write != "" {
+					pty.WriteLine(m.write)
+				}
 			}
 
 			waiter.RequireSuccess()

Original file line number	Diff line number	Diff line change
`@@ -189,11 +189,10 @@ func (r RootCmd) templatePush() clibase.Cmd {`
`189`	`189`	`var createTemplate bool`
`190`	`190`	`template, err := client.TemplateByName(inv.Context(), organization.ID, name)`
`191`	`191`	`if err != nil {`
`192`		`- if create {`
`193`		`- createTemplate = true`
`194`		`- } else {`
	`192`	`+ if !create {`
`195`	`193`	`return err`
`196`	`194`	`}`
	`195`	`+ createTemplate = true`
`197`	`196`	`}`
`198`	`197`
`199`	`198`	`err = uploadFlags.checkForLockfile(inv)`
Original file line number	Diff line number	Diff line change
`@@ -644,10 +644,13 @@ func TestTemplatePush(t *testing.T) {`
`644`	`644`	`write string`
`645`	`645`	`}{`
`646`	`646`	`{match: "Upload", write: "yes"},`
	`647`	`+ {match: "template has been created"},`
`647`	`648`	`}`
`648`	`649`	`for _, m := range matches {`
`649`	`650`	`pty.ExpectMatch(m.match)`
`650`		`- pty.WriteLine(m.write)`
	`651`	`+ if m.write != "" {`
	`652`	`+ pty.WriteLine(m.write)`
	`653`	`+ }`
`651`	`654`	`}`
`652`	`655`
`653`	`656`	`waiter.RequireSuccess()`