mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-07-18 10:02:15 +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).
112 lines
3.1 KiB
Go
112 lines
3.1 KiB
Go
package branch
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var ResetToUpstream = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Hard reset the current branch to the selected branch upstream",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {
|
|
config.GetUserConfig().Git.LocalBranchSortOrder = "recency"
|
|
},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.
|
|
CloneIntoRemote("origin").
|
|
NewBranch("hard-branch").
|
|
EmptyCommit("hard commit").
|
|
PushBranchAndSetUpstream("origin", "hard-branch").
|
|
NewBranch("soft-branch").
|
|
EmptyCommit("soft commit").
|
|
PushBranchAndSetUpstream("origin", "soft-branch").
|
|
RenameCurrentBranch("soft-branch-local").
|
|
NewBranch("base").
|
|
EmptyCommit("base-branch commit").
|
|
CreateFile("file-1", "content").
|
|
GitAdd("file-1").
|
|
Commit("commit with file").
|
|
CreateFile("file-2", "content").
|
|
GitAdd("file-2")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
// soft reset
|
|
t.Views().Branches().
|
|
Focus().
|
|
Lines(
|
|
Contains("base").IsSelected(),
|
|
Contains("soft-branch-local"),
|
|
Contains("hard-branch"),
|
|
).
|
|
Press(keys.Branches.SetUpstream).
|
|
Tap(func() {
|
|
t.ExpectPopup().Menu().
|
|
Title(Equals("Upstream options")).
|
|
Select(Contains("Reset checked-out branch onto upstream of selected branch")).
|
|
Tooltip(Contains("Disabled: The selected branch has no upstream (or the upstream is not stored locally)")).
|
|
Confirm().
|
|
Tap(func() {
|
|
t.ExpectToast(Equals("Disabled: The selected branch has no upstream (or the upstream is not stored locally)"))
|
|
}).
|
|
Cancel()
|
|
}).
|
|
SelectNextItem().
|
|
Lines(
|
|
Contains("base"),
|
|
Contains("soft-branch-local").IsSelected(),
|
|
Contains("hard-branch"),
|
|
).
|
|
Press(keys.Branches.SetUpstream).
|
|
Tap(func() {
|
|
t.ExpectPopup().Menu().
|
|
Title(Equals("Upstream options")).
|
|
Select(Contains("Reset checked-out branch onto origin/soft-branch...")).
|
|
Confirm()
|
|
|
|
t.ExpectPopup().Menu().
|
|
Title(Equals("Reset to origin/soft-branch")).
|
|
Select(Contains("Soft reset")).
|
|
Confirm()
|
|
})
|
|
t.Views().Commits().Lines(
|
|
Contains("soft commit"),
|
|
Contains("hard commit"),
|
|
)
|
|
t.Views().Files().Lines(
|
|
Equals("▼ /"),
|
|
Equals(" A file-1"),
|
|
Equals(" A file-2"),
|
|
)
|
|
|
|
// hard reset
|
|
t.Views().Branches().
|
|
Focus().
|
|
Lines(
|
|
Contains("base"),
|
|
Contains("soft-branch-local").IsSelected(),
|
|
Contains("hard-branch"),
|
|
).
|
|
NavigateToLine(Contains("hard-branch")).
|
|
Press(keys.Branches.SetUpstream).
|
|
Tap(func() {
|
|
t.ExpectPopup().Menu().
|
|
Title(Equals("Upstream options")).
|
|
Select(Contains("Reset checked-out branch onto origin/hard-branch...")).
|
|
Confirm()
|
|
|
|
t.ExpectPopup().Menu().
|
|
Title(Equals("Reset to origin/hard-branch")).
|
|
Select(Contains("Hard reset")).
|
|
Confirm()
|
|
|
|
t.ExpectPopup().Confirmation().
|
|
Title(Equals("Hard reset")).
|
|
Content(Contains("Are you sure you want to do a hard reset?")).
|
|
Confirm()
|
|
})
|
|
t.Views().Commits().Lines(Contains("hard commit"))
|
|
t.Views().Files().IsEmpty()
|
|
},
|
|
})
|