From 49c50fc95ced82220ecb79c93c07e4e058d3cd24 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sun, 1 Dec 2024 17:06:59 +0100 Subject: [PATCH] Add tests for moving across an exec todo These don't work correctly yet, they move it one too far. --- pkg/utils/rebase_todo_test.go | 38 +++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/pkg/utils/rebase_todo_test.go b/pkg/utils/rebase_todo_test.go index ea2bd5968..60093bb21 100644 --- a/pkg/utils/rebase_todo_test.go +++ b/pkg/utils/rebase_todo_test.go @@ -79,6 +79,25 @@ func TestRebaseCommands_moveTodoDown(t *testing.T) { {Command: todo.UpdateRef, Ref: "refs/heads/some_branch"}, }, }, + { + testName: "move across exec todo", + todos: []todo.Todo{ + {Command: todo.Pick, Commit: "1234"}, + {Command: todo.Exec, ExecCommand: "make test"}, + {Command: todo.Pick, Commit: "5678"}, + }, + todoToMoveDown: Todo{Hash: "5678"}, + expectedErr: "", + expectedTodos: []todo.Todo{ + /* EXPECTED: + {Command: todo.Pick, Commit: "1234"}, + {Command: todo.Pick, Commit: "5678"}, + ACTUAL: */ + {Command: todo.Pick, Commit: "5678"}, + {Command: todo.Pick, Commit: "1234"}, + {Command: todo.Exec, ExecCommand: "make test"}, + }, + }, { testName: "skip an invisible todo", todos: []todo.Todo{ @@ -220,6 +239,25 @@ func TestRebaseCommands_moveTodoUp(t *testing.T) { {Command: todo.Pick, Commit: "5678"}, }, }, + { + testName: "move across exec todo", + todos: []todo.Todo{ + {Command: todo.Pick, Commit: "1234"}, + {Command: todo.Exec, ExecCommand: "make test"}, + {Command: todo.Pick, Commit: "5678"}, + }, + todoToMoveUp: Todo{Hash: "1234"}, + expectedErr: "", + expectedTodos: []todo.Todo{ + {Command: todo.Exec, ExecCommand: "make test"}, + /* EXPECTED: + {Command: todo.Pick, Commit: "1234"}, + {Command: todo.Pick, Commit: "5678"}, + ACTUAL: */ + {Command: todo.Pick, Commit: "5678"}, + {Command: todo.Pick, Commit: "1234"}, + }, + }, { testName: "skip an invisible todo", todos: []todo.Todo{