Skip to content

Commit f10724f

Browse files
lunnylunny
committed
Merge
1 parent 330bdae commit f10724f

8 files changed

+42
-37
lines changed

‎integrations/api_notification_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func TestAPINotification(t *testing.T) {
6666

6767
// -- GET /repos/{owner}/{repo}/notifications -- multiple status-types
6868
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/notifications?status-types=unread&status-types=pinned&token=%s", user2.Name, repo1.Name, token))
69-
resp = session.MakeRequest(t, req, http.StatusOK)
69+
resp = MakeRequest(t, req, http.StatusOK)
7070
DecodeJSON(t, resp, &apiNL)
7171

7272
assert.Len(t, apiNL, 2)
@@ -80,7 +80,7 @@ func TestAPINotification(t *testing.T) {
8080
// -- GET /notifications/threads/{id} --
8181
// get forbidden
8282
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications/threads/%d?token=%s", 1, token))
83-
resp = MakeRequest(t, req, http.StatusForbidden)
83+
MakeRequest(t, req, http.StatusForbidden)
8484

8585
// get own
8686
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications/threads/%d?token=%s", thread5.ID, token))
@@ -114,7 +114,7 @@ func TestAPINotification(t *testing.T) {
114114

115115
lastReadAt := "2000-01-01T00%3A50%3A01%2B00%3A00" // 946687801 <- only Notification 4 is in this filter ...
116116
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/notifications?last_read_at=%s&token=%s", user2.Name, repo1.Name, lastReadAt, token))
117-
resp = MakeRequest(t, req, http.StatusResetContent)
117+
MakeRequest(t, req, http.StatusResetContent)
118118

119119
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications?status-types=unread&token=%s", token))
120120
resp = MakeRequest(t, req, http.StatusOK)
@@ -123,7 +123,7 @@ func TestAPINotification(t *testing.T) {
123123

124124
// -- PATCH /notifications/threads/{id} --
125125
req = NewRequest(t, "PATCH", fmt.Sprintf("/api/v1/notifications/threads/%d?token=%s", thread5.ID, token))
126-
resp = MakeRequest(t, req, http.StatusResetContent)
126+
MakeRequest(t, req, http.StatusResetContent)
127127

128128
assert.Equal(t, models.NotificationStatusUnread, thread5.Status)
129129
thread5 = unittest.AssertExistsAndLoadBean(t, &models.Notification{ID: 5}).(*models.Notification)

‎integrations/api_repo_teams_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,24 +56,24 @@ func TestAPIRepoTeams(t *testing.T) {
5656

5757
url = fmt.Sprintf("/api/v1/repos/%s/teams/%s?token=%s", publicOrgRepo.FullName(), "NonExistingTeam", token)
5858
req = NewRequest(t, "GET", url)
59-
res = MakeRequest(t, req, http.StatusNotFound)
59+
MakeRequest(t, req, http.StatusNotFound)
6060

6161
// AddTeam with user4
6262
url = fmt.Sprintf("/api/v1/repos/%s/teams/%s?token=%s", publicOrgRepo.FullName(), "team1", token)
6363
req = NewRequest(t, "PUT", url)
64-
res = MakeRequest(t, req, http.StatusForbidden)
64+
MakeRequest(t, req, http.StatusForbidden)
6565

6666
// AddTeam with user2
6767
user = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}).(*user_model.User)
6868
token = getUserToken(t, user.Name)
6969
url = fmt.Sprintf("/api/v1/repos/%s/teams/%s?token=%s", publicOrgRepo.FullName(), "team1", token)
7070
req = NewRequest(t, "PUT", url)
71-
res = MakeRequest(t, req, http.StatusNoContent)
72-
res = MakeRequest(t, req, http.StatusUnprocessableEntity) // test duplicate request
71+
MakeRequest(t, req, http.StatusNoContent)
72+
MakeRequest(t, req, http.StatusUnprocessableEntity) // test duplicate request
7373

7474
// DeleteTeam
7575
url = fmt.Sprintf("/api/v1/repos/%s/teams/%s?token=%s", publicOrgRepo.FullName(), "team1", token)
7676
req = NewRequest(t, "DELETE", url)
77-
res = MakeRequest(t, req, http.StatusNoContent)
78-
res = MakeRequest(t, req, http.StatusUnprocessableEntity) // test duplicate request
77+
MakeRequest(t, req, http.StatusNoContent)
78+
MakeRequest(t, req, http.StatusUnprocessableEntity) // test duplicate request
7979
}

‎integrations/api_ui_helper_for_declarative_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"testing"
1212
"time"
1313

14-
"code.gitea.io/gitea/models"
14+
repo_model "code.gitea.io/gitea/models/repo"
1515
"code.gitea.io/gitea/modules/queue"
1616
api "code.gitea.io/gitea/modules/structs"
1717
"code.gitea.io/gitea/services/forms"
@@ -47,7 +47,7 @@ func doMergePullRequest(ctx TestContext, owner, repo string, index int64) func(*
4747
owner, repo, index)
4848
req := NewRequestWithJSON(t, http.MethodPost, urlStr, &forms.MergePullRequestForm{
4949
MergeMessageField: "doMergePullRequest Merge",
50-
Do: string(models.MergeStyleMerge),
50+
Do: string(repo_model.MergeStyleMerge),
5151
})
5252

5353
resp := ctx.Session.MakeRequest(t, req, NoExpectedStatus)
@@ -59,7 +59,7 @@ func doMergePullRequest(ctx TestContext, owner, repo string, index int64) func(*
5959
queue.GetManager().FlushAll(context.Background(), 5*time.Second)
6060
req = NewRequestWithJSON(t, http.MethodPost, urlStr, &forms.MergePullRequestForm{
6161
MergeMessageField: "doMergePullRequest Merge",
62-
Do: string(models.MergeStyleMerge),
62+
Do: string(repo_model.MergeStyleMerge),
6363
})
6464
resp = ctx.Session.MakeRequest(t, req, NoExpectedStatus)
6565
}

‎integrations/api_ui_issue_stopwatch_test.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ import (
99
"testing"
1010

1111
"code.gitea.io/gitea/models"
12+
repo_model "code.gitea.io/gitea/models/repo"
1213
"code.gitea.io/gitea/models/unittest"
14+
user_model "code.gitea.io/gitea/models/user"
1315
api "code.gitea.io/gitea/modules/structs"
1416

1517
"github.com/stretchr/testify/assert"
@@ -18,8 +20,8 @@ import (
1820
func TestUIAPIListStopWatches(t *testing.T) {
1921
defer prepareTestEnv(t)()
2022

21-
repo := unittest.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)
22-
owner := unittest.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
23+
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}).(*repo_model.Repository)
24+
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}).(*user_model.User)
2325

