diff --git a/tests/integration/api_repo_archive_test.go b/tests/integration/api_repo_archive_test.go
index c574d49450..a4ae599615 100644
--- a/tests/integration/api_repo_archive_test.go
+++ b/tests/integration/api_repo_archive_test.go
@@ -8,6 +8,7 @@ import (
"io"
"net/http"
"net/url"
+ "regexp"
"testing"
auth_model "code.gitea.io/gitea/models/auth"
@@ -41,6 +42,16 @@ func TestAPIDownloadArchive(t *testing.T) {
assert.Len(t, bs, 266)
assert.EqualValues(t, "application/gzip", resp.Header().Get("Content-Type"))
+ // Must return a link to a commit ID as the "immutable" archive link
+ linkHeaderRe := regexp.MustCompile(`<(?Phttps?://.*/api/v1/repos/user2/repo1/archive/[a-f0-9]+\.tar\.gz.*)>; rel="immutable"`)
+ m := linkHeaderRe.FindStringSubmatch(resp.Header().Get("Link"))
+ assert.NotEmpty(t, m[1])
+ resp = MakeRequest(t, NewRequest(t, "GET", m[1]).AddTokenAuth(token), http.StatusOK)
+ bs2, err := io.ReadAll(resp.Body)
+ assert.NoError(t, err)
+ // The locked URL should give the same bytes as the non-locked one
+ assert.EqualValues(t, bs, bs2)
+
link, _ = url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/archive/master.bundle", user2.Name, repo.Name))
resp = MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusOK)
bs, err = io.ReadAll(resp.Body)
diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go
index f5b87231f3..f6daf0d146 100644
--- a/tests/integration/integration_test.go
+++ b/tests/integration/integration_test.go
@@ -692,6 +692,7 @@ type DeclarativeRepoOptions struct {
DisabledUnits optional.Option[[]unit_model.Type]
Files optional.Option[[]*files_service.ChangeRepoFile]
WikiBranch optional.Option[string]
+ AutoInit optional.Option[bool]
}
func CreateDeclarativeRepoWithOptions(t *testing.T, owner *user_model.User, opts DeclarativeRepoOptions) (*repo_model.Repository, string, func()) {
@@ -706,11 +707,18 @@ func CreateDeclarativeRepoWithOptions(t *testing.T, owner *user_model.User, opts
repoName = gouuid.NewString()
}
+ var autoInit bool
+ if opts.AutoInit.Has() {
+ autoInit = opts.AutoInit.Value()
+ } else {
+ autoInit = true
+ }
+
// Create the repository
repo, err := repo_service.CreateRepository(db.DefaultContext, owner, owner, repo_service.CreateRepoOptions{
Name: repoName,
Description: "Temporary Repo",
- AutoInit: true,
+ AutoInit: autoInit,
Gitignores: "",
License: "WTFPL",
Readme: "Default",
@@ -742,6 +750,7 @@ func CreateDeclarativeRepoWithOptions(t *testing.T, owner *user_model.User, opts
// Add files, if any.
var sha string
if opts.Files.Has() {
+ assert.True(t, autoInit, "Files cannot be specified if AutoInit is disabled")
files := opts.Files.Value()
resp, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, owner, &files_service.ChangeRepoFilesOptions{
diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go
index 49d1cbb016..b63127be82 100644
--- a/tests/integration/issue_test.go
+++ b/tests/integration/issue_test.go
@@ -15,6 +15,7 @@ import (
"testing"
"time"
+ auth_model "code.gitea.io/gitea/models/auth"
"code.gitea.io/gitea/models/db"
issues_model "code.gitea.io/gitea/models/issues"
repo_model "code.gitea.io/gitea/models/repo"
@@ -22,6 +23,7 @@ import (
"code.gitea.io/gitea/models/unittest"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/indexer/issues"
+ "code.gitea.io/gitea/modules/optional"
"code.gitea.io/gitea/modules/references"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
@@ -193,6 +195,93 @@ func TestNewIssue(t *testing.T) {
testNewIssue(t, session, "user2", "repo1", "Title", "Description")
}
+func TestIssueDependencies(t *testing.T) {
+ defer tests.PrepareTestEnv(t)()
+
+ owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+ session := loginUser(t, owner.Name)
+ token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue)
+
+ repo, _, f := CreateDeclarativeRepoWithOptions(t, owner, DeclarativeRepoOptions{})
+ defer f()
+
+ createIssue := func(t *testing.T, title string) api.Issue {
+ t.Helper()
+
+ urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues", owner.Name, repo.Name)
+ req := NewRequestWithJSON(t, "POST", urlStr, &api.CreateIssueOption{
+ Body: "",
+ Title: title,
+ }).AddTokenAuth(token)
+ resp := MakeRequest(t, req, http.StatusCreated)
+
+ var apiIssue api.Issue
+ DecodeJSON(t, resp, &apiIssue)
+
+ return apiIssue
+ }
+ addDependency := func(t *testing.T, issue, dependency api.Issue) {
+ t.Helper()
+
+ urlStr := fmt.Sprintf("/%s/%s/issues/%d/dependency/add", owner.Name, repo.Name, issue.Index)
+ req := NewRequestWithValues(t, "POST", urlStr, map[string]string{
+ "_csrf": GetCSRF(t, session, fmt.Sprintf("/%s/%s/issues/%d", owner.Name, repo.Name, issue.Index)),
+ "newDependency": fmt.Sprintf("%d", dependency.Index),
+ })
+ session.MakeRequest(t, req, http.StatusSeeOther)
+ }
+ removeDependency := func(t *testing.T, issue, dependency api.Issue) {
+ t.Helper()
+
+ urlStr := fmt.Sprintf("/%s/%s/issues/%d/dependency/delete", owner.Name, repo.Name, issue.Index)
+ req := NewRequestWithValues(t, "POST", urlStr, map[string]string{
+ "_csrf": GetCSRF(t, session, fmt.Sprintf("/%s/%s/issues/%d", owner.Name, repo.Name, issue.Index)),
+ "removeDependencyID": fmt.Sprintf("%d", dependency.Index),
+ "dependencyType": "blockedBy",
+ })
+ session.MakeRequest(t, req, http.StatusSeeOther)
+ }
+
+ assertHasDependency := func(t *testing.T, issueID, dependencyID int64, hasDependency bool) {
+ t.Helper()
+
+ urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/dependencies", owner.Name, repo.Name, issueID)
+ req := NewRequest(t, "GET", urlStr)
+ resp := MakeRequest(t, req, http.StatusOK)
+
+ var issues []api.Issue
+ DecodeJSON(t, resp, &issues)
+
+ if hasDependency {
+ assert.NotEmpty(t, issues)
+ assert.EqualValues(t, issues[0].Index, dependencyID)
+ } else {
+ assert.Empty(t, issues)
+ }
+ }
+
+ t.Run("Add dependency", func(t *testing.T) {
+ defer tests.PrintCurrentTest(t)()
+
+ issue1 := createIssue(t, "issue #1")
+ issue2 := createIssue(t, "issue #2")
+ addDependency(t, issue1, issue2)
+
+ assertHasDependency(t, issue1.Index, issue2.Index, true)
+ })
+
+ t.Run("Remove dependency", func(t *testing.T) {
+ defer tests.PrintCurrentTest(t)()
+
+ issue1 := createIssue(t, "issue #1")
+ issue2 := createIssue(t, "issue #2")
+ addDependency(t, issue1, issue2)
+ removeDependency(t, issue1, issue2)
+
+ assertHasDependency(t, issue1.Index, issue2.Index, false)
+ })
+}
+
func TestIssueCommentClose(t *testing.T) {
defer tests.PrepareTestEnv(t)()
session := loginUser(t, "user2")
@@ -876,3 +965,23 @@ body:
})
})
}
+
+func TestIssueUnsubscription(t *testing.T) {
+ onGiteaRun(t, func(t *testing.T, u *url.URL) {
+ defer tests.PrepareTestEnv(t)()
+
+ user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+ repo, _, f := CreateDeclarativeRepoWithOptions(t, user, DeclarativeRepoOptions{
+ AutoInit: optional.Some(false),
+ })
+ defer f()
+ session := loginUser(t, user.Name)
+
+ issueURL := testNewIssue(t, session, user.Name, repo.Name, "Issue title", "Description")
+ req := NewRequestWithValues(t, "POST", fmt.Sprintf("%s/watch", issueURL), map[string]string{
+ "_csrf": GetCSRF(t, session, issueURL),
+ "watch": "0",
+ })
+ session.MakeRequest(t, req, http.StatusOK)
+ })
+}
diff --git a/tests/integration/user_count_test.go b/tests/integration/user_count_test.go
new file mode 100644
index 0000000000..c0837d57fd
--- /dev/null
+++ b/tests/integration/user_count_test.go
@@ -0,0 +1,167 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+ "fmt"
+ "net/http"
+ "strconv"
+ "testing"
+
+ "code.gitea.io/gitea/models/db"
+ "code.gitea.io/gitea/models/organization"
+ project_model "code.gitea.io/gitea/models/project"
+ repo_model "code.gitea.io/gitea/models/repo"
+ "code.gitea.io/gitea/models/unittest"
+ user_model "code.gitea.io/gitea/models/user"
+ "code.gitea.io/gitea/modules/optional"
+ "code.gitea.io/gitea/tests"
+
+ "github.com/PuerkitoBio/goquery"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+)
+
+type userCountTest struct {
+ doer *user_model.User
+ user *user_model.User
+ session *TestSession
+ repoCount int64
+ projectCount int64
+ memberCount int64
+ teamCount int64
+}
+
+func (countTest *userCountTest) Init(t *testing.T, doerID, userID int64) {
+ countTest.doer = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: doerID})
+ countTest.user = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: userID})
+ countTest.session = loginUser(t, countTest.doer.Name)
+
+ var err error
+
+ countTest.repoCount, err = repo_model.CountRepository(db.DefaultContext, &repo_model.SearchRepoOptions{
+ Actor: countTest.doer,
+ OwnerID: countTest.user.ID,
+ Private: true,
+ Collaborate: optional.Some(false),
+ })
+ require.NoError(t, err)
+
+ var projectType project_model.Type
+ if countTest.user.IsOrganization() {
+ projectType = project_model.TypeOrganization
+ } else {
+ projectType = project_model.TypeIndividual
+ }
+ countTest.projectCount, err = db.Count[project_model.Project](db.DefaultContext, project_model.SearchOptions{
+ OwnerID: countTest.user.ID,
+ IsClosed: optional.Some(false),
+ Type: projectType,
+ })
+ require.NoError(t, err)
+
+ if !countTest.user.IsOrganization() {
+ return
+ }
+
+ org := (*organization.Organization)(countTest.user)
+
+ isMember, err := org.IsOrgMember(db.DefaultContext, countTest.doer.ID)
+ require.NoError(t, err)
+
+ countTest.memberCount, err = organization.CountOrgMembers(db.DefaultContext, &organization.FindOrgMembersOpts{
+ OrgID: org.ID,
+ PublicOnly: !isMember,
+ })
+ require.NoError(t, err)
+
+ teams, err := org.LoadTeams(db.DefaultContext)
+ require.NoError(t, err)
+
+ countTest.teamCount = int64(len(teams))
+}
+
+func (countTest *userCountTest) getCount(doc *goquery.Document, name string) (int64, error) {
+ selection := doc.Find(fmt.Sprintf("[test-name=\"%s\"]", name))
+
+ if selection.Length() != 1 {
+ return 0, fmt.Errorf("%s was not found", name)
+ }
+
+ return strconv.ParseInt(selection.Text(), 10, 64)
+}
+
+func (countTest *userCountTest) TestPage(t *testing.T, page string, orgLink bool) {
+ t.Run(page, func(t *testing.T) {
+ var userLink string
+
+ if orgLink {
+ userLink = countTest.user.OrganisationLink()
+ } else {
+ userLink = countTest.user.HomeLink()
+ }
+
+ req := NewRequestf(t, "GET", "%s/%s", userLink, page)
+ resp := countTest.session.MakeRequest(t, req, http.StatusOK)
+ htmlDoc := NewHTMLParser(t, resp.Body)
+
+ repoCount, err := countTest.getCount(htmlDoc.doc, "repository-count")
+ require.NoError(t, err)
+ assert.Equal(t, countTest.repoCount, repoCount)
+
+ projectCount, err := countTest.getCount(htmlDoc.doc, "project-count")
+ require.NoError(t, err)
+ assert.Equal(t, countTest.projectCount, projectCount)
+
+ if !countTest.user.IsOrganization() {
+ return
+ }
+
+ memberCount, err := countTest.getCount(htmlDoc.doc, "member-count")
+ require.NoError(t, err)
+ assert.Equal(t, countTest.memberCount, memberCount)
+
+ teamCount, err := countTest.getCount(htmlDoc.doc, "team-count")
+ require.NoError(t, err)
+ assert.Equal(t, countTest.teamCount, teamCount)
+ })
+}
+
+func TestFrontendHeaderCountUser(t *testing.T) {
+ defer tests.PrepareTestEnv(t)()
+
+ countTest := new(userCountTest)
+ countTest.Init(t, 2, 2)
+
+ countTest.TestPage(t, "", false)
+ countTest.TestPage(t, "?tab=repositories", false)
+ countTest.TestPage(t, "-/projects", false)
+ countTest.TestPage(t, "-/packages", false)
+ countTest.TestPage(t, "?tab=activity", false)
+ countTest.TestPage(t, "?tab=stars", false)
+}
+
+func TestFrontendHeaderCountOrg(t *testing.T) {
+ defer tests.PrepareTestEnv(t)()
+
+ countTest := new(userCountTest)
+ countTest.Init(t, 15, 17)
+
+ countTest.TestPage(t, "", false)
+ countTest.TestPage(t, "-/projects", false)
+ countTest.TestPage(t, "-/packages", false)
+ countTest.TestPage(t, "members", true)
+ countTest.TestPage(t, "teams", true)
+
+ countTest.TestPage(t, "settings", true)
+ countTest.TestPage(t, "settings/hooks", true)
+ countTest.TestPage(t, "settings/labels", true)
+ countTest.TestPage(t, "settings/applications", true)
+ countTest.TestPage(t, "settings/packages", true)
+ countTest.TestPage(t, "settings/actions/runners", true)
+ countTest.TestPage(t, "settings/actions/secrets", true)
+ countTest.TestPage(t, "settings/actions/variables", true)
+ countTest.TestPage(t, "settings/blocked_users", true)
+ countTest.TestPage(t, "settings/delete", true)
+}
diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index f1d331ff73..bf6bfd464b 100644
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -402,7 +402,7 @@ td .commit-summary {
.pdf-content {
width: 100%;
- height: 600px;
+ height: 100vh;
border: none !important;
display: flex;
align-items: center;
diff --git a/web_src/css/themes/theme-forgejo-dark.css b/web_src/css/themes/theme-forgejo-dark.css
index 42495c854b..95d35ddec0 100644
--- a/web_src/css/themes/theme-forgejo-dark.css
+++ b/web_src/css/themes/theme-forgejo-dark.css
@@ -141,6 +141,7 @@
/* other colors */
--color-gold: #b1983b;
--color-white: #ffffff;
+ --color-pure-black: #000000;
--color-diff-removed-word-bg: #783030;
--color-diff-added-word-bg: #255c39;
--color-diff-removed-row-bg: #432121;
@@ -304,7 +305,7 @@ i.grey.icon.icon.icon.icon {
}
::selection {
background: var(--steel-100) !important;
- color: var(--color-white) !important;
+ color: var(--color-pure-black) !important;
}
strong.attention-important, svg.attention-important {
color: var(--color-violet-light);