Skip to content

Commit 316f766

Browse files
committed
Fix tests
1 parent c6b1dff commit 316f766

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

models/git/commit_status_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func Test_CalcCommitStatus(t *testing.T) {
124124
},
125125
},
126126
expected: &git_model.CommitStatus{
127-
State: commitstatus.CommitStatusError,
127+
State: commitstatus.CommitStatusFailure,
128128
},
129129
},
130130
{
@@ -140,7 +140,7 @@ func Test_CalcCommitStatus(t *testing.T) {
140140
},
141141
},
142142
expected: &git_model.CommitStatus{
143-
State: commitstatus.CommitStatusWarning,
143+
State: commitstatus.CommitStatusSuccess,
144144
},
145145
},
146146
{
@@ -172,7 +172,7 @@ func Test_CalcCommitStatus(t *testing.T) {
172172
},
173173
},
174174
expected: &git_model.CommitStatus{
175-
State: commitstatus.CommitStatusError,
175+
State: commitstatus.CommitStatusFailure,
176176
},
177177
},
178178
}

services/pull/commit_status.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ import (
2020

2121
// MergeRequiredContextsCommitStatus returns a commit status state for given required contexts
2222
func MergeRequiredContextsCommitStatus(commitStatuses []*git_model.CommitStatus, requiredContexts []string) commitstatus.CommitStatusState {
23+
if len(commitStatuses) == 0 {
24+
return commitstatus.CommitStatusPending
25+
}
26+
2327
if len(requiredContexts) == 0 {
2428
return git_model.CalcCommitStatus(commitStatuses).State
2529
}

0 commit comments

Comments
 (0)