2426
session := loginUser(t, owner.Name)
2527
req := NewRequestf(t, "GET", "/api/ui/user/stopwatches")

‎integrations/api_ui_notification_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ import (
1010
"testing"
1111

1212
"code.gitea.io/gitea/models"
13-
"code.gitea.io/gitea/models/db"
13+
repo_model "code.gitea.io/gitea/models/repo"
1414
"code.gitea.io/gitea/models/unittest"
15+
user_model "code.gitea.io/gitea/models/user"
1516
api "code.gitea.io/gitea/modules/structs"
1617

1718
"github.com/stretchr/testify/assert"
@@ -20,8 +21,8 @@ import (
2021
func TestNotification(t *testing.T) {
2122
defer prepareTestEnv(t)()
2223

23-
user2 := unittest.AssertExistsAndLoadBean(t, &models.User{ID: 2}).(*models.User)
24-
repo1 := unittest.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)
24+
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}).(*user_model.User)
25+
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}).(*repo_model.Repository)
2526
thread5 := unittest.AssertExistsAndLoadBean(t, &models.Notification{ID: 5}).(*models.Notification)
2627
assert.NoError(t, thread5.LoadAttributes())
2728

@@ -114,7 +115,7 @@ func TestNotification(t *testing.T) {
114115
MakeRequest(t, req, http.StatusResetContent)
115116

116117
assert.Equal(t, models.NotificationStatusUnread, thread5.Status)
117-
thread5 = db.AssertExistsAndLoadBean(t, &models.Notification{ID: 5}).(*models.Notification)
118+
thread5 = unittest.AssertExistsAndLoadBean(t, &models.Notification{ID: 5}).(*models.Notification)
118119
assert.Equal(t, models.NotificationStatusRead, thread5.Status)
119120

120121
// -- check notifications --

‎integrations/api_ui_repo_test.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import (
1010
"testing"
1111

1212
"code.gitea.io/gitea/models"
13-
"code.gitea.io/gitea/models/db"
13+
"code.gitea.io/gitea/models/unittest"
14+
user_model "code.gitea.io/gitea/models/user"
1415
"code.gitea.io/gitea/modules/setting"
1516
api "code.gitea.io/gitea/modules/structs"
1617
"github.com/stretchr/testify/assert"
@@ -31,11 +32,11 @@ func TestAPIUISearchRepo(t *testing.T) {
3132
assert.False(t, repo.Private)
3233
}
3334

34-
user := db.AssertExistsAndLoadBean(t, &models.User{ID: 15}).(*models.User)
35-
user2 := db.AssertExistsAndLoadBean(t, &models.User{ID: 16}).(*models.User)
36-
user3 := db.AssertExistsAndLoadBean(t, &models.User{ID: 18}).(*models.User)
37-
user4 := db.AssertExistsAndLoadBean(t, &models.User{ID: 20}).(*models.User)
38-
orgUser := db.AssertExistsAndLoadBean(t, &models.User{ID: 17}).(*models.User)
35+
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 15}).(*user_model.User)
36+
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 16}).(*user_model.User)
37+
user3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 18}).(*user_model.User)
38+
user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 20}).(*user_model.User)
39+
orgUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 17}).(*user_model.User)
3940

