Skip to content

Commit

Permalink
fix(git): cherry-pick/revert tests actually pass now
Browse files Browse the repository at this point in the history
  • Loading branch information
cdonnellytx authored and JanDeDobbeleer committed Jul 30, 2021
1 parent da83ece commit 1868e15
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions src/segment_git_test.go
Expand Up @@ -221,25 +221,25 @@ func TestGetGitHEADContextCherryPickOnTag(t *testing.T) {
}

func TestGetGitHEADContextRevertOnBranch(t *testing.T) {
want := "\uf0e2 pickme onto \ue0a0main"
want := "\uf0e2 012345 onto \ue0a0main"
context := &detachedContext{
currentCommit: "whatever",
branchName: "main",
revert: true,
revertSHA: "pickme",
revertSHA: "01234567",
}
g := setupHEADContextEnv(context)
got := g.getGitHEADContext("main")
assert.Equal(t, want, got)
}

func TestGetGitHEADContextRevertOnTag(t *testing.T) {
want := "\uf0e2 pickme onto \uf412v3.4.6"
want := "\uf0e2 012345 onto \uf412v3.4.6"
context := &detachedContext{
currentCommit: "whatever",
tagName: "v3.4.6",
revert: true,
revertSHA: "pickme",
revertSHA: "01234567",
}
g := setupHEADContextEnv(context)
got := g.getGitHEADContext("")
Expand All @@ -265,33 +265,33 @@ func TestGetGitHEADContextSequencerCherryPickOnTag(t *testing.T) {
currentCommit: "whatever",
tagName: "v3.4.6",
sequencer: true,
sequencerTodo: "pick pickme",
sequencerTodo: "pick pickme message\npick notme message",
}
g := setupHEADContextEnv(context)
got := g.getGitHEADContext("")
assert.Equal(t, want, got)
}

func TestGetGitHEADContextSequencerRevertOnBranch(t *testing.T) {
want := "\ue29b pickme onto \ue0a0main"
want := "\uf0e2 012345 onto \ue0a0main"
context := &detachedContext{
currentCommit: "whatever",
branchName: "main",
sequencer: true,
sequencerTodo: "revert pickme",
sequencerTodo: "revert 01234567 message\nrevert notme message",
}
g := setupHEADContextEnv(context)
got := g.getGitHEADContext("main")
assert.Equal(t, want, got)
}

func TestGetGitHEADContextSequencerRevertOnTag(t *testing.T) {
want := "\ue29b pickme onto \uf412v3.4.6"
want := "\uf0e2 012345 onto \uf412v3.4.6"
context := &detachedContext{
currentCommit: "whatever",
tagName: "v3.4.6",
sequencer: true,
sequencerTodo: "revert pickme",
sequencerTodo: "revert 01234567 message\nrevert notme message",
}
g := setupHEADContextEnv(context)
got := g.getGitHEADContext("")
Expand Down

0 comments on commit 1868e15

Please sign in to comment.