mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-07-28 16:02:01 +03:00
703256e92d
At the same time, we change the defaults for both of them to "date" (they were "recency" and "alphabetical", respectively, before). This is the reason we need to touch so many integration tests. For some of them I decided to adapt the test assertions to the changed sort order; for others, I added a SetupConfig step to set the order back to "recency" so that I don't have to change what the test does (e.g. how many SelectNextItem() calls are needed to get to a certain branch).
82 lines
2.0 KiB
Go
82 lines
2.0 KiB
Go
package cherry_pick
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var CherryPickMerge = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Cherry pick a merge commit",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {
|
|
config.GetUserConfig().Git.LocalBranchSortOrder = "recency"
|
|
},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.
|
|
EmptyCommit("base").
|
|
NewBranch("first-branch").
|
|
NewBranch("second-branch").
|
|
CreateFileAndAdd("file1.txt", "content").
|
|
Commit("one").
|
|
CreateFileAndAdd("file2.txt", "content").
|
|
Commit("two").
|
|
Checkout("master").
|
|
Merge("second-branch").
|
|
Checkout("first-branch")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Branches().
|
|
Focus().
|
|
Lines(
|
|
Contains("first-branch"),
|
|
Contains("master"),
|
|
Contains("second-branch"),
|
|
).
|
|
SelectNextItem().
|
|
PressEnter()
|
|
|
|
t.Views().SubCommits().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("⏣─╮ Merge branch 'second-branch'").IsSelected(),
|
|
Contains("│ ◯ two"),
|
|
Contains("│ ◯ one"),
|
|
Contains("◯ ╯ base"),
|
|
).
|
|
// copy the merge commit
|
|
Press(keys.Commits.CherryPickCopy)
|
|
|
|
t.Views().Information().Content(Contains("1 commit copied"))
|
|
|
|
t.Views().Commits().
|
|
Focus().
|
|
Lines(
|
|
Contains("base").IsSelected(),
|
|
).
|
|
Press(keys.Commits.PasteCommits).
|
|
Tap(func() {
|
|
t.ExpectPopup().Alert().
|
|
Title(Equals("Cherry-pick")).
|
|
Content(Contains("Are you sure you want to cherry-pick the 1 copied commit(s) onto this branch?")).
|
|
Confirm()
|
|
}).
|
|
Tap(func() {
|
|
t.Views().Information().Content(DoesNotContain("commit copied"))
|
|
}).
|
|
Lines(
|
|
Contains("Merge branch 'second-branch'"),
|
|
Contains("base").IsSelected(),
|
|
).
|
|
SelectPreviousItem()
|
|
|
|
t.Views().Main().ContainsLines(
|
|
Contains("Merge branch 'second-branch'"),
|
|
Contains("---"),
|
|
Contains("file1.txt | 1 +"),
|
|
Contains("file2.txt | 1 +"),
|
|
Contains("2 files changed, 2 insertions(+)"),
|
|
)
|
|
},
|
|
})
|