From 9fef4447b67c499fe34d40bc5dadc5941ac39b7c Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 28 Dec 2022 11:00:22 +1100 Subject: move popup assertions into a struct --- pkg/integration/tests/stash/rename.go | 2 +- pkg/integration/tests/stash/stash.go | 4 ++-- pkg/integration/tests/stash/stash_including_untracked_files.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'pkg/integration/tests/stash') diff --git a/pkg/integration/tests/stash/rename.go b/pkg/integration/tests/stash/rename.go index fded5041c..0b47bcef3 100644 --- a/pkg/integration/tests/stash/rename.go +++ b/pkg/integration/tests/stash/rename.go @@ -28,7 +28,7 @@ var Rename = NewIntegrationTest(NewIntegrationTestArgs{ SelectNextItem(). Press(keys.Stash.RenameStash). Tap(func() { - t.ExpectPrompt().Title(Equals("Rename stash: stash@{1}")).Type(" baz").Confirm() + t.ExpectPopup().Prompt().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 c627faaf8..f88aac2d0 100644 --- a/pkg/integration/tests/stash/stash.go +++ b/pkg/integration/tests/stash/stash.go @@ -25,9 +25,9 @@ var Stash = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Files.ViewStashOptions) - t.ExpectMenu().Title(Equals("Stash options")).Select(MatchesRegexp("stash all changes$")).Confirm() + t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(MatchesRegexp("stash all changes$")).Confirm() - t.ExpectPrompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm() + t.ExpectPopup().Prompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm() t.Views().Stash(). Lines( diff --git a/pkg/integration/tests/stash/stash_including_untracked_files.go b/pkg/integration/tests/stash/stash_including_untracked_files.go index 756f7948e..770c87b9c 100644 --- a/pkg/integration/tests/stash/stash_including_untracked_files.go +++ b/pkg/integration/tests/stash/stash_including_untracked_files.go @@ -27,9 +27,9 @@ var StashIncludingUntrackedFiles = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Files.ViewStashOptions) - t.ExpectMenu().Title(Equals("Stash options")).Select(Contains("stash all changes including untracked files")).Confirm() + t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(Contains("stash all changes including untracked files")).Confirm() - t.ExpectPrompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm() + t.ExpectPopup().Prompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm() t.Views().Stash(). Lines( -- cgit v1.2.3