mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-17 22:32:58 +02:00
0b5504aa98
Assert the entire lines using Equals instead of Contains. This makes the tests a bit easier to read, and it makes it much easier to decide how they need to be changed when we change the layout (like we do in the last commit of this branch). It is true that this requires changing all these tests for any future UI changes, but I think this is a good price to pay; those adaptions are trivial and can be done without thinking.
104 lines
2.9 KiB
Go
104 lines
2.9 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) {},
|
|
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("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.Views().Commits().Lines(Contains("hard commit"))
|
|
t.Views().Files().IsEmpty()
|
|
},
|
|
})
|