mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-11-23 16:22:24 +03:00
457cdce61d
Now that -committerdate is the default sort order, we could get different results for the sort order of the branches list depending on whether the commits on both branches have the same committer time stamp (likely in an integration test, since git time stamps have second resolution), in which case git will fall back to alphabetical order, or not (rare, but possible), in which case master will have the newer commit and will come first. Make this stable by forcing the sort order to alphabetical. We might have more tests with this problem, we'll just have to fix them one by one as we see them fail.
43 lines
1.2 KiB
Go
43 lines
1.2 KiB
Go
package branch
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var CheckoutByName = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Try to checkout branch by name. Verify that it also works on the branch with the special name @.",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {
|
|
config.GetUserConfig().Git.LocalBranchSortOrder = "alphabetical"
|
|
},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.
|
|
CreateNCommits(3).
|
|
NewBranch("@").
|
|
Checkout("master").
|
|
EmptyCommit("blah")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Branches().
|
|
Focus().
|
|
Lines(
|
|
Contains("master").IsSelected(),
|
|
Contains("@"),
|
|
).
|
|
SelectNextItem().
|
|
Press(keys.Branches.CheckoutBranchByName).
|
|
Tap(func() {
|
|
t.ExpectPopup().Prompt().Title(Equals("Branch name:")).Type("new-branch").Confirm()
|
|
|
|
t.ExpectPopup().Alert().Title(Equals("Branch not found")).Content(Equals("Branch not found. Create a new branch named new-branch?")).Confirm()
|
|
}).
|
|
Lines(
|
|
MatchesRegexp(`\*.*new-branch`).IsSelected(),
|
|
Contains("@"),
|
|
Contains("master"),
|
|
)
|
|
},
|
|
})
|