diff options
Diffstat (limited to 'pkg/integration/tests/interactive_rebase/amend_merge.go')
| -rw-r--r-- | pkg/integration/tests/interactive_rebase/amend_merge.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkg/integration/tests/interactive_rebase/amend_merge.go b/pkg/integration/tests/interactive_rebase/amend_merge.go index 8fcb850c6..76639ef46 100644 --- a/pkg/integration/tests/interactive_rebase/amend_merge.go +++ b/pkg/integration/tests/interactive_rebase/amend_merge.go @@ -27,27 +27,27 @@ var AmendMerge = NewIntegrationTest(NewIntegrationTestArgs{ Merge("feature-branch"). CreateFileAndAdd(postMergeFilename, postMergeFileContent) }, - Run: func(shell *Shell, input *Input, keys config.KeybindingConfig) { - input.Model().CommitCount(3) + Run: func(shell *Shell, t *TestDriver, keys config.KeybindingConfig) { + t.Model().CommitCount(3) mergeCommitMessage := "Merge branch 'feature-branch' into development-branch" - input.Model().HeadCommitMessage(Contains(mergeCommitMessage)) + t.Model().HeadCommitMessage(Contains(mergeCommitMessage)) - input.Views().Commits(). + t.Views().Commits(). Focus(). Press(keys.Commits.AmendToCommit) - input.ExpectConfirmation(). + t.ExpectConfirmation(). Title(Equals("Amend Commit")). Content(Contains("Are you sure you want to amend this commit with your staged files?")). Confirm() // assuring we haven't added a brand new commit - input.Model().CommitCount(3) - input.Model().HeadCommitMessage(Contains(mergeCommitMessage)) + t.Model().CommitCount(3) + t.Model().HeadCommitMessage(Contains(mergeCommitMessage)) // assuring the post-merge file shows up in the merge commit. - input.Views().Main(). + t.Views().Main(). Content(Contains(postMergeFilename)). Content(Contains("++" + postMergeFileContent)) }, |