diff options
Diffstat (limited to 'pkg/commands/loaders/reflog_commits_test.go')
| -rw-r--r-- | pkg/commands/loaders/reflog_commits_test.go | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/pkg/commands/loaders/reflog_commits_test.go b/pkg/commands/loaders/reflog_commits_test.go index bb93caba5..f8d5bff36 100644 --- a/pkg/commands/loaders/reflog_commits_test.go +++ b/pkg/commands/loaders/reflog_commits_test.go @@ -12,11 +12,11 @@ import ( "github.com/stretchr/testify/assert" ) -var reflogOutput = strings.Replace(`c3c4b66b64c97ffeecde|1643150483|checkout: moving from A to B -c3c4b66b64c97ffeecde|1643150483|checkout: moving from B to A -c3c4b66b64c97ffeecde|1643150483|checkout: moving from A to B -c3c4b66b64c97ffeecde|1643150483|checkout: moving from master to A -f4ddf2f0d4be4ccc7efa|1643149435|checkout: moving from A to master +var reflogOutput = strings.Replace(`c3c4b66b64c97ffeecde|1643150483|checkout: moving from A to B|51baa8c1 +c3c4b66b64c97ffeecde|1643150483|checkout: moving from B to A|51baa8c1 +c3c4b66b64c97ffeecde|1643150483|checkout: moving from A to B|51baa8c1 +c3c4b66b64c97ffeecde|1643150483|checkout: moving from master to A|51baa8c1 +f4ddf2f0d4be4ccc7efa|1643149435|checkout: moving from A to master|51baa8c1 `, "|", "\x00", -1) func TestGetReflogCommits(t *testing.T) { @@ -34,7 +34,7 @@ func TestGetReflogCommits(t *testing.T) { { testName: "no reflog entries", runner: oscommands.NewFakeRunner(t). - Expect(`git log -g --abbrev=40 --format="%h%x00%ct%x00%gs"`, "", nil), + Expect(`git log -g --abbrev=40 --format="%h%x00%ct%x00%gs%x00%p"`, "", nil), lastReflogCommit: nil, expectedCommits: []*models.Commit{}, @@ -44,7 +44,7 @@ func TestGetReflogCommits(t *testing.T) { { testName: "some reflog entries", runner: oscommands.NewFakeRunner(t). - Expect(`git log -g --abbrev=40 --format="%h%x00%ct%x00%gs"`, reflogOutput, nil), + Expect(`git log -g --abbrev=40 --format="%h%x00%ct%x00%gs%x00%p"`, reflogOutput, nil), lastReflogCommit: nil, expectedCommits: []*models.Commit{ @@ -53,30 +53,35 @@ func TestGetReflogCommits(t *testing.T) { Name: "checkout: moving from A to B", Status: "reflog", UnixTimestamp: 1643150483, + Parents: []string{"51baa8c1"}, }, { Sha: "c3c4b66b64c97ffeecde", Name: "checkout: moving from B to A", Status: "reflog", UnixTimestamp: 1643150483, + Parents: []string{"51baa8c1"}, }, { Sha: "c3c4b66b64c97ffeecde", Name: "checkout: moving from A to B", Status: "reflog", UnixTimestamp: 1643150483, + Parents: []string{"51baa8c1"}, }, { Sha: "c3c4b66b64c97ffeecde", Name: "checkout: moving from master to A", Status: "reflog", UnixTimestamp: 1643150483, + Parents: []string{"51baa8c1"}, }, { Sha: "f4ddf2f0d4be4ccc7efa", Name: "checkout: moving from A to master", Status: "reflog", UnixTimestamp: 1643149435, + Parents: []string{"51baa8c1"}, }, }, expectedOnlyObtainedNew: false, @@ -85,13 +90,14 @@ func TestGetReflogCommits(t *testing.T) { { testName: "some reflog entries where last commit is given", runner: oscommands.NewFakeRunner(t). - Expect(`git log -g --abbrev=40 --format="%h%x00%ct%x00%gs"`, reflogOutput, nil), + Expect(`git log -g --abbrev=40 --format="%h%x00%ct%x00%gs%x00%p"`, reflogOutput, nil), lastReflogCommit: &models.Commit{ Sha: "c3c4b66b64c97ffeecde", Name: "checkout: moving from B to A", Status: "reflog", UnixTimestamp: 1643150483, + Parents: []string{"51baa8c1"}, }, expectedCommits: []*models.Commit{ { @@ -99,6 +105,7 @@ func TestGetReflogCommits(t *testing.T) { Name: "checkout: moving from A to B", Status: "reflog", UnixTimestamp: 1643150483, + Parents: []string{"51baa8c1"}, }, }, expectedOnlyObtainedNew: true, @@ -107,13 +114,14 @@ func TestGetReflogCommits(t *testing.T) { { testName: "when passing filterPath", runner: oscommands.NewFakeRunner(t). - Expect(`git log -g --abbrev=40 --format="%h%x00%ct%x00%gs" --follow -- "path"`, reflogOutput, nil), + Expect(`git log -g --abbrev=40 --format="%h%x00%ct%x00%gs%x00%p" --follow -- "path"`, reflogOutput, nil), lastReflogCommit: &models.Commit{ Sha: "c3c4b66b64c97ffeecde", Name: "checkout: moving from B to A", Status: "reflog", UnixTimestamp: 1643150483, + Parents: []string{"51baa8c1"}, }, filterPath: "path", expectedCommits: []*models.Commit{ @@ -122,6 +130,7 @@ func TestGetReflogCommits(t *testing.T) { Name: "checkout: moving from A to B", Status: "reflog", UnixTimestamp: 1643150483, + Parents: []string{"51baa8c1"}, }, }, expectedOnlyObtainedNew: true, @@ -130,7 +139,7 @@ func TestGetReflogCommits(t *testing.T) { { testName: "when command returns error", runner: oscommands.NewFakeRunner(t). - Expect(`git log -g --abbrev=40 --format="%h%x00%ct%x00%gs"`, "", errors.New("haha")), + Expect(`git log -g --abbrev=40 --format="%h%x00%ct%x00%gs%x00%p"`, "", errors.New("haha")), lastReflogCommit: nil, filterPath: "", |