diff options
Diffstat (limited to 'pkg/integration/tests/stash')
| -rw-r--r-- | pkg/integration/tests/stash/rename.go | 6 | ||||
| -rw-r--r-- | pkg/integration/tests/stash/stash.go | 16 | ||||
| -rw-r--r-- | pkg/integration/tests/stash/stash_including_untracked_files.go | 16 |
3 files changed, 19 insertions, 19 deletions
diff --git a/pkg/integration/tests/stash/rename.go b/pkg/integration/tests/stash/rename.go index d18ea6f38..5f48c80a2 100644 --- a/pkg/integration/tests/stash/rename.go +++ b/pkg/integration/tests/stash/rename.go @@ -18,8 +18,8 @@ var Rename = NewIntegrationTest(NewIntegrationTestArgs{ CreateFileAndAdd("file-2", "change to stash2"). StashWithMessage("bar") }, - Run: func(shell *Shell, input *Input, keys config.KeybindingConfig) { - input.Views().Stash(). + Run: func(shell *Shell, t *TestDriver, keys config.KeybindingConfig) { + t.Views().Stash(). Focus(). Lines( Equals("On master: bar"), @@ -28,7 +28,7 @@ var Rename = NewIntegrationTest(NewIntegrationTestArgs{ SelectNextItem(). Press(keys.Stash.RenameStash). Tap(func() { - input.ExpectPrompt().Title(Equals("Rename stash: stash@{1}")).Type(" baz").Confirm() + t.ExpectPrompt().Title(Equals("Rename stash: stash@{1}")).Type(" baz").Confirm() }). SelectedLine(Equals("On master: foo baz")) }, diff --git a/pkg/integration/tests/stash/stash.go b/pkg/integration/tests/stash/stash.go index 34e376886..16c51537a 100644 --- a/pkg/integration/tests/stash/stash.go +++ b/pkg/integration/tests/stash/stash.go @@ -15,18 +15,18 @@ var Stash = NewIntegrationTest(NewIntegrationTestArgs{ shell.CreateFile("file", "content") shell.GitAddAll() }, - Run: func(shell *Shell, input *Input, keys config.KeybindingConfig) { - input.Model().StashCount(0) - input.Model().WorkingTreeFileCount(1) + Run: func(shell *Shell, t *TestDriver, keys config.KeybindingConfig) { + t.Model().StashCount(0) + t.Model().WorkingTreeFileCount(1) - input.Views().Files(). + t.Views().Files(). Press(keys.Files.ViewStashOptions) - input.ExpectMenu().Title(Equals("Stash options")).Select(MatchesRegexp("stash all changes$")).Confirm() + t.ExpectMenu().Title(Equals("Stash options")).Select(MatchesRegexp("stash all changes$")).Confirm() - input.ExpectPrompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm() + t.ExpectPrompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm() - input.Model().StashCount(1) - input.Model().WorkingTreeFileCount(0) + t.Model().StashCount(1) + t.Model().WorkingTreeFileCount(0) }, }) diff --git a/pkg/integration/tests/stash/stash_including_untracked_files.go b/pkg/integration/tests/stash/stash_including_untracked_files.go index d923aca3a..cc38f2ee8 100644 --- a/pkg/integration/tests/stash/stash_including_untracked_files.go +++ b/pkg/integration/tests/stash/stash_including_untracked_files.go @@ -16,18 +16,18 @@ var StashIncludingUntrackedFiles = NewIntegrationTest(NewIntegrationTestArgs{ shell.CreateFile("file_2", "content") shell.GitAdd("file_1") }, - Run: func(shell *Shell, input *Input, keys config.KeybindingConfig) { - input.Model().StashCount(0) - input.Model().WorkingTreeFileCount(2) + Run: func(shell *Shell, t *TestDriver, keys config.KeybindingConfig) { + t.Model().StashCount(0) + t.Model().WorkingTreeFileCount(2) - input.Views().Files(). + t.Views().Files(). Press(keys.Files.ViewStashOptions) - input.ExpectMenu().Title(Equals("Stash options")).Select(Contains("stash all changes including untracked files")).Confirm() + t.ExpectMenu().Title(Equals("Stash options")).Select(Contains("stash all changes including untracked files")).Confirm() - input.ExpectPrompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm() + t.ExpectPrompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm() - input.Model().StashCount(1) - input.Model().WorkingTreeFileCount(0) + t.Model().StashCount(1) + t.Model().WorkingTreeFileCount(0) }, }) |