Skip to content

Commit 6165d63

Browse files
committed
fix tests
1 parent 5310738 commit 6165d63

File tree

1 file changed

+42
-17
lines changed

1 file changed

+42
-17
lines changed

models/action_test.go

+42-17
Original file line numberDiff line numberDiff line change
@@ -100,29 +100,54 @@ func TestPushCommits_ToAPIPayloadCommits(t *testing.T) {
100100
AuthorName: "User2",
101101
Message: "good signed commit (with not yet validated email)",
102102
},
103+
{
104+
Sha1: "5099b81",
105+
CommitterEmail: "user2@example.com",
106+
CommitterName: "User2",
107+
AuthorEmail: "user2@example.com",
108+
AuthorName: "User2",
109+
Message: "good signed commit",
110+
},
103111
}
104112
pushCommits.Len = len(pushCommits.Commits)
105113

106114
repo := AssertExistsAndLoadBean(t, &Repository{ID: 16}).(*Repository)
107115
payloadCommits, err := pushCommits.ToAPIPayloadCommits(repo.RepoPath(), "/user2/repo16")
108116
assert.NoError(t, err)
109-
if assert.Len(t, payloadCommits, 2) {
110-
assert.Equal(t, "69554a6", payloadCommits[0].ID)
111-
assert.Equal(t, "not signed commit", payloadCommits[0].Message)
112-
assert.Equal(t, "/user2/repo16/commit/69554a6", payloadCommits[0].URL)
113-
assert.Equal(t, "User2", payloadCommits[0].Committer.Name)
114-
assert.Equal(t, "user2", payloadCommits[0].Committer.UserName)
115-
assert.Equal(t, "User2", payloadCommits[0].Author.Name)
116-
assert.Equal(t, "user2", payloadCommits[0].Author.UserName)
117-
118-
assert.Equal(t, "27566bd", payloadCommits[1].ID)
119-
assert.Equal(t, "good signed commit (with not yet validated email)", payloadCommits[1].Message)
120-
assert.Equal(t, "/user2/repo16/commit/27566bd", payloadCommits[1].URL)
121-
assert.Equal(t, "User2", payloadCommits[1].Committer.Name)
122-
assert.Equal(t, "user2", payloadCommits[1].Committer.UserName)
123-
assert.Equal(t, "User2", payloadCommits[1].Author.Name)
124-
assert.Equal(t, "user2", payloadCommits[1].Author.UserName)
125-
}
117+
assert.EqualValues(t, 3, len(payloadCommits))
118+
119+
assert.Equal(t, "69554a6", payloadCommits[0].ID)
120+
assert.Equal(t, "not signed commit", payloadCommits[0].Message)
121+
assert.Equal(t, "/user2/repo16/commit/69554a6", payloadCommits[0].URL)
122+
assert.Equal(t, "User2", payloadCommits[0].Committer.Name)
123+
assert.Equal(t, "user2", payloadCommits[0].Committer.UserName)
124+
assert.Equal(t, "User2", payloadCommits[0].Author.Name)
125+
assert.Equal(t, "user2", payloadCommits[0].Author.UserName)
126+
assert.EqualValues(t, []string{}, payloadCommits[0].Added)
127+
assert.EqualValues(t, []string{}, payloadCommits[0].Removed)
128+
assert.EqualValues(t, []string{"readme.md"}, payloadCommits[0].Modified)
129+
130+
assert.Equal(t, "27566bd", payloadCommits[1].ID)
131+
assert.Equal(t, "good signed commit (with not yet validated email)", payloadCommits[1].Message)
132+
assert.Equal(t, "/user2/repo16/commit/27566bd", payloadCommits[1].URL)
133+
assert.Equal(t, "User2", payloadCommits[1].Committer.Name)
134+
assert.Equal(t, "user2", payloadCommits[1].Committer.UserName)
135+
assert.Equal(t, "User2", payloadCommits[1].Author.Name)
136+
assert.Equal(t, "user2", payloadCommits[1].Author.UserName)
137+
assert.EqualValues(t, []string{}, payloadCommits[1].Added)
138+
assert.EqualValues(t, []string{}, payloadCommits[1].Removed)
139+
assert.EqualValues(t, []string{"readme.md"}, payloadCommits[1].Modified)
140+
141+
assert.Equal(t, "5099b81", payloadCommits[2].ID)
142+
assert.Equal(t, "good signed commit", payloadCommits[2].Message)
143+
assert.Equal(t, "/user2/repo16/commit/5099b81", payloadCommits[2].URL)
144+
assert.Equal(t, "User2", payloadCommits[2].Committer.Name)
145+
assert.Equal(t, "user2", payloadCommits[2].Committer.UserName)
146+
assert.Equal(t, "User2", payloadCommits[2].Author.Name)
147+
assert.Equal(t, "user2", payloadCommits[2].Author.UserName)
148+
assert.EqualValues(t, []string{"readme.md"}, payloadCommits[2].Added)
149+
assert.EqualValues(t, []string{}, payloadCommits[2].Removed)
150+
assert.EqualValues(t, []string{}, payloadCommits[2].Modified)
126151
}
127152

128153
func TestPushCommits_AvatarLink(t *testing.T) {

0 commit comments

Comments
 (0)