History

Move db related basic functions to models/db (#17075)

* Move db related basic functions to models/db * Fix lint * Fix lint * Fix test * Fix lint * Fix lint * revert unnecessary change * Fix test * Fix wrong replace string * Use *Context * Correct committer spelling and fix wrong replaced words

Lunny Xiao committed 5 years ago

Commit a4bfef21 parent 462306e335 files · +4176 −3639Browse files

Showing the changes to services/gitdiff/gitdiff_test.go (1 of 335 files). Show all

Unified · Split

services/gitdiff/gitdiff_test.go+4−3
@@ -13,6 +13,7 @@ import ( · 12 unmodified lines
13 "testing"13 "testing"
14 14
15 "code.gitea.io/gitea/models"15 "code.gitea.io/gitea/models"
16 "code.gitea.io/gitea/models/db"
16 "code.gitea.io/gitea/modules/git"17 "code.gitea.io/gitea/modules/git"
17 "code.gitea.io/gitea/modules/highlight"18 "code.gitea.io/gitea/modules/highlight"
18 "code.gitea.io/gitea/modules/json"19 "code.gitea.io/gitea/modules/json"
@@ -492,10 +493,10 @@ func setupDefaultDiff() *Diff { · 473 unmodified lines
492 }493 }
493}494}
494func TestDiff_LoadComments(t *testing.T) {495func TestDiff_LoadComments(t *testing.T) {
495 assert.NoError(t, models.PrepareTestDatabase())496 assert.NoError(t, db.PrepareTestDatabase())
496 497
497 issue := models.AssertExistsAndLoadBean(t, &models.Issue{ID: 2}).(*models.Issue)498 issue := db.AssertExistsAndLoadBean(t, &models.Issue{ID: 2}).(*models.Issue)
498 user := models.AssertExistsAndLoadBean(t, &models.User{ID: 1}).(*models.User)499 user := db.AssertExistsAndLoadBean(t, &models.User{ID: 1}).(*models.User)
499 diff := setupDefaultDiff()500 diff := setupDefaultDiff()
500 assert.NoError(t, diff.LoadComments(issue, user))501 assert.NoError(t, diff.LoadComments(issue, user))
501 assert.Len(t, diff.Files[0].Sections[0].Lines[0].Comments, 2)502 assert.Len(t, diff.Files[0].Sections[0].Lines[0].Comments, 2)