2022-01-08 05:00:36 +02:00
|
|
|
package git_commands
|
2021-04-10 03:40:42 +02:00
|
|
|
|
|
|
|
import (
|
|
|
|
"testing"
|
|
|
|
|
2021-12-30 08:19:01 +02:00
|
|
|
"github.com/go-errors/errors"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
|
2021-04-10 03:40:42 +02:00
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
)
|
|
|
|
|
2022-01-08 04:22:29 +02:00
|
|
|
func TestBranchGetCommitDifferences(t *testing.T) {
|
2021-04-10 03:40:42 +02:00
|
|
|
type scenario struct {
|
2021-12-30 08:19:01 +02:00
|
|
|
testName string
|
|
|
|
runner *oscommands.FakeCmdObjRunner
|
|
|
|
expectedPushables string
|
|
|
|
expectedPullables string
|
2021-04-10 03:40:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
scenarios := []scenario{
|
|
|
|
{
|
|
|
|
"Can't retrieve pushable count",
|
2021-12-30 08:19:01 +02:00
|
|
|
oscommands.NewFakeRunner(t).
|
|
|
|
Expect("git rev-list @{u}..HEAD --count", "", errors.New("error")),
|
|
|
|
"?", "?",
|
2021-04-10 03:40:42 +02:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"Can't retrieve pullable count",
|
2021-12-30 08:19:01 +02:00
|
|
|
oscommands.NewFakeRunner(t).
|
|
|
|
Expect("git rev-list @{u}..HEAD --count", "1\n", nil).
|
|
|
|
Expect("git rev-list HEAD..@{u} --count", "", errors.New("error")),
|
|
|
|
"?", "?",
|
2021-04-10 03:40:42 +02:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"Retrieve pullable and pushable count",
|
2021-12-30 08:19:01 +02:00
|
|
|
oscommands.NewFakeRunner(t).
|
|
|
|
Expect("git rev-list @{u}..HEAD --count", "1\n", nil).
|
|
|
|
Expect("git rev-list HEAD..@{u} --count", "2\n", nil),
|
|
|
|
"1", "2",
|
2021-04-10 03:40:42 +02:00
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, s := range scenarios {
|
2022-01-08 06:46:35 +02:00
|
|
|
s := s
|
2021-04-10 03:40:42 +02:00
|
|
|
t.Run(s.testName, func(t *testing.T) {
|
2022-01-18 12:26:21 +02:00
|
|
|
instance := buildBranchCommands(commonDeps{runner: s.runner})
|
2022-01-08 04:22:29 +02:00
|
|
|
pushables, pullables := instance.GetCommitDifferences("HEAD", "@{u}")
|
2021-12-30 08:19:01 +02:00
|
|
|
assert.EqualValues(t, s.expectedPushables, pushables)
|
|
|
|
assert.EqualValues(t, s.expectedPullables, pullables)
|
|
|
|
s.runner.CheckForMissingCalls()
|
2021-04-10 03:40:42 +02:00
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-01-08 04:22:29 +02:00
|
|
|
func TestBranchNewBranch(t *testing.T) {
|
2021-12-30 08:19:01 +02:00
|
|
|
runner := oscommands.NewFakeRunner(t).
|
|
|
|
Expect(`git checkout -b "test" "master"`, "", nil)
|
2022-01-18 12:26:21 +02:00
|
|
|
instance := buildBranchCommands(commonDeps{runner: runner})
|
2021-04-10 03:40:42 +02:00
|
|
|
|
2022-01-08 04:22:29 +02:00
|
|
|
assert.NoError(t, instance.New("test", "master"))
|
2021-12-30 08:19:01 +02:00
|
|
|
runner.CheckForMissingCalls()
|
2021-04-10 03:40:42 +02:00
|
|
|
}
|
|
|
|
|
2022-01-08 04:22:29 +02:00
|
|
|
func TestBranchDeleteBranch(t *testing.T) {
|
2021-04-10 03:40:42 +02:00
|
|
|
type scenario struct {
|
|
|
|
testName string
|
|
|
|
force bool
|
2021-12-30 08:19:01 +02:00
|
|
|
runner *oscommands.FakeCmdObjRunner
|
2021-04-10 03:40:42 +02:00
|
|
|
test func(error)
|
|
|
|
}
|
|
|
|
|
|
|
|
scenarios := []scenario{
|
|
|
|
{
|
|
|
|
"Delete a branch",
|
|
|
|
false,
|
2021-12-30 08:19:01 +02:00
|
|
|
oscommands.NewFakeRunner(t).Expect(`git branch -d "test"`, "", nil),
|
2021-04-10 03:40:42 +02:00
|
|
|
func(err error) {
|
|
|
|
assert.NoError(t, err)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"Force delete a branch",
|
|
|
|
true,
|
2021-12-30 08:19:01 +02:00
|
|
|
oscommands.NewFakeRunner(t).Expect(`git branch -D "test"`, "", nil),
|
2021-04-10 03:40:42 +02:00
|
|
|
func(err error) {
|
|
|
|
assert.NoError(t, err)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, s := range scenarios {
|
2022-01-08 06:46:35 +02:00
|
|
|
s := s
|
2021-04-10 03:40:42 +02:00
|
|
|
t.Run(s.testName, func(t *testing.T) {
|
2022-01-18 12:26:21 +02:00
|
|
|
instance := buildBranchCommands(commonDeps{runner: s.runner})
|
2021-12-30 08:19:01 +02:00
|
|
|
|
2022-01-08 04:22:29 +02:00
|
|
|
s.test(instance.Delete("test", s.force))
|
2021-12-30 08:19:01 +02:00
|
|
|
s.runner.CheckForMissingCalls()
|
2021-04-10 03:40:42 +02:00
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-01-08 04:22:29 +02:00
|
|
|
func TestBranchMerge(t *testing.T) {
|
2021-12-30 08:19:01 +02:00
|
|
|
runner := oscommands.NewFakeRunner(t).
|
|
|
|
Expect(`git merge --no-edit "test"`, "", nil)
|
2022-01-18 12:26:21 +02:00
|
|
|
instance := buildBranchCommands(commonDeps{runner: runner})
|
2021-04-10 03:40:42 +02:00
|
|
|
|
2022-01-08 04:22:29 +02:00
|
|
|
assert.NoError(t, instance.Merge("test", MergeOpts{}))
|
2021-12-30 08:19:01 +02:00
|
|
|
runner.CheckForMissingCalls()
|
2021-04-10 03:40:42 +02:00
|
|
|
}
|
|
|
|
|
2022-01-08 04:22:29 +02:00
|
|
|
func TestBranchCheckout(t *testing.T) {
|
2021-04-10 03:40:42 +02:00
|
|
|
type scenario struct {
|
|
|
|
testName string
|
2021-12-30 08:19:01 +02:00
|
|
|
runner *oscommands.FakeCmdObjRunner
|
2021-04-10 03:40:42 +02:00
|
|
|
test func(error)
|
|
|
|
force bool
|
|
|
|
}
|
|
|
|
|
|
|
|
scenarios := []scenario{
|
|
|
|
{
|
|
|
|
"Checkout",
|
2021-12-30 08:19:01 +02:00
|
|
|
oscommands.NewFakeRunner(t).Expect(`git checkout "test"`, "", nil),
|
2021-04-10 03:40:42 +02:00
|
|
|
func(err error) {
|
|
|
|
assert.NoError(t, err)
|
|
|
|
},
|
|
|
|
false,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"Checkout forced",
|
2021-12-30 08:19:01 +02:00
|
|
|
oscommands.NewFakeRunner(t).Expect(`git checkout --force "test"`, "", nil),
|
2021-04-10 03:40:42 +02:00
|
|
|
func(err error) {
|
|
|
|
assert.NoError(t, err)
|
|
|
|
},
|
|
|
|
true,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, s := range scenarios {
|
2022-01-08 06:46:35 +02:00
|
|
|
s := s
|
2021-04-10 03:40:42 +02:00
|
|
|
t.Run(s.testName, func(t *testing.T) {
|
2022-01-18 12:26:21 +02:00
|
|
|
instance := buildBranchCommands(commonDeps{runner: s.runner})
|
2022-01-08 04:22:29 +02:00
|
|
|
s.test(instance.Checkout("test", CheckoutOptions{Force: s.force}))
|
2021-12-30 08:19:01 +02:00
|
|
|
s.runner.CheckForMissingCalls()
|
2021-04-10 03:40:42 +02:00
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-01-08 04:22:29 +02:00
|
|
|
func TestBranchGetBranchGraph(t *testing.T) {
|
2022-01-03 06:15:26 +02:00
|
|
|
runner := oscommands.NewFakeRunner(t).ExpectGitArgs([]string{
|
|
|
|
"log", "--graph", "--color=always", "--abbrev-commit", "--decorate", "--date=relative", "--pretty=medium", "test", "--",
|
2021-12-30 08:19:01 +02:00
|
|
|
}, "", nil)
|
2022-01-18 12:26:21 +02:00
|
|
|
instance := buildBranchCommands(commonDeps{runner: runner})
|
2022-01-08 04:22:29 +02:00
|
|
|
_, err := instance.GetGraph("test")
|
2021-04-10 03:40:42 +02:00
|
|
|
assert.NoError(t, err)
|
|
|
|
}
|
|
|
|
|
2022-01-08 04:22:29 +02:00
|
|
|
func TestBranchGetAllBranchGraph(t *testing.T) {
|
2022-01-03 06:15:26 +02:00
|
|
|
runner := oscommands.NewFakeRunner(t).ExpectGitArgs([]string{
|
|
|
|
"log", "--graph", "--all", "--color=always", "--abbrev-commit", "--decorate", "--date=relative", "--pretty=medium",
|
2021-12-30 08:19:01 +02:00
|
|
|
}, "", nil)
|
2022-01-18 12:26:21 +02:00
|
|
|
instance := buildBranchCommands(commonDeps{runner: runner})
|
2022-01-08 04:22:29 +02:00
|
|
|
err := instance.AllBranchesLogCmdObj().Run()
|
2021-04-10 03:40:42 +02:00
|
|
|
assert.NoError(t, err)
|
|
|
|
}
|
|
|
|
|
2022-01-08 04:22:29 +02:00
|
|
|
func TestBranchCurrentBranchName(t *testing.T) {
|
2021-04-10 03:40:42 +02:00
|
|
|
type scenario struct {
|
|
|
|
testName string
|
2021-12-30 08:19:01 +02:00
|
|
|
runner *oscommands.FakeCmdObjRunner
|
2021-04-10 03:40:42 +02:00
|
|
|
test func(string, string, error)
|
|
|
|
}
|
|
|
|
|
|
|
|
scenarios := []scenario{
|
|
|
|
{
|
|
|
|
"says we are on the master branch if we are",
|
2021-12-30 08:19:01 +02:00
|
|
|
oscommands.NewFakeRunner(t).Expect(`git symbolic-ref --short HEAD`, "master", nil),
|
2021-04-10 03:40:42 +02:00
|
|
|
func(name string, displayname string, err error) {
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.EqualValues(t, "master", name)
|
|
|
|
assert.EqualValues(t, "master", displayname)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"falls back to git `git branch --contains` if symbolic-ref fails",
|
2021-12-30 08:19:01 +02:00
|
|
|
oscommands.NewFakeRunner(t).
|
|
|
|
Expect(`git symbolic-ref --short HEAD`, "", errors.New("error")).
|
|
|
|
Expect(`git branch --contains`, "* master", nil),
|
2021-04-10 03:40:42 +02:00
|
|
|
func(name string, displayname string, err error) {
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.EqualValues(t, "master", name)
|
|
|
|
assert.EqualValues(t, "master", displayname)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"handles a detached head",
|
2021-12-30 08:19:01 +02:00
|
|
|
oscommands.NewFakeRunner(t).
|
|
|
|
Expect(`git symbolic-ref --short HEAD`, "", errors.New("error")).
|
|
|
|
Expect(`git branch --contains`, "* (HEAD detached at 123abcd)", nil),
|
2021-04-10 03:40:42 +02:00
|
|
|
func(name string, displayname string, err error) {
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.EqualValues(t, "123abcd", name)
|
|
|
|
assert.EqualValues(t, "(HEAD detached at 123abcd)", displayname)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"bubbles up error if there is one",
|
2021-12-30 08:19:01 +02:00
|
|
|
oscommands.NewFakeRunner(t).
|
|
|
|
Expect(`git symbolic-ref --short HEAD`, "", errors.New("error")).
|
|
|
|
Expect(`git branch --contains`, "", errors.New("error")),
|
2021-04-10 03:40:42 +02:00
|
|
|
func(name string, displayname string, err error) {
|
|
|
|
assert.Error(t, err)
|
|
|
|
assert.EqualValues(t, "", name)
|
|
|
|
assert.EqualValues(t, "", displayname)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, s := range scenarios {
|
2022-01-08 06:46:35 +02:00
|
|
|
s := s
|
2021-04-10 03:40:42 +02:00
|
|
|
t.Run(s.testName, func(t *testing.T) {
|
2022-01-18 12:26:21 +02:00
|
|
|
instance := buildBranchCommands(commonDeps{runner: s.runner})
|
2022-01-08 04:22:29 +02:00
|
|
|
s.test(instance.CurrentBranchName())
|
2021-12-30 08:19:01 +02:00
|
|
|
s.runner.CheckForMissingCalls()
|
2021-04-10 03:40:42 +02:00
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|