Add CheckoutBranch and Merge helpers for integration tests

mark2185 · mark2185 · commit 4c7d36395928 · 2022-09-24T23:37:17.000+02:00
diff --git a/pkg/integration/components/shell.go b/pkg/integration/components/shell.go
@@ -63,6 +63,10 @@ func (s *Shell) Checkout(name string) *Shell {
 	return s.RunCommand("git checkout " + name)
 }
 
+func (s *Shell) Merge(name string) *Shell {
+	return s.RunCommand("git merge --commit " + name)
+}
+
 func (s *Shell) GitAdd(path string) *Shell {
 	return s.RunCommand(fmt.Sprintf("git add \"%s\"", path))
 }

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,10 @@ func (s Shell) Checkout(name string) Shell {`
`63`	`63`	`return s.RunCommand("git checkout " + name)`
`64`	`64`	`}`
`65`	`65`
	`66`	`+func (s Shell) Merge(name string) Shell {`
	`67`	`+ return s.RunCommand("git merge --commit " + name)`
	`68`	`+}`
	`69`	`+`
`66`	`70`	`func (s Shell) GitAdd(path string) Shell {`
`67`	`71`	`return s.RunCommand(fmt.Sprintf("git add \"%s\"", path))`
`68`	`72`	`}`