mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-12 04:45:47 +02:00
64eb3d560b
One of the comments we are deleting here said: // Comparing just the hash is not enough; we need to compare both the // action and the hash, as the hash could appear multiple times (e.g. in a // pick and later in a merge). I don't remember what I was thinking when I wrote this code, but it's nonsense of course. Maybe I was thinking that the hash that appears in a "merge" todo would be the hash of the commit that is being merged in (which would then actually appear in an earlier pick), but it isn't, it's the hash of the merge commit itself (so that the rebase can reuse its commit message). Which means that hashes are unique, no need to compare the action.
479 lines
13 KiB
Go
479 lines
13 KiB
Go
package utils
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/stefanhaller/git-todo-parser/todo"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestRebaseCommands_moveTodoDown(t *testing.T) {
|
|
type scenario struct {
|
|
testName string
|
|
todos []todo.Todo
|
|
todoToMoveDown Todo
|
|
expectedErr string
|
|
expectedTodos []todo.Todo
|
|
}
|
|
|
|
scenarios := []scenario{
|
|
{
|
|
testName: "simple case 1 - move to beginning",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
{Command: todo.Pick, Commit: "abcd"},
|
|
},
|
|
todoToMoveDown: Todo{Hash: "5678"},
|
|
expectedErr: "",
|
|
expectedTodos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "abcd"},
|
|
},
|
|
},
|
|
{
|
|
testName: "simple case 2 - move from end",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
{Command: todo.Pick, Commit: "abcd"},
|
|
},
|
|
todoToMoveDown: Todo{Hash: "abcd"},
|
|
expectedErr: "",
|
|
expectedTodos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "abcd"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
},
|
|
},
|
|
{
|
|
testName: "move update-ref todo",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
{Command: todo.UpdateRef, Ref: "refs/heads/some_branch"},
|
|
},
|
|
todoToMoveDown: Todo{Ref: "refs/heads/some_branch"},
|
|
expectedErr: "",
|
|
expectedTodos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.UpdateRef, Ref: "refs/heads/some_branch"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
},
|
|
},
|
|
{
|
|
testName: "skip an invisible todo",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "abcd"},
|
|
{Command: todo.Label, Label: "myLabel"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
{Command: todo.Pick, Commit: "def0"},
|
|
},
|
|
todoToMoveDown: Todo{Hash: "5678"},
|
|
expectedErr: "",
|
|
expectedTodos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
{Command: todo.Pick, Commit: "abcd"},
|
|
{Command: todo.Label, Label: "myLabel"},
|
|
{Command: todo.Pick, Commit: "def0"},
|
|
},
|
|
},
|
|
|
|
// Error cases
|
|
{
|
|
testName: "commit not found",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
{Command: todo.Pick, Commit: "abcd"},
|
|
},
|
|
todoToMoveDown: Todo{Hash: "def0"},
|
|
expectedErr: "Todo def0 not found in git-rebase-todo",
|
|
expectedTodos: []todo.Todo{},
|
|
},
|
|
{
|
|
testName: "trying to move first commit down",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
{Command: todo.Pick, Commit: "abcd"},
|
|
},
|
|
todoToMoveDown: Todo{Hash: "1234"},
|
|
expectedErr: "Destination position for moving todo is out of range",
|
|
expectedTodos: []todo.Todo{},
|
|
},
|
|
{
|
|
testName: "trying to move commit down when all commits before are invisible",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Label, Label: "myLabel"},
|
|
{Command: todo.Reset, Label: "otherlabel"},
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
},
|
|
todoToMoveDown: Todo{Hash: "1234"},
|
|
expectedErr: "Destination position for moving todo is out of range",
|
|
expectedTodos: []todo.Todo{},
|
|
},
|
|
}
|
|
|
|
for _, s := range scenarios {
|
|
t.Run(s.testName, func(t *testing.T) {
|
|
rearrangedTodos, err := moveTodoDown(s.todos, s.todoToMoveDown)
|
|
if s.expectedErr == "" {
|
|
assert.NoError(t, err)
|
|
} else {
|
|
assert.ErrorContains(t, err, s.expectedErr)
|
|
}
|
|
assert.Equal(t, s.expectedTodos, rearrangedTodos)
|
|
},
|
|
)
|
|
}
|
|
}
|
|
|
|
func TestRebaseCommands_moveTodoUp(t *testing.T) {
|
|
type scenario struct {
|
|
testName string
|
|
todos []todo.Todo
|
|
todoToMoveUp Todo
|
|
expectedErr string
|
|
expectedTodos []todo.Todo
|
|
}
|
|
|
|
scenarios := []scenario{
|
|
{
|
|
testName: "simple case 1 - move to end",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
{Command: todo.Pick, Commit: "abcd"},
|
|
},
|
|
todoToMoveUp: Todo{Hash: "5678"},
|
|
expectedErr: "",
|
|
expectedTodos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "abcd"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
},
|
|
},
|
|
{
|
|
testName: "simple case 2 - move from beginning",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
{Command: todo.Pick, Commit: "abcd"},
|
|
},
|
|
todoToMoveUp: Todo{Hash: "1234"},
|
|
expectedErr: "",
|
|
expectedTodos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "abcd"},
|
|
},
|
|
},
|
|
{
|
|
testName: "move update-ref todo",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.UpdateRef, Ref: "refs/heads/some_branch"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
},
|
|
todoToMoveUp: Todo{Ref: "refs/heads/some_branch"},
|
|
expectedErr: "",
|
|
expectedTodos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
{Command: todo.UpdateRef, Ref: "refs/heads/some_branch"},
|
|
},
|
|
},
|
|
{
|
|
testName: "skip an invisible todo",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "abcd"},
|
|
{Command: todo.Label, Label: "myLabel"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
{Command: todo.Pick, Commit: "def0"},
|
|
},
|
|
todoToMoveUp: Todo{Hash: "abcd"},
|
|
expectedErr: "",
|
|
expectedTodos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Label, Label: "myLabel"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
{Command: todo.Pick, Commit: "abcd"},
|
|
{Command: todo.Pick, Commit: "def0"},
|
|
},
|
|
},
|
|
|
|
// Error cases
|
|
{
|
|
testName: "commit not found",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
{Command: todo.Pick, Commit: "abcd"},
|
|
},
|
|
todoToMoveUp: Todo{Hash: "def0"},
|
|
expectedErr: "Todo def0 not found in git-rebase-todo",
|
|
expectedTodos: []todo.Todo{},
|
|
},
|
|
{
|
|
testName: "trying to move last commit up",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
{Command: todo.Pick, Commit: "abcd"},
|
|
},
|
|
todoToMoveUp: Todo{Hash: "abcd"},
|
|
expectedErr: "Destination position for moving todo is out of range",
|
|
expectedTodos: []todo.Todo{},
|
|
},
|
|
{
|
|
testName: "trying to move commit up when all commits after it are invisible",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
{Command: todo.Label, Label: "myLabel"},
|
|
{Command: todo.Reset, Label: "otherlabel"},
|
|
},
|
|
todoToMoveUp: Todo{Hash: "5678"},
|
|
expectedErr: "Destination position for moving todo is out of range",
|
|
expectedTodos: []todo.Todo{},
|
|
},
|
|
}
|
|
|
|
for _, s := range scenarios {
|
|
t.Run(s.testName, func(t *testing.T) {
|
|
rearrangedTodos, err := moveTodoUp(s.todos, s.todoToMoveUp)
|
|
if s.expectedErr == "" {
|
|
assert.NoError(t, err)
|
|
} else {
|
|
assert.ErrorContains(t, err, s.expectedErr)
|
|
}
|
|
assert.Equal(t, s.expectedTodos, rearrangedTodos)
|
|
},
|
|
)
|
|
}
|
|
}
|
|
|
|
func TestRebaseCommands_moveFixupCommitDown(t *testing.T) {
|
|
scenarios := []struct {
|
|
name string
|
|
todos []todo.Todo
|
|
originalHash string
|
|
fixupHash string
|
|
changeToFixup bool
|
|
expectedTodos []todo.Todo
|
|
expectedErr error
|
|
}{
|
|
{
|
|
name: "fixup commit is the last commit (change to fixup)",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "original"},
|
|
{Command: todo.Pick, Commit: "fixup"},
|
|
},
|
|
originalHash: "original",
|
|
fixupHash: "fixup",
|
|
changeToFixup: true,
|
|
expectedTodos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "original"},
|
|
{Command: todo.Fixup, Commit: "fixup"},
|
|
},
|
|
expectedErr: nil,
|
|
},
|
|
{
|
|
name: "fixup commit is the last commit (don't change to fixup)",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "original"},
|
|
{Command: todo.Pick, Commit: "fixup"},
|
|
},
|
|
originalHash: "original",
|
|
fixupHash: "fixup",
|
|
changeToFixup: false,
|
|
expectedTodos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "original"},
|
|
{Command: todo.Pick, Commit: "fixup"},
|
|
},
|
|
expectedErr: nil,
|
|
},
|
|
{
|
|
name: "fixup commit is separated from original commit",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "original"},
|
|
{Command: todo.Pick, Commit: "other"},
|
|
{Command: todo.Pick, Commit: "fixup"},
|
|
},
|
|
originalHash: "original",
|
|
fixupHash: "fixup",
|
|
changeToFixup: true,
|
|
expectedTodos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "original"},
|
|
{Command: todo.Fixup, Commit: "fixup"},
|
|
{Command: todo.Pick, Commit: "other"},
|
|
},
|
|
expectedErr: nil,
|
|
},
|
|
{
|
|
name: "fixup commit is separated from original merge commit",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Merge, Commit: "original"},
|
|
{Command: todo.Pick, Commit: "other"},
|
|
{Command: todo.Pick, Commit: "fixup"},
|
|
},
|
|
originalHash: "original",
|
|
fixupHash: "fixup",
|
|
changeToFixup: true,
|
|
expectedTodos: []todo.Todo{
|
|
{Command: todo.Merge, Commit: "original"},
|
|
{Command: todo.Fixup, Commit: "fixup"},
|
|
{Command: todo.Pick, Commit: "other"},
|
|
},
|
|
expectedErr: nil,
|
|
},
|
|
{
|
|
name: "More original hashes than expected",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "original"},
|
|
{Command: todo.Pick, Commit: "original"},
|
|
{Command: todo.Pick, Commit: "fixup"},
|
|
},
|
|
originalHash: "original",
|
|
fixupHash: "fixup",
|
|
changeToFixup: true,
|
|
expectedTodos: nil,
|
|
expectedErr: errors.New("Expected exactly one original hash, found 2"),
|
|
},
|
|
{
|
|
name: "More fixup hashes than expected",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "original"},
|
|
{Command: todo.Pick, Commit: "fixup"},
|
|
{Command: todo.Pick, Commit: "fixup"},
|
|
},
|
|
originalHash: "original",
|
|
fixupHash: "fixup",
|
|
changeToFixup: true,
|
|
expectedTodos: nil,
|
|
expectedErr: errors.New("Expected exactly one fixup hash, found 2"),
|
|
},
|
|
{
|
|
name: "No fixup hashes found",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "original"},
|
|
},
|
|
originalHash: "original",
|
|
fixupHash: "fixup",
|
|
changeToFixup: true,
|
|
expectedTodos: nil,
|
|
expectedErr: errors.New("Expected exactly one fixup hash, found 0"),
|
|
},
|
|
{
|
|
name: "No original hashes found",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "fixup"},
|
|
},
|
|
originalHash: "original",
|
|
fixupHash: "fixup",
|
|
changeToFixup: true,
|
|
expectedTodos: nil,
|
|
expectedErr: errors.New("Expected exactly one original hash, found 0"),
|
|
},
|
|
}
|
|
|
|
for _, scenario := range scenarios {
|
|
t.Run(scenario.name, func(t *testing.T) {
|
|
actualTodos, actualErr := moveFixupCommitDown(scenario.todos, scenario.originalHash, scenario.fixupHash, scenario.changeToFixup)
|
|
|
|
if scenario.expectedErr == nil {
|
|
assert.NoError(t, actualErr)
|
|
} else {
|
|
assert.EqualError(t, actualErr, scenario.expectedErr.Error())
|
|
}
|
|
|
|
assert.EqualValues(t, scenario.expectedTodos, actualTodos)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestRebaseCommands_deleteTodos(t *testing.T) {
|
|
scenarios := []struct {
|
|
name string
|
|
todos []todo.Todo
|
|
todosToDelete []Todo
|
|
expectedTodos []todo.Todo
|
|
expectedErr error
|
|
}{
|
|
{
|
|
name: "success",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.UpdateRef, Ref: "refs/heads/some_branch"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
{Command: todo.Pick, Commit: "abcd"},
|
|
},
|
|
todosToDelete: []Todo{
|
|
{Ref: "refs/heads/some_branch"},
|
|
{Hash: "abcd"},
|
|
},
|
|
expectedTodos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
},
|
|
expectedErr: nil,
|
|
},
|
|
{
|
|
name: "failure",
|
|
todos: []todo.Todo{
|
|
{Command: todo.Pick, Commit: "1234"},
|
|
{Command: todo.Pick, Commit: "5678"},
|
|
},
|
|
todosToDelete: []Todo{
|
|
{Hash: "abcd"},
|
|
},
|
|
expectedTodos: []todo.Todo{},
|
|
expectedErr: errors.New("Todo abcd not found in git-rebase-todo"),
|
|
},
|
|
}
|
|
|
|
for _, scenario := range scenarios {
|
|
t.Run(scenario.name, func(t *testing.T) {
|
|
actualTodos, actualErr := deleteTodos(scenario.todos, scenario.todosToDelete)
|
|
|
|
if scenario.expectedErr == nil {
|
|
assert.NoError(t, actualErr)
|
|
} else {
|
|
assert.EqualError(t, actualErr, scenario.expectedErr.Error())
|
|
}
|
|
|
|
assert.EqualValues(t, scenario.expectedTodos, actualTodos)
|
|
})
|
|
}
|
|
}
|
|
|
|
func Test_equalHash(t *testing.T) {
|
|
scenarios := []struct {
|
|
a string
|
|
b string
|
|
expected bool
|
|
}{
|
|
{"", "", true},
|
|
{"", "123", false},
|
|
{"123", "", false},
|
|
{"123", "123", true},
|
|
{"123", "123abc", true},
|
|
{"123abc", "123", true},
|
|
{"123", "a", false},
|
|
{"1", "abc", false},
|
|
}
|
|
|
|
for _, scenario := range scenarios {
|
|
t.Run(fmt.Sprintf("'%s' vs. '%s'", scenario.a, scenario.b), func(t *testing.T) {
|
|
assert.Equal(t, scenario.expected, equalHash(scenario.a, scenario.b))
|
|
})
|
|
}
|
|
}
|