diff options
Diffstat (limited to 'pkg/integration/tests/demo/interactive_rebase.go')
| -rw-r--r-- | pkg/integration/tests/demo/interactive_rebase.go | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/pkg/integration/tests/demo/interactive_rebase.go b/pkg/integration/tests/demo/interactive_rebase.go index 3d6709d87..b4a7337d6 100644 --- a/pkg/integration/tests/demo/interactive_rebase.go +++ b/pkg/integration/tests/demo/interactive_rebase.go @@ -14,12 +14,12 @@ var InteractiveRebase = NewIntegrationTest(NewIntegrationTestArgs{ setDefaultDemoConfig(config) }, SetupRepo: func(shell *Shell) { - shell.CreateFile("my-file.txt", "myfile content") - shell.CreateFile("my-other-file.rb", "my-other-file content") + shell.CreateRepoHistory() - shell.CreateNCommitsWithRandomMessages(60) shell.NewBranch("feature/demo") + shell.CreateNCommitsWithRandomMessages(10) + shell.CloneIntoRemote("origin") shell.SetBranchUpstream("feature/demo", "origin/feature/demo") @@ -30,14 +30,18 @@ var InteractiveRebase = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). IsFocused(). - NavigateToLine(Contains("Add TypeScript types to User module")). - Press(keys.Universal.Edit). - SelectPreviousItem(). + Press(keys.Commits.StartInteractiveRebase). + PressFast(keys.Universal.RangeSelectDown). + PressFast(keys.Universal.RangeSelectDown). + Press(keys.Commits.MarkCommitAsFixup). + PressFast(keys.Commits.MoveDownCommit). + PressFast(keys.Commits.MoveDownCommit). + Delay(). + SelectNextItem(). + SelectNextItem(). Press(keys.Universal.Remove). - SelectPreviousItem(). + SelectNextItem(). Press(keys.Commits.SquashDown). - SelectPreviousItem(). - Press(keys.Commits.MarkCommitAsFixup). Press(keys.Universal.CreateRebaseOptionsMenu). Tap(func() { t.ExpectPopup().Menu(). |