diff options
author | Stefan Haller <stefan@haller-berlin.de> | 2023-07-11 13:48:18 +0200 |
---|---|---|
committer | Stefan Haller <stefan@haller-berlin.de> | 2023-07-31 08:34:00 +0200 |
commit | 9c57444adc69c60fa2d106abcb287637a3d66369 (patch) | |
tree | 7d376d9f15b081bc7a978d186d7bd07c4f2c23f5 /pkg/integration | |
parent | 7b8ebfa27ee5cf91e20deed85b840ef9f55410f7 (diff) |
Remove the old experimentalShowBranchHeads mechanism and config
We are going to replace it with a better one later in this branch.
Diffstat (limited to 'pkg/integration')
-rw-r--r-- | pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref_show_branch_heads.go | 62 | ||||
-rw-r--r-- | pkg/integration/tests/test_list.go | 1 |
2 files changed, 0 insertions, 63 deletions
diff --git a/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref_show_branch_heads.go b/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref_show_branch_heads.go deleted file mode 100644 index b8cd41055..000000000 --- a/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref_show_branch_heads.go +++ /dev/null @@ -1,62 +0,0 @@ -package interactive_rebase - -import ( - "github.com/jesseduffield/lazygit/pkg/config" - . "github.com/jesseduffield/lazygit/pkg/integration/components" -) - -var DropTodoCommitWithUpdateRefShowBranchHeads = NewIntegrationTest(NewIntegrationTestArgs{ - Description: "Drops a commit during interactive rebase when there is an update-ref in the git-rebase-todo file (with experimentalShowBranchHeads on)", - ExtraCmdArgs: []string{}, - Skip: false, - GitVersion: AtLeast("2.38.0"), - SetupConfig: func(config *config.AppConfig) { - config.UserConfig.Gui.ExperimentalShowBranchHeads = true - }, - SetupRepo: func(shell *Shell) { - shell. - CreateNCommits(3). - NewBranch("mybranch"). - CreateNCommitsStartingAt(3, 4) - - shell.SetConfig("rebase.updateRefs", "true") - }, - Run: func(t *TestDriver, keys config.KeybindingConfig) { - t.Views().Commits(). - Focus(). - Lines( - Contains("(*) commit 06").IsSelected(), - Contains("commit 05"), - Contains("commit 04"), - Contains("(*) commit 03"), - Contains("commit 02"), - Contains("commit 01"), - ). - NavigateToLine(Contains("commit 01")). - Press(keys.Universal.Edit). - Focus(). - Lines( - Contains("pick").Contains("(*) commit 06"), - Contains("pick").Contains("commit 05"), - Contains("pick").Contains("commit 04"), - Contains("update-ref").Contains("master"), - Contains("pick").Contains("(*) commit 03"), - Contains("pick").Contains("commit 02"), - Contains("<-- YOU ARE HERE --- commit 01"), - ). - NavigateToLine(Contains("commit 05")). - Press(keys.Universal.Remove) - - t.Common().ContinueRebase() - - t.Views().Commits(). - IsFocused(). - Lines( - Contains("(*) commit 06"), - Contains("commit 04"), - Contains("(*) commit 03"), - Contains("commit 02"), - Contains("commit 01"), - ) - }, -}) diff --git a/pkg/integration/tests/test_list.go b/pkg/integration/tests/test_list.go index bdd2a2bfd..fa58676f2 100644 --- a/pkg/integration/tests/test_list.go +++ b/pkg/integration/tests/test_list.go @@ -117,7 +117,6 @@ var tests = []*components.IntegrationTest{ interactive_rebase.AmendMerge, interactive_rebase.AmendNonHeadCommitDuringRebase, interactive_rebase.DropTodoCommitWithUpdateRef, - interactive_rebase.DropTodoCommitWithUpdateRefShowBranchHeads, interactive_rebase.DropWithCustomCommentChar, interactive_rebase.EditFirstCommit, interactive_rebase.EditNonTodoCommitDuringRebase, |