diff options
Diffstat (limited to 'pkg/integration/tests/file/discard_changes.go')
| -rw-r--r-- | pkg/integration/tests/file/discard_changes.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkg/integration/tests/file/discard_changes.go b/pkg/integration/tests/file/discard_changes.go index b36b9a0ab..785d8558e 100644 --- a/pkg/integration/tests/file/discard_changes.go +++ b/pkg/integration/tests/file/discard_changes.go @@ -71,8 +71,8 @@ var DiscardChanges = NewIntegrationTest(NewIntegrationTestArgs{ shell.RunShellCommand(`echo "renamed\nhaha" > renamed2.txt && git add renamed2.txt`) }, - 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) type statusFile struct { status string @@ -82,12 +82,12 @@ var DiscardChanges = NewIntegrationTest(NewIntegrationTestArgs{ discardOneByOne := func(files []statusFile) { for _, file := range files { - input.Views().Files(). + t.Views().Files(). IsFocused(). SelectedLine(Contains(file.status + " " + file.label)). Press(keys.Universal.Remove) - input.ExpectMenu().Title(Equals(file.menuTitle)).Select(Contains("discard all changes")).Confirm() + t.ExpectMenu().Title(Equals(file.menuTitle)).Select(Contains("discard all changes")).Confirm() } } @@ -101,7 +101,7 @@ var DiscardChanges = NewIntegrationTest(NewIntegrationTestArgs{ {status: "DU", label: "deleted-us.txt", menuTitle: "deleted-us.txt"}, }) - input.ExpectConfirmation(). + t.ExpectConfirmation(). Title(Equals("continue")). Content(Contains("all merge conflicts resolved. Continue?")). Cancel() @@ -121,6 +121,6 @@ var DiscardChanges = NewIntegrationTest(NewIntegrationTestArgs{ {status: "??", label: "new.txt", menuTitle: "new.txt"}, }) - input.Model().WorkingTreeFileCount(0) + t.Model().WorkingTreeFileCount(0) }, }) |