Skip to content

Commit 0930750

Browse files
noerwnoerw
committed
fix remaining test cases
the refactor in go-gitea#19318 skipped changing TestSearchIssuesWithLabels, so this is changed to, so we don't have duplicate tests 🙃
1 parent ba8b1be commit 0930750

File tree

2 files changed

+30
-20
lines changed

2 files changed

+30
-20
lines changed

‎integrations/api_issue_test.go

+21-7
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
repo_model "code.gitea.io/gitea/models/repo"
1717
"code.gitea.io/gitea/models/unittest"
1818
user_model "code.gitea.io/gitea/models/user"
19+
"code.gitea.io/gitea/modules/setting"
1920
api "code.gitea.io/gitea/modules/structs"
2021

2122
"github.com/stretchr/testify/assert"
@@ -171,19 +172,25 @@ func TestAPISearchIssues(t *testing.T) {
171172

172173
token := getUserToken(t, "user2")
173174

175+
// as this API was used in the frontend, it uses UI page size
176+
expectedIssueCount := 15 // from the fixtures
177+
if expectedIssueCount > setting.UI.IssuePagingNum {
178+
expectedIssueCount = setting.UI.IssuePagingNum
179+
}
180+
174181
link, _ := url.Parse("/api/v1/repos/issues/search")
175182
req := NewRequest(t, "GET", link.String()+"?token="+token)
176183
resp := MakeRequest(t, req, http.StatusOK)
177184
var apiIssues []*api.Issue
178185
DecodeJSON(t, resp, &apiIssues)
179-
assert.Len(t, apiIssues, 10)
186+
assert.Len(t, apiIssues, expectedIssueCount)
180187

181188
query := url.Values{"token": {token}}
182189
link.RawQuery = query.Encode()
183190
req = NewRequest(t, "GET", link.String())
184191
resp = MakeRequest(t, req, http.StatusOK)
185192
DecodeJSON(t, resp, &apiIssues)
186-
assert.Len(t, apiIssues, 10)
193+
assert.Len(t, apiIssues, expectedIssueCount)
187194

188195
since := "2000-01-01T00%3A50%3A01%2B00%3A00" // 946687801
189196
before := time.Unix(999307200, 0).Format(time.RFC3339)
@@ -211,14 +218,15 @@ func TestAPISearchIssues(t *testing.T) {
211218
resp = MakeRequest(t, req, http.StatusOK)
212219
DecodeJSON(t, resp, &apiIssues)
213220
assert.EqualValues(t, "17", resp.Header().Get("X-Total-Count"))
214-
assert.Len(t, apiIssues, 10) // there are more but 10 is page item limit
221+
assert.Len(t, apiIssues, 17)
215222

216-
query.Add("limit", "20")
223+
query.Add("limit", "10")
217224
link.RawQuery = query.Encode()
218225
req = NewRequest(t, "GET", link.String())
219226
resp = MakeRequest(t, req, http.StatusOK)
220227
DecodeJSON(t, resp, &apiIssues)
221-
assert.Len(t, apiIssues, 17)
228+
assert.EqualValues(t, "17", resp.Header().Get("X-Total-Count"))
229+
assert.Len(t, apiIssues, 10)
222230

223231
query = url.Values{"assigned": {"true"}, "state": {"all"}, "token": {token}}
224232
link.RawQuery = query.Encode()
@@ -266,6 +274,12 @@ func TestAPISearchIssues(t *testing.T) {
266274
func TestAPISearchIssuesWithLabels(t *testing.T) {
267275
defer prepareTestEnv(t)()
268276

277+
// as this API was used in the frontend, it uses UI page size
278+
expectedIssueCount := 15 // from the fixtures
279+
if expectedIssueCount > setting.UI.IssuePagingNum {
280+
expectedIssueCount = setting.UI.IssuePagingNum
281+
}
282+
269283
token := getUserToken(t, "user1")
270284

271285
link, _ := url.Parse("/api/v1/repos/issues/search")
@@ -274,15 +288,15 @@ func TestAPISearchIssuesWithLabels(t *testing.T) {
274288
var apiIssues []*api.Issue
275289
DecodeJSON(t, resp, &apiIssues)
276290

277-
assert.Len(t, apiIssues, 10)
291+
assert.Len(t, apiIssues, expectedIssueCount)
278292

279293
query := url.Values{}
280294
query.Add("token", token)
281295
link.RawQuery = query.Encode()
282296
req = NewRequest(t, "GET", link.String())
283297
resp = MakeRequest(t, req, http.StatusOK)
284298
DecodeJSON(t, resp, &apiIssues)
285-
assert.Len(t, apiIssues, 10)
299+
assert.Len(t, apiIssues, expectedIssueCount)
286300

287301
query.Add("labels", "label1")
288302
link.RawQuery = query.Encode()

‎integrations/issue_test.go

+9-13
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@ func TestSearchIssues(t *testing.T) {
356356

357357
session := loginUser(t, "user2")
358358

359-
// as this API is used in the frontend, it uses UI page size
360359
expectedIssueCount := 15 // from the fixtures
361360
if expectedIssueCount > setting.UI.IssuePagingNum {
362361
expectedIssueCount = setting.UI.IssuePagingNum
@@ -456,51 +455,48 @@ func TestSearchIssues(t *testing.T) {
456455
func TestSearchIssuesWithLabels(t *testing.T) {
457456
defer prepareTestEnv(t)()
458457

459-
// as this API is used in the frontend, it uses UI page size
460458
expectedIssueCount := 15 // from the fixtures
461459
if expectedIssueCount > setting.UI.IssuePagingNum {
462460
expectedIssueCount = setting.UI.IssuePagingNum
463461
}
464462

465-
token := getUserToken(t, "user1")
463+
session := loginUser(t, "user1")
466464

467-
link, _ := url.Parse("/api/v1/repos/issues/search?token=" + token)
465+
link, _ := url.Parse("/issues/search")
468466
req := NewRequest(t, "GET", link.String())
469467
resp := MakeRequest(t, req, http.StatusOK)
470468
var apiIssues []*api.Issue
471469
DecodeJSON(t, resp, &apiIssues)
472470

473471
assert.Len(t, apiIssues, expectedIssueCount)
474472

475-
query := url.Values{
476-
"token": []string{token},
477-
}
473+
query := url.Values{}
478474
link.RawQuery = query.Encode()
479475
req = NewRequest(t, "GET", link.String())
480-
resp = MakeRequest(t, req, http.StatusOK)
476+
resp = session.MakeRequest(t, req, http.StatusOK)
481477
DecodeJSON(t, resp, &apiIssues)
482478
assert.Len(t, apiIssues, expectedIssueCount)
483479

484480
query.Add("labels", "label1")
485481
link.RawQuery = query.Encode()
486482
req = NewRequest(t, "GET", link.String())
487-
resp = MakeRequest(t, req, http.StatusOK)
483+
resp = session.MakeRequest(t, req, http.StatusOK)
488484
DecodeJSON(t, resp, &apiIssues)
489485
assert.Len(t, apiIssues, 2)
490486

491487
// multiple labels
492488
query.Set("labels", "label1,label2")
493489
link.RawQuery = query.Encode()
494490
req = NewRequest(t, "GET", link.String())
495-
resp = MakeRequest(t, req, http.StatusOK)
491+
resp = session.MakeRequest(t, req, http.StatusOK)
496492
DecodeJSON(t, resp, &apiIssues)
497493
assert.Len(t, apiIssues, 2)
498494

499495
// an org label
500496
query.Set("labels", "orglabel4")
501497
link.RawQuery = query.Encode()
502498
req = NewRequest(t, "GET", link.String())
503-
resp = MakeRequest(t, req, http.StatusOK)
499+
resp = session.MakeRequest(t, req, http.StatusOK)
504500
DecodeJSON(t, resp, &apiIssues)
505501
assert.Len(t, apiIssues, 1)
506502

@@ -509,15 +505,15 @@ func TestSearchIssuesWithLabels(t *testing.T) {
509505
query.Add("state", "all")
510506
link.RawQuery = query.Encode()
511507
req = NewRequest(t, "GET", link.String())
512-
resp = MakeRequest(t, req, http.StatusOK)
508+
resp = session.MakeRequest(t, req, http.StatusOK)
513509
DecodeJSON(t, resp, &apiIssues)
514510
assert.Len(t, apiIssues, 2)
515511

516512
// org and repo label which share the same issue
517513
query.Set("labels", "label1,orglabel4")
518514
link.RawQuery = query.Encode()
519515
req = NewRequest(t, "GET", link.String())
520-
resp = MakeRequest(t, req, http.StatusOK)
516+
resp = session.MakeRequest(t, req, http.StatusOK)
521517
DecodeJSON(t, resp, &apiIssues)
522518
assert.Len(t, apiIssues, 2)
523519
}

0 commit comments

Comments
 (0)