1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
package demo
import (
"github.com/jesseduffield/lazygit/pkg/config"
. "github.com/jesseduffield/lazygit/pkg/integration/components"
)
var CherryPick = NewIntegrationTest(NewIntegrationTestArgs{
Description: "Cherry pick",
ExtraCmdArgs: []string{},
Skip: false,
IsDemo: true,
SetupConfig: func(config *config.AppConfig) {
// No idea why I had to use version 2: it should be using my own computer's
// font and the one iterm uses is version 3.
config.UserConfig.Gui.NerdFontsVersion = "2"
},
SetupRepo: func(shell *Shell) {
shell.CreateNCommitsWithRandomMessages(50)
shell.
EmptyCommit("Fix bug in timezone conversion.").
NewBranch("hotfix/fix-bug").
NewBranch("feature/user-module").
Checkout("hotfix/fix-bug").
EmptyCommit("Integrate support for markdown in user posts").
EmptyCommit("Remove unused code and libraries").
Checkout("feature/user-module").
EmptyCommit("Handle session timeout gracefully").
EmptyCommit("Add Webpack for asset bundling").
Checkout("hotfix/fix-bug")
},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.SetCaptionPrefix("Cherry pick commits from another branch")
t.Wait(1000)
t.Views().Branches().
Focus().
Lines(
Contains("hotfix/fix-bug"),
Contains("feature/user-module"),
Contains("master"),
).
SelectNextItem().
Wait(300).
PressEnter()
t.Views().SubCommits().
IsFocused().
TopLines(
Contains("Add Webpack for asset bundling").IsSelected(),
Contains("Handle session timeout gracefully"),
Contains("Fix bug in timezone conversion."),
).
Press(keys.Commits.CherryPickCopy).
Tap(func() {
t.Views().Information().Content(Contains("1 commit copied"))
}).
SelectNextItem().
Press(keys.Commits.CherryPickCopy)
t.Views().Information().Content(Contains("2 commits copied"))
t.Views().Commits().
Focus().
TopLines(
Contains("Remove unused code and libraries").IsSelected(),
Contains("Integrate support for markdown in user posts"),
Contains("Fix bug in timezone conversion."),
).
Press(keys.Commits.PasteCommits).
Tap(func() {
t.Wait(1000)
t.ExpectPopup().Alert().
Title(Equals("Cherry-pick")).
Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")).
Confirm()
}).
TopLines(
Contains("Add Webpack for asset bundling"),
Contains("Handle session timeout gracefully"),
Contains("Remove unused code and libraries"),
Contains("Integrate support for markdown in user posts"),
Contains("Fix bug in timezone conversion."),
).
Tap(func() {
// we need to manually exit out of cherry pick mode
t.Views().Information().Content(Contains("2 commits copied"))
}).
PressEscape().
Tap(func() {
t.Views().Information().Content(DoesNotContain("commits copied"))
})
},
})
|
