diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2023-07-20 11:17:01 +0200 |
|---|---|---|
| committer | Stefan Haller <stefan@haller-berlin.de> | 2023-07-23 13:55:48 +0200 |
| commit | c21633b1be684da2429f68eec034c51eaae4580b (patch) | |
| tree | c5f04818334563913e4513b2defc6bbd75a48992 /pkg/integration/tests/patch_building | |
| parent | 1b05ba252c7e5ff2725b41ca2643c61b9ed84979 (diff) | |
Prompt for commit message when moving a custom patch to a new commit
Diffstat (limited to 'pkg/integration/tests/patch_building')
| -rw-r--r-- | pkg/integration/tests/patch_building/move_to_new_commit.go | 8 | ||||
| -rw-r--r-- | pkg/integration/tests/patch_building/move_to_new_commit_partial_hunk.go | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/pkg/integration/tests/patch_building/move_to_new_commit.go b/pkg/integration/tests/patch_building/move_to_new_commit.go index 44d5ac167..1df3e5dcb 100644 --- a/pkg/integration/tests/patch_building/move_to_new_commit.go +++ b/pkg/integration/tests/patch_building/move_to_new_commit.go @@ -50,11 +50,15 @@ var MoveToNewCommit = NewIntegrationTest(NewIntegrationTestArgs{ t.Common().SelectPatchOption(Contains("Move patch into new commit")) + t.ExpectPopup().CommitMessagePanel(). + InitialText(Equals("")). + Type("new commit").Confirm() + t.Views().Commits(). IsFocused(). Lines( Contains("third commit"), - Contains(`Split from "commit to move from"`).IsSelected(), + Contains("new commit").IsSelected(), Contains("commit to move from"), Contains("first commit"), ). @@ -74,7 +78,7 @@ var MoveToNewCommit = NewIntegrationTest(NewIntegrationTestArgs{ IsFocused(). Lines( Contains("third commit"), - Contains(`Split from "commit to move from"`).IsSelected(), + Contains("new commit").IsSelected(), Contains("commit to move from"), Contains("first commit"), ). diff --git a/pkg/integration/tests/patch_building/move_to_new_commit_partial_hunk.go b/pkg/integration/tests/patch_building/move_to_new_commit_partial_hunk.go index 69c7cb9de..dd0b4c3f2 100644 --- a/pkg/integration/tests/patch_building/move_to_new_commit_partial_hunk.go +++ b/pkg/integration/tests/patch_building/move_to_new_commit_partial_hunk.go @@ -47,6 +47,10 @@ var MoveToNewCommitPartialHunk = NewIntegrationTest(NewIntegrationTestArgs{ t.Common().SelectPatchOption(Contains("Move patch into new commit")) + t.ExpectPopup().CommitMessagePanel(). + InitialText(Equals("")). + Type("new commit").Confirm() + t.Views().CommitFiles(). IsFocused(). Lines( @@ -62,7 +66,7 @@ var MoveToNewCommitPartialHunk = NewIntegrationTest(NewIntegrationTestArgs{ IsFocused(). Lines( Contains("third commit"), - Contains(`Split from "commit to move from"`).IsSelected(), + Contains("new commit").IsSelected(), Contains("commit to move from"), Contains("first commit"), ). |