Skip to content

Commit 99d6934

Browse files
committed
Fix test
1 parent cb98242 commit 99d6934

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

services/repository/files/content_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func getExpectedReadmeContentsResponse() *api.ContentsResponse {
3939
LastCommitSHA: "65f1bf27bc3bf70f64657658635e66094edbcb4d",
4040
LastCommitterDate: time.Date(2017, time.March, 19, 16, 47, 59, 0, time.FixedZone("", -14400)),
4141
LastAuthorDate: time.Date(2017, time.March, 19, 16, 47, 59, 0, time.FixedZone("", -14400)),
42-
LastCommitMessage: "Initial commit",
42+
LastCommitMessage: "Initial commit\n",
4343
Type: "file",
4444
Size: 30,
4545
Encoding: &encoding,

tests/integration/repofiles_change_test.go

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ func getExpectedFileResponseForRepoFilesCreate(commitID string, lastCommit *git.
158158
LastCommitSHA: lastCommit.ID.String(),
159159
LastCommitterDate: lastCommit.Committer.When,
160160
LastAuthorDate: lastCommit.Author.When,
161+
LastCommitMessage: "Creates new/file.txt\n",
161162
Type: "file",
162163
Size: 18,
163164
Encoding: &encoding,
@@ -198,7 +199,7 @@ func getExpectedFileResponseForRepoFilesCreate(commitID string, lastCommit *git.
198199
SHA: "65f1bf27bc3bf70f64657658635e66094edbcb4d",
199200
},
200201
},
201-
Message: "Updates README.md\n",
202+
Message: "Creates new/file.txt\n",
202203
Tree: &api.CommitMeta{
203204
URL: setting.AppURL + "api/v1/repos/user2/repo1/git/trees/f93e3a1a1525fb5b91020da86e44810c87a2d7bc",
204205
SHA: "f93e3a1a1525fb5b91020git dda86e44810c87a2d7bc",
@@ -228,6 +229,7 @@ func getExpectedFileResponseForRepoFilesUpdate(commitID, filename, lastCommitSHA
228229
LastCommitSHA: lastCommitSHA,
229230
LastCommitterDate: lastCommitterWhen,
230231
LastAuthorDate: lastAuthorWhen,
232+
LastCommitMessage: "Updates README.md\n",
231233
Type: "file",
232234
Size: 43,
233235
Encoding: &encoding,
@@ -328,18 +330,19 @@ func getExpectedFileResponseForRepoFilesUpdateRename(commitID, lastCommitSHA str
328330
downloadURL := setting.AppURL + "user2/lfs/raw/branch/master/" + detail.filename
329331
// don't set time related fields because there might be different time in one operation
330332
responses = append(responses, &api.ContentsResponse{
331-
Name: detail.filename,
332-
Path: detail.filename,
333-
SHA: detail.sha,
334-
LastCommitSHA: lastCommitSHA,
335-
Type: "file",
336-
Size: detail.size,
337-
Encoding: util.ToPointer("base64"),
338-
Content: &detail.content,
339-
URL: &selfURL,
340-
HTMLURL: &htmlURL,
341-
GitURL: &gitURL,
342-
DownloadURL: &downloadURL,
333+
Name: detail.filename,
334+
Path: detail.filename,
335+
SHA: detail.sha,
336+
LastCommitSHA: lastCommitSHA,
337+
LastCommitMessage: "Rename files\n",
338+
Type: "file",
339+
Size: detail.size,
340+
Encoding: util.ToPointer("base64"),
341+
Content: &detail.content,
342+
URL: &selfURL,
343+
HTMLURL: &htmlURL,
344+
GitURL: &gitURL,
345+
DownloadURL: &downloadURL,
343346
Links: &api.FileLinksResponse{
344347
Self: &selfURL,
345348
GitURL: &gitURL,

0 commit comments

Comments
 (0)