summaryrefslogtreecommitdiffstats
path: root/integrations
diff options
context:
space:
mode:
authorElena Neuschild <eneuschild@gmail.com>2021-01-13 05:19:17 +0100
committerGitHub <noreply@github.com>2021-01-12 23:19:17 -0500
commit564030336dbfe1227ec458ecdedc0cfabdd4c1cc (patch)
tree7311fc29a8ed0c112a7891a11c34fbf76d9ad0eb /integrations
parent81467e6f35f343b911c09f746deca869a48da4c8 (diff)
downloadgitea-564030336dbfe1227ec458ecdedc0cfabdd4c1cc.tar.gz
gitea-564030336dbfe1227ec458ecdedc0cfabdd4c1cc.zip
Issues overview should not show issues from archived repos (#13220)
* Add lots of comments to user.Issues() * Answered some questions from comments * fix typo in comment * Refac user.Issues(): add func repoIDs * Refac user.Issues(): add func userRepoIDs * Refac user.Issues(): add func issueIDsFromSearch * Refac user.Issues(): improve error handling * Refac user.Issues(): add inline documentation and move variable declarations closer to their usages * Refac user.Issues(): add func repoIDMap * Refac user.Issues(): cleanup * Refac: Separate Issues from Pulls during routing * fix typo in comment * Adapt Unittests to Refactoring * Issue13171: Issue and PR Overviews now ignore archived Repositories * changed some verbatim SQL conditions to builder.Eq * models/issue.go: use OptionalBool properly Co-authored-by: 6543 <6543@obermui.de> * Use IsArchived rather than ExcludeArchivedRepos * fixed broken test after merge * added nil check * Added Unit Test securing Issue 13171 fix * Improved IsArchived filtering in issue.GetUserIssueStats * Removed unused func * Added grouping to avoid returning duplicate repo IDs Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: Gitea <gitea@fake.local> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'integrations')
-rw-r--r--integrations/api_issue_test.go4
-rw-r--r--integrations/api_repo_test.go6
2 files changed, 5 insertions, 5 deletions
diff --git a/integrations/api_issue_test.go b/integrations/api_issue_test.go
index 81e5c44873..f932f79fee 100644
--- a/integrations/api_issue_test.go
+++ b/integrations/api_issue_test.go
@@ -186,7 +186,7 @@ func TestAPISearchIssues(t *testing.T) {
req = NewRequest(t, "GET", link.String())
resp = session.MakeRequest(t, req, http.StatusOK)
DecodeJSON(t, resp, &apiIssues)
- assert.EqualValues(t, "12", resp.Header().Get("X-Total-Count"))
+ assert.EqualValues(t, "14", resp.Header().Get("X-Total-Count"))
assert.Len(t, apiIssues, 10) //there are more but 10 is page item limit
query.Add("limit", "20")
@@ -194,7 +194,7 @@ func TestAPISearchIssues(t *testing.T) {
req = NewRequest(t, "GET", link.String())
resp = session.MakeRequest(t, req, http.StatusOK)
DecodeJSON(t, resp, &apiIssues)
- assert.Len(t, apiIssues, 12)
+ assert.Len(t, apiIssues, 14)
query = url.Values{"assigned": {"true"}, "state": {"all"}}
link.RawQuery = query.Encode()
diff --git a/integrations/api_repo_test.go b/integrations/api_repo_test.go
index 8294a01773..b6d41fe1e0 100644
--- a/integrations/api_repo_test.go
+++ b/integrations/api_repo_test.go
@@ -77,9 +77,9 @@ func TestAPISearchRepo(t *testing.T) {
expectedResults
}{
{name: "RepositoriesMax50", requestURL: "/api/v1/repos/search?limit=50&private=false", expectedResults: expectedResults{
- nil: {count: 28},
- user: {count: 28},
- user2: {count: 28}},
+ nil: {count: 30},
+ user: {count: 30},
+ user2: {count: 30}},
},
{name: "RepositoriesMax10", requestURL: "/api/v1/repos/search?limit=10&private=false", expectedResults: expectedResults{
nil: {count: 10},