diff options
| author | Gustavo Krieger <gustavopcassol@gmail.com> | 2023-07-02 01:03:16 -0300 |
|---|---|---|
| committer | Gustavo Krieger <gustavopcassol@gmail.com> | 2023-07-02 02:07:32 -0300 |
| commit | 9ae771085034442e6f73ad538272e9148b5bfe7f (patch) | |
| tree | 24c8fec5a8b0d37a1c5c16fd5bd4a31d9024b46f /pkg/integration | |
| parent | 87fe30d50daf522f656891851d50eb790bbff2fc (diff) | |
Use comment char config on interactive rebase
Co-authored-by: Stefan Haller <stefan@haller-berlin.de>
Diffstat (limited to 'pkg/integration')
| -rw-r--r-- | pkg/integration/tests/interactive_rebase/drop_with_custom_comment_char.go | 10 | ||||
| -rw-r--r-- | pkg/integration/tests/interactive_rebase/move_with_custom_comment_char.go | 12 |
2 files changed, 6 insertions, 16 deletions
diff --git a/pkg/integration/tests/interactive_rebase/drop_with_custom_comment_char.go b/pkg/integration/tests/interactive_rebase/drop_with_custom_comment_char.go index 6e93b6faa..dbaa77b90 100644 --- a/pkg/integration/tests/interactive_rebase/drop_with_custom_comment_char.go +++ b/pkg/integration/tests/interactive_rebase/drop_with_custom_comment_char.go @@ -27,16 +27,8 @@ var DropWithCustomCommentChar = NewIntegrationTest(NewIntegrationTestArgs{ Content(Equals("Are you sure you want to delete this commit?")). Confirm() }). - // The following behavior requires correction: - Tap(func() { - t.ExpectPopup().Alert(). - Title(Equals("Error")). - Content(Contains("failed to parse line")). - Confirm() - }). Lines( - Contains("commit 02").IsSelected(), - Contains("commit 01"), + Contains("commit 01").IsSelected(), ) }, }) diff --git a/pkg/integration/tests/interactive_rebase/move_with_custom_comment_char.go b/pkg/integration/tests/interactive_rebase/move_with_custom_comment_char.go index 0ff03169d..eefbcea33 100644 --- a/pkg/integration/tests/interactive_rebase/move_with_custom_comment_char.go +++ b/pkg/integration/tests/interactive_rebase/move_with_custom_comment_char.go @@ -21,13 +21,11 @@ var MoveWithCustomCommentChar = NewIntegrationTest(NewIntegrationTestArgs{ Contains("commit 01"), ). Press(keys.Commits.MoveDownCommit). - // The following behavior requires correction: - Tap(func() { - t.ExpectPopup().Alert(). - Title(Equals("Error")). - Content(Contains("failed to parse line")). - Confirm() - }). + Lines( + Contains("commit 01"), + Contains("commit 02").IsSelected(), + ). + Press(keys.Commits.MoveUpCommit). Lines( Contains("commit 02").IsSelected(), Contains("commit 01"), |