4041
oldAPIDefaultNum := setting.API.DefaultPagingNum
4142
defer func() {
@@ -44,7 +45,7 @@ func TestAPIUISearchRepo(t *testing.T) {
4445
setting.API.DefaultPagingNum = 10
4546

4647
// Map of expected results, where key is user for login
47-
type expectedResults map[*models.User]struct {
48+
type expectedResults map[*user_model.User]struct {
4849
count int
4950
repoOwnerID int64
5051
repoName string

‎integrations/api_ui_user_search_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"net/http"
1010
"testing"
1111

12-
"code.gitea.io/gitea/models"
13-
"code.gitea.io/gitea/models/db"
12+
"code.gitea.io/gitea/models/unittest"
13+
user_model "code.gitea.io/gitea/models/user"
1414
"code.gitea.io/gitea/modules/setting"
1515

1616
"github.com/stretchr/testify/assert"
@@ -43,10 +43,10 @@ func TestAPIUIUserSearchNotLoggedIn(t *testing.T) {
4343
var results SearchResults
4444
DecodeJSON(t, resp, &results)
4545
assert.NotEmpty(t, results.Data)
46-
var modelUser *models.User
46+
var modelUser *user_model.User
4747
for _, user := range results.Data {
4848
assert.Contains(t, user.UserName, query)
49-
modelUser = db.AssertExistsAndLoadBean(t, &models.User{ID: user.ID}).(*models.User)
49+
modelUser = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: user.ID}).(*user_model.User)
5050
if modelUser.KeepEmailPrivate {
5151
assert.EqualValues(t, fmt.Sprintf("%s@%s", modelUser.LowerName, setting.Service.NoReplyAddress), user.Email)
5252
} else {

‎routers/api/ui/api.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"strings"
1111

1212
"code.gitea.io/gitea/models"
13+
repo_model "code.gitea.io/gitea/models/repo"
1314
"code.gitea.io/gitea/models/unit"
1415
user_model "code.gitea.io/gitea/models/user"
1516
"code.gitea.io/gitea/modules/context"
@@ -35,17 +36,17 @@ func repoAssignment() func(ctx *context.APIContext) {
3536
repoName := ctx.Params("reponame")
3637

3738
var (
38-
owner *models.User
39+
owner *user_model.User
3940
err error
4041
)
4142

4243
// Check if the user is the same as the repository owner.
4344
if ctx.IsSigned && ctx.User.LowerName == strings.ToLower(userName) {
4445
owner = ctx.User
4546
} else {
46-
owner, err = models.GetUserByName(userName)
47+
owner, err = user_model.GetUserByName(userName)
4748
if err != nil {
48-
if models.IsErrUserNotExist(err) {
49+
if user_model.IsErrUserNotExist(err) {
4950
if redirectUserID, err := user_model.LookupUserRedirect(userName); err == nil {
5051
context.RedirectToUser(ctx.Context, userName, redirectUserID)
5152
} else if user_model.IsErrUserRedirectNotExist(err) {
@@ -62,13 +63,13 @@ func repoAssignment() func(ctx *context.APIContext) {
6263
ctx.Repo.Owner = owner
6364

6465
// Get repository.
65-
repo, err := models.GetRepositoryByName(owner.ID, repoName)
66+
repo, err := repo_model.GetRepositoryByName(owner.ID, repoName)
6667
if err != nil {
67-
if models.IsErrRepoNotExist(err) {
68-
redirectRepoID, err := models.LookupRepoRedirect(owner.ID, repoName)
68+
if repo_model.IsErrRepoNotExist(err) {
69+
redirectRepoID, err := repo_model.LookupRedirect(owner.ID, repoName)
6970
if err == nil {
7071
context.RedirectToRepo(ctx.Context, redirectRepoID)
71-
} else if models.IsErrRepoRedirectNotExist(err) {
72+
} else if repo_model.IsErrRedirectNotExist(err) {
7273
ctx.NotFound()
7374
} else {
7475
ctx.Error(http.StatusInternalServerError, "LookupRepoRedirect", err)

0 commit comments

Comments
 (0)