diff --git a/models/fixtures/attachment.yml b/models/fixtures/attachment.yml
index 7882d8bff2..f6b5393b4d 100644
--- a/models/fixtures/attachment.yml
+++ b/models/fixtures/attachment.yml
@@ -153,3 +153,16 @@
download_count: 0
size: 0
created_unix: 946684800
+
+-
+ id: 13
+ uuid: 1b267670-1793-4cd0-abc1-449269b7cff9
+ repo_id: 1
+ issue_id: 23
+ release_id: 0
+ uploader_id: 0
+ comment_id: 2
+ name: gitea.png
+ download_count: 0
+ size: 1458
+ created_unix: 946684800
diff --git a/models/fixtures/issue.yml b/models/fixtures/issue.yml
index ca5b1c6cd1..c829c75529 100644
--- a/models/fixtures/issue.yml
+++ b/models/fixtures/issue.yml
@@ -372,3 +372,20 @@
created_unix: 1707270422
updated_unix: 1707270422
is_locked: false
+
+-
+ id: 23
+ repo_id: 1
+ index: 6
+ poster_id: 1
+ original_author_id: 0
+ name: issue23
+ content: 'content including this image: with some more content behind it'
+ milestone_id: 0
+ priority: 0
+ is_closed: false
+ is_pull: false
+ num_comments: 0
+ created_unix: 946684801
+ updated_unix: 978307201
+ is_locked: false
diff --git a/models/fixtures/issue_index.yml b/models/fixtures/issue_index.yml
index 5aabc08e38..c1e0b546a4 100644
--- a/models/fixtures/issue_index.yml
+++ b/models/fixtures/issue_index.yml
@@ -1,6 +1,6 @@
-
group_id: 1
- max_index: 5
+ max_index: 6
-
group_id: 2
diff --git a/models/fixtures/repository.yml b/models/fixtures/repository.yml
index 552a78cbd2..47f9cb8a5d 100644
--- a/models/fixtures/repository.yml
+++ b/models/fixtures/repository.yml
@@ -9,7 +9,7 @@
num_watches: 4
num_stars: 0
num_forks: 0
- num_issues: 2
+ num_issues: 3
num_closed_issues: 1
num_pulls: 3
num_closed_pulls: 0
diff --git a/models/issues/issue_test.go b/models/issues/issue_test.go
index dbbb1e4179..77c387d0e0 100644
--- a/models/issues/issue_test.go
+++ b/models/issues/issue_test.go
@@ -57,7 +57,7 @@ func Test_GetIssueIDsByRepoID(t *testing.T) {
ids, err := issues_model.GetIssueIDsByRepoID(db.DefaultContext, 1)
assert.NoError(t, err)
- assert.Len(t, ids, 5)
+ assert.Len(t, ids, 6)
}
func TestIssueAPIURL(t *testing.T) {
@@ -170,7 +170,7 @@ func TestIssues(t *testing.T) {
PageSize: 4,
},
},
- []int64{1, 2, 3, 5},
+ []int64{1, 23, 2, 3},
},
{
issues_model.IssuesOptions{
@@ -249,11 +249,11 @@ func TestIssue_InsertIssue(t *testing.T) {
assert.NoError(t, unittest.PrepareTestDatabase())
// there are 5 issues and max index is 5 on repository 1, so this one should 6
- issue := testInsertIssue(t, "my issue1", "special issue's comments?", 6)
+ issue := testInsertIssue(t, "my issue1", "special issue's comments?", 7)
_, err := db.DeleteByID[issues_model.Issue](db.DefaultContext, issue.ID)
assert.NoError(t, err)
- issue = testInsertIssue(t, `my issue2, this is my son's love \n \r \ `, "special issue's '' comments?", 7)
+ issue = testInsertIssue(t, `my issue2, this is my son's love \n \r \ `, "special issue's '' comments?", 8)
_, err = db.DeleteByID[issues_model.Issue](db.DefaultContext, issue.ID)
assert.NoError(t, err)
}
@@ -380,7 +380,7 @@ func TestCountIssues(t *testing.T) {
assert.NoError(t, unittest.PrepareTestDatabase())
count, err := issues_model.CountIssues(db.DefaultContext, &issues_model.IssuesOptions{})
assert.NoError(t, err)
- assert.EqualValues(t, 22, count)
+ assert.EqualValues(t, 23, count)
}
func TestIssueLoadAttributes(t *testing.T) {
diff --git a/models/issues/issue_user_test.go b/models/issues/issue_user_test.go
index 7c21aa15ee..fef599a366 100644
--- a/models/issues/issue_user_test.go
+++ b/models/issues/issue_user_test.go
@@ -22,7 +22,7 @@ func Test_NewIssueUsers(t *testing.T) {
newIssue := &issues_model.Issue{
RepoID: repo.ID,
PosterID: 4,
- Index: 6,
+ Index: 7,
Title: "newTestIssueTitle",
Content: "newTestIssueContent",
}
diff --git a/models/repo/attachment_test.go b/models/repo/attachment_test.go
index c059ffd39a..48313aa382 100644
--- a/models/repo/attachment_test.go
+++ b/models/repo/attachment_test.go
@@ -51,7 +51,7 @@ func TestDeleteAttachments(t *testing.T) {
count, err = repo_model.DeleteAttachmentsByComment(db.DefaultContext, 2, false)
assert.NoError(t, err)
- assert.Equal(t, 2, count)
+ assert.Equal(t, 3, count)
err = repo_model.DeleteAttachment(db.DefaultContext, &repo_model.Attachment{ID: 8}, false)
assert.NoError(t, err)
diff --git a/modules/indexer/issues/indexer_test.go b/modules/indexer/issues/indexer_test.go
index 8043d33eeb..736936012e 100644
--- a/modules/indexer/issues/indexer_test.go
+++ b/modules/indexer/issues/indexer_test.go
@@ -57,7 +57,7 @@ func searchIssueWithKeyword(t *testing.T) {
Keyword: "issue2",
RepoIDs: []int64{1},
},
- []int64{2},
+ []int64{2, 23},
},
{
SearchOptions{
@@ -106,7 +106,7 @@ func searchIssueByIndex(t *testing.T) {
Keyword: "2",
RepoIDs: []int64{1, 2, 3, 32},
},
- []int64{17, 12, 7, 2},
+ []int64{17, 12, 7, 2, 23},
},
{
SearchOptions{
@@ -133,7 +133,7 @@ func searchIssueInRepo(t *testing.T) {
SearchOptions{
RepoIDs: []int64{1},
},
- []int64{11, 5, 3, 2, 1},
+ []int64{11, 5, 3, 2, 23, 1},
},
{
SearchOptions{
@@ -177,7 +177,7 @@ func searchIssueByID(t *testing.T) {
opts: SearchOptions{
PosterID: optional.Some(int64(1)),
},
- expectedIDs: []int64{11, 6, 3, 2, 1},
+ expectedIDs: []int64{11, 6, 3, 2, 23, 1},
},
{
opts: SearchOptions{
@@ -188,7 +188,7 @@ func searchIssueByID(t *testing.T) {
{
// NOTE: This tests no assignees filtering and also ToSearchOptions() to ensure it will set AssigneeID to 0 when it is passed as -1.
opts: *ToSearchOptions("", &issues.IssuesOptions{AssigneeID: optional.Some(db.NoConditionID)}),
- expectedIDs: []int64{22, 21, 16, 15, 14, 13, 12, 11, 20, 5, 19, 18, 10, 7, 4, 9, 8, 3, 2},
+ expectedIDs: []int64{22, 21, 16, 15, 14, 13, 12, 11, 20, 5, 19, 18, 10, 7, 4, 9, 8, 3, 2, 23},
},
{
opts: SearchOptions{
@@ -212,7 +212,7 @@ func searchIssueByID(t *testing.T) {
opts: SearchOptions{
SubscriberID: optional.Some(int64(1)),
},
- expectedIDs: []int64{11, 6, 5, 3, 2, 1},
+ expectedIDs: []int64{11, 6, 5, 3, 2, 23, 1},
},
{
// issue 20 request user 15 and team 5 which user 15 belongs to
@@ -247,7 +247,7 @@ func searchIssueIsPull(t *testing.T) {
SearchOptions{
IsPull: optional.Some(false),
},
- []int64{17, 16, 15, 14, 13, 6, 5, 18, 10, 7, 4, 1},
+ []int64{17, 16, 15, 14, 13, 6, 5, 18, 10, 7, 4, 23, 1},
},
{
SearchOptions{
@@ -272,7 +272,7 @@ func searchIssueIsClosed(t *testing.T) {
SearchOptions{
IsClosed: optional.Some(false),
},
- []int64{22, 21, 17, 16, 15, 14, 13, 12, 11, 20, 6, 19, 18, 10, 7, 9, 8, 3, 2, 1},
+ []int64{22, 21, 17, 16, 15, 14, 13, 12, 11, 20, 6, 19, 18, 10, 7, 9, 8, 3, 2, 23, 1},
},
{
SearchOptions{
@@ -297,7 +297,7 @@ func searchIssueIsArchived(t *testing.T) {
SearchOptions{
IsArchived: optional.Some(false),
},
- []int64{22, 21, 17, 16, 15, 13, 12, 11, 20, 6, 5, 19, 18, 10, 7, 4, 9, 8, 3, 2, 1},
+ []int64{22, 21, 17, 16, 15, 13, 12, 11, 20, 6, 5, 19, 18, 10, 7, 4, 9, 8, 3, 2, 23, 1},
},
{
SearchOptions{
@@ -359,7 +359,7 @@ func searchIssueByLabelID(t *testing.T) {
SearchOptions{
ExcludedLabelIDs: []int64{1},
},
- []int64{22, 21, 17, 16, 15, 14, 13, 12, 11, 20, 6, 5, 19, 18, 10, 7, 4, 9, 8, 3},
+ []int64{22, 21, 17, 16, 15, 14, 13, 12, 11, 20, 6, 5, 19, 18, 10, 7, 4, 9, 8, 3, 23},
},
}
for _, test := range tests {
@@ -378,7 +378,7 @@ func searchIssueByTime(t *testing.T) {
SearchOptions{
UpdatedAfterUnix: optional.Some(int64(0)),
},
- []int64{22, 21, 17, 16, 15, 14, 13, 12, 11, 20, 6, 5, 19, 18, 10, 7, 4, 9, 8, 3, 2, 1},
+ []int64{22, 21, 17, 16, 15, 14, 13, 12, 11, 20, 6, 5, 19, 18, 10, 7, 4, 9, 8, 3, 2, 23, 1},
},
}
for _, test := range tests {
@@ -397,7 +397,7 @@ func searchIssueWithOrder(t *testing.T) {
SearchOptions{
SortBy: internal.SortByCreatedAsc,
},
- []int64{1, 2, 3, 8, 9, 4, 7, 10, 18, 19, 5, 6, 20, 11, 12, 13, 14, 15, 16, 17, 21, 22},
+ []int64{1, 23, 2, 3, 8, 9, 4, 7, 10, 18, 19, 5, 6, 20, 11, 12, 13, 14, 15, 16, 17, 21, 22},
},
}
for _, test := range tests {
@@ -451,7 +451,7 @@ func searchIssueWithPaginator(t *testing.T) {
},
},
[]int64{22, 21, 17, 16, 15},
- 22,
+ 23,
},
}
for _, test := range tests {
diff --git a/services/issue/issue_test.go b/services/issue/issue_test.go
index 8806cec0e7..d7c850e6eb 100644
--- a/services/issue/issue_test.go
+++ b/services/issue/issue_test.go
@@ -37,7 +37,7 @@ func TestIssue_DeleteIssue(t *testing.T) {
issueIDs, err := issues_model.GetIssueIDsByRepoID(db.DefaultContext, 1)
assert.NoError(t, err)
- assert.Len(t, issueIDs, 5)
+ assert.Len(t, issueIDs, 6)
issue := &issues_model.Issue{
RepoID: 1,
@@ -48,7 +48,7 @@ func TestIssue_DeleteIssue(t *testing.T) {
assert.NoError(t, err)
issueIDs, err = issues_model.GetIssueIDsByRepoID(db.DefaultContext, 1)
assert.NoError(t, err)
- assert.Len(t, issueIDs, 4)
+ assert.Len(t, issueIDs, 5)
// check attachment removal
attachments, err := repo_model.GetAttachmentsByIssueID(db.DefaultContext, 4)
diff --git a/services/issue/suggestion_test.go b/services/issue/suggestion_test.go
index 84cfd520ac..84771694c4 100644
--- a/services/issue/suggestion_test.go
+++ b/services/issue/suggestion_test.go
@@ -26,7 +26,7 @@ func Test_Suggestion(t *testing.T) {
}{
{
keyword: "",
- expectedIndexes: []int64{5, 1, 4, 2, 3},
+ expectedIndexes: []int64{5, 6, 1, 4, 2},
},
{
keyword: "1",
@@ -34,7 +34,7 @@ func Test_Suggestion(t *testing.T) {
},
{
keyword: "issue",
- expectedIndexes: []int64{4, 1, 2, 3},
+ expectedIndexes: []int64{6, 4, 1, 2, 3},
},
{
keyword: "pull",
diff --git a/services/mailer/mail_test.go b/services/mailer/mail_test.go
index 8298ac4a34..2a2e57dbce 100644
--- a/services/mailer/mail_test.go
+++ b/services/mailer/mail_test.go
@@ -10,6 +10,7 @@ import (
"html/template"
"io"
"mime/quotedprintable"
+ "path/filepath"
"regexp"
"strings"
"testing"
@@ -23,6 +24,7 @@ import (
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/setting"
+ "code.gitea.io/gitea/modules/storage"
sender_service "code.gitea.io/gitea/services/mailer/sender"
"github.com/stretchr/testify/assert"
@@ -59,6 +61,7 @@ func prepareMailerTest(t *testing.T) (doer *user_model.User, repo *repo_model.Re
setting.MailService = &mailService
setting.Domain = "localhost"
+ setting.AppURL = "https://try.gitea.io/"
doer = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
repo = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1, Owner: doer})
@@ -450,3 +453,132 @@ func TestFromDisplayName(t *testing.T) {
assert.EqualValues(t, "Mister X (by Code IT on [code.it])", fromDisplayName(&user_model.User{FullName: "Mister X", Name: "tmp"}))
})
}
+
+func PrepareAttachmentsStorage(t testing.TB) { // same as in test_utils.go
+ // prepare attachments directory and files
+ assert.NoError(t, storage.Clean(storage.Attachments))
+
+ s, err := storage.NewStorage(setting.LocalStorageType, &setting.Storage{
+ Path: filepath.Join(filepath.Dir(setting.AppPath), "tests", "testdata", "data", "attachments"),
+ })
+ assert.NoError(t, err)
+ assert.NoError(t, s.IterateObjects("", func(p string, obj storage.Object) error {
+ _, err = storage.Copy(storage.Attachments, p, s, p)
+ return err
+ }))
+}
+
+func TestEmbedBase64ImagesInEmail(t *testing.T) {
+ // Fake context setup
+ doer, repo, _, _ := prepareMailerTest(t)
+ PrepareAttachmentsStorage(t)
+ setting.MailService.Base64EmbedImages = true
+ setting.MailService.Base64EmbedImagesMaxSizePerEmail = 10 * 1024 * 1024
+ issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 23, Repo: repo, Poster: doer})
+ assert.NoError(t, issue.LoadRepo(db.DefaultContext))
+
+ subjectTemplates = texttmpl.Must(texttmpl.New("issue/new").Parse(subjectTpl))
+ bodyTemplates = template.Must(template.New("issue/new").Parse(bodyTpl))
+
+ recipients := []*user_model.User{{Name: "Test", Email: "test@gitea.com"}}
+ msgs, err := composeIssueCommentMessages(&mailCommentContext{
+ Context: context.TODO(), // TODO: use a correct context
+ Issue: issue, Doer: doer, ActionType: activities_model.ActionCreateIssue,
+ Content: strings.ReplaceAll(issue.Content, `src="`, `src="`+setting.AppURL),
+ }, "en-US", recipients, false, "issue create")
+
+ mailBody := msgs[0].Body
+ re := regexp.MustCompile(`(?s)(.*?)`)
+ matches := re.FindStringSubmatch(mailBody)
+ if len(matches) > 1 {
+ mailBody = matches[1]
+ }
+ // check if the mail body was correctly generated
+ assert.NoError(t, err)
+ assert.Contains(t, mailBody, "content including this image")
+
+ // check if an image was embedded
+ assert.Contains(t, mailBody, "data:image/png;base64,")
+
+ // check if the image was embedded only once
+ assert.Equal(t, 1, strings.Count(mailBody, "data:image/png;base64,"))
+
+ img2InternalBase64 := "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAAxAQMAAAB3d7wRAAAABlBMVEVgmyF6qkqITHmkAAAAAXRSTlMBN+Ho8AAAAJhJREFUKM+V0DsOwyAQBNCxXLjkCFwk0t7McDQfhS4tpQuEzWc/iaUU2eo1zC4DUMWYF3DxVKzGTXjBGb2RsjJEo6ZhN1Zj+cEgi/9hBQl3YflkkIsbo5IO5glKTuhPpavM3Hp4C7WdjEWYrL5GMkp/R+s4GPlh/CZn4MEwv9aHHiyD3ujm5X22eaMyDa5yAm+O0B1TPa1l3W2qZWMg+KgtAAAAAElFTkSuQmCC"
+
+ // check if the image was embedded correctly
+ assert.Contains(t, mailBody, img2InternalBase64)
+}
+
+func TestEmbedBase64Images(t *testing.T) {
+ user, repo, _, _ := prepareMailerTest(t)
+ PrepareAttachmentsStorage(t)
+ setting.MailService.Base64EmbedImages = true
+ setting.MailService.Base64EmbedImagesMaxSizePerEmail = 10 * 1024 * 1024
+
+ issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 23, Repo: repo, Poster: user})
+
+ attachment := unittest.AssertExistsAndLoadBean(t, &repo_model.Attachment{ID: 13, IssueID: issue.ID, RepoID: repo.ID})
+ ctx0 := context.Background()
+
+ ctx := &mailCommentContext{Context: ctx0 /* TODO: use a correct context */, Issue: issue, Doer: user}
+
+ img1ExternalURL := "https://via.placeholder.com/10"
+ img1ExternalImg := "![](\"")
"
+
+ img2InternalURL := setting.AppURL + repo.Owner.Name + "/" + repo.Name + "/attachments/" + attachment.UUID
+ img2InternalImg := ""
+ img2InternalBase64 := "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAAxAQMAAAB3d7wRAAAABlBMVEVgmyF6qkqITHmkAAAAAXRSTlMBN+Ho8AAAAJhJREFUKM+V0DsOwyAQBNCxXLjkCFwk0t7McDQfhS4tpQuEzWc/iaUU2eo1zC4DUMWYF3DxVKzGTXjBGb2RsjJEo6ZhN1Zj+cEgi/9hBQl3YflkkIsbo5IO5glKTuhPpavM3Hp4C7WdjEWYrL5GMkp/R+s4GPlh/CZn4MEwv9aHHiyD3ujm5X22eaMyDa5yAm+O0B1TPa1l3W2qZWMg+KgtAAAAAElFTkSuQmCC"
+ img2InternalBase64Img := ""
+
+ // 1st Test: convert internal image to base64
+ t.Run("replaceSpecifiedBase64ImagesInternal", func(t *testing.T) {
+ totalEmbeddedImagesSize := int64(0)
+
+ resultImg1Internal, err := AttachmentSrcToBase64DataURI(img2InternalURL, ctx, &totalEmbeddedImagesSize)
+ assert.NoError(t, err)
+ assert.Equal(t, img2InternalBase64, resultImg1Internal) // replace cause internal image
+ })
+
+ // 2nd Test: convert external image to base64 -> abort cause external image
+ t.Run("replaceSpecifiedBase64ImagesExternal", func(t *testing.T) {
+ totalEmbeddedImagesSize := int64(0)
+
+ resultImg1External, err := AttachmentSrcToBase64DataURI(img1ExternalURL, ctx, &totalEmbeddedImagesSize)
+ assert.Error(t, err)
+ assert.Equal(t, "", resultImg1External) // don't replace cause external image
+ })
+
+ // 3rd Test: generate email body with 1 internal and 1 external image, expect the result to have the internal image replaced with base64 data and the external not replaced
+ t.Run("generateEmailBody", func(t *testing.T) {
+ mailBody := "Test1
" + img1ExternalImg + "Test2
" + img2InternalImg + "Test3
"
+ expectedMailBody := "Test1
" + img1ExternalImg + "Test2
" + img2InternalBase64Img + "Test3
"
+ resultMailBody, err := Base64InlineImages(mailBody, ctx)
+
+ assert.NoError(t, err)
+ assert.Equal(t, expectedMailBody, resultMailBody)
+ })
+
+ // 4th Test, generate email body with 2 internal images, but set Mailer.Base64EmbedImagesMaxSizePerEmail to the size of the first image (+1), expect the first image to be replaced and the second not
+ t.Run("generateEmailBodyWithMaxSize", func(t *testing.T) {
+ setting.MailService.Base64EmbedImagesMaxSizePerEmail = int64(len(img2InternalBase64) + 1)
+
+ mailBody := "Test1
" + img2InternalImg + "Test2
" + img2InternalImg + "Test3
"
+ expectedMailBody := "Test1
" + img2InternalBase64Img + "Test2
" + img2InternalImg + "Test3
"
+ resultMailBody, err := Base64InlineImages(mailBody, ctx)
+
+ assert.NoError(t, err)
+ assert.Equal(t, expectedMailBody, resultMailBody)
+ })
+
+ // 5th Test, generate email body with 3 internal images, but set Mailer.Base64EmbedImagesMaxSizePerEmail to the size of all 3 images (+1), expect all images to be replaced
+ t.Run("generateEmailBodyWith3Images", func(t *testing.T) {
+ setting.MailService.Base64EmbedImagesMaxSizePerEmail = int64(len(img2InternalBase64)*3 + 1)
+
+ mailBody := "Test1
" + img2InternalImg + "Test2
" + img2InternalImg + "Test3
" + img2InternalImg + ""
+ expectedMailBody := "Test1
" + img2InternalBase64Img + "Test2
" + img2InternalBase64Img + "Test3
" + img2InternalBase64Img + ""
+ resultMailBody, err := Base64InlineImages(mailBody, ctx)
+
+ assert.NoError(t, err)
+ assert.Equal(t, expectedMailBody, resultMailBody)
+ })
+}
diff --git a/tests/integration/api_issue_test.go b/tests/integration/api_issue_test.go
index d8394a33d9..8b81b7196f 100644
--- a/tests/integration/api_issue_test.go
+++ b/tests/integration/api_issue_test.go
@@ -287,7 +287,7 @@ func TestAPISearchIssues(t *testing.T) {
req = NewRequest(t, "GET", link.String()).AddTokenAuth(publicOnlyToken)
resp = MakeRequest(t, req, http.StatusOK)
DecodeJSON(t, resp, &apiIssues)
- assert.Len(t, apiIssues, 15) // 15 public issues
+ assert.Len(t, apiIssues, 16) // 16 public issues
since := "2000-01-01T00:50:01+00:00" // 946687801
before := time.Unix(999307200, 0).Format(time.RFC3339)
@@ -297,7 +297,7 @@ func TestAPISearchIssues(t *testing.T) {
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
resp = MakeRequest(t, req, http.StatusOK)
DecodeJSON(t, resp, &apiIssues)
- assert.Len(t, apiIssues, 11)
+ assert.Len(t, apiIssues, 12)
query.Del("since")
query.Del("before")
@@ -313,7 +313,7 @@ func TestAPISearchIssues(t *testing.T) {
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
resp = MakeRequest(t, req, http.StatusOK)
DecodeJSON(t, resp, &apiIssues)
- assert.EqualValues(t, "22", resp.Header().Get("X-Total-Count"))
+ assert.EqualValues(t, "23", resp.Header().Get("X-Total-Count"))
assert.Len(t, apiIssues, 20)
query.Add("limit", "10")
@@ -321,7 +321,7 @@ func TestAPISearchIssues(t *testing.T) {
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
resp = MakeRequest(t, req, http.StatusOK)
DecodeJSON(t, resp, &apiIssues)
- assert.EqualValues(t, "22", resp.Header().Get("X-Total-Count"))
+ assert.EqualValues(t, "23", resp.Header().Get("X-Total-Count"))
assert.Len(t, apiIssues, 10)
query = url.Values{"assigned": {"true"}, "state": {"all"}}
@@ -350,7 +350,7 @@ func TestAPISearchIssues(t *testing.T) {
req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
resp = MakeRequest(t, req, http.StatusOK)
DecodeJSON(t, resp, &apiIssues)
- assert.Len(t, apiIssues, 8)
+ assert.Len(t, apiIssues, 9)
query = url.Values{"owner": {"org3"}} // organization
link.RawQuery = query.Encode()
diff --git a/tests/integration/api_nodeinfo_test.go b/tests/integration/api_nodeinfo_test.go
index 75f8dbb4ba..c6b4663b4a 100644
--- a/tests/integration/api_nodeinfo_test.go
+++ b/tests/integration/api_nodeinfo_test.go
@@ -33,7 +33,7 @@ func TestNodeinfo(t *testing.T) {
assert.True(t, nodeinfo.OpenRegistrations)
assert.Equal(t, "gitea", nodeinfo.Software.Name)
assert.Equal(t, 29, nodeinfo.Usage.Users.Total)
- assert.Equal(t, 22, nodeinfo.Usage.LocalPosts)
+ assert.Equal(t, 23, nodeinfo.Usage.LocalPosts)
assert.Equal(t, 3, nodeinfo.Usage.LocalComments)
})
}
diff --git a/tests/integration/api_repo_test.go b/tests/integration/api_repo_test.go
index 22f26d87d4..5180e3d17e 100644
--- a/tests/integration/api_repo_test.go
+++ b/tests/integration/api_repo_test.go
@@ -268,7 +268,7 @@ func TestAPIViewRepo(t *testing.T) {
assert.EqualValues(t, 1, repo.ID)
assert.EqualValues(t, "repo1", repo.Name)
assert.EqualValues(t, 2, repo.Releases)
- assert.EqualValues(t, 1, repo.OpenIssues)
+ assert.EqualValues(t, 2, repo.OpenIssues)
assert.EqualValues(t, 3, repo.OpenPulls)
req = NewRequest(t, "GET", "/api/v1/repos/user12/repo10")
diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go
index bd0cedd300..d66e78c9ae 100644
--- a/tests/integration/issue_test.go
+++ b/tests/integration/issue_test.go
@@ -495,7 +495,7 @@ func TestSearchIssues(t *testing.T) {
req = NewRequest(t, "GET", link.String())
resp = session.MakeRequest(t, req, http.StatusOK)
DecodeJSON(t, resp, &apiIssues)
- assert.Len(t, apiIssues, 11)
+ assert.Len(t, apiIssues, 12)
query.Del("since")
query.Del("before")
@@ -511,7 +511,7 @@ func TestSearchIssues(t *testing.T) {
req = NewRequest(t, "GET", link.String())
resp = session.MakeRequest(t, req, http.StatusOK)
DecodeJSON(t, resp, &apiIssues)
- assert.EqualValues(t, "22", resp.Header().Get("X-Total-Count"))
+ assert.EqualValues(t, "23", resp.Header().Get("X-Total-Count"))
assert.Len(t, apiIssues, 20)
query.Add("limit", "5")
@@ -519,7 +519,7 @@ func TestSearchIssues(t *testing.T) {
req = NewRequest(t, "GET", link.String())
resp = session.MakeRequest(t, req, http.StatusOK)
DecodeJSON(t, resp, &apiIssues)
- assert.EqualValues(t, "22", resp.Header().Get("X-Total-Count"))
+ assert.EqualValues(t, "23", resp.Header().Get("X-Total-Count"))
assert.Len(t, apiIssues, 5)
query = url.Values{"assigned": {"true"}, "state": {"all"}}
@@ -548,7 +548,7 @@ func TestSearchIssues(t *testing.T) {
req = NewRequest(t, "GET", link.String())
resp = session.MakeRequest(t, req, http.StatusOK)
DecodeJSON(t, resp, &apiIssues)
- assert.Len(t, apiIssues, 8)
+ assert.Len(t, apiIssues, 9)
query = url.Values{"owner": {"org3"}} // organization
link.RawQuery = query.Encode()
diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go
index 169df8618e..6128b8d8a7 100644
--- a/tests/integration/pull_merge_test.go
+++ b/tests/integration/pull_merge_test.go
@@ -924,7 +924,7 @@ func TestPullAutoMergeAfterCommitStatusSucceedAndApprovalForAgitFlow(t *testing.
Run(&git.RunOpts{Dir: dstPath, Stderr: stderrBuf})
assert.NoError(t, err)
- assert.Contains(t, stderrBuf.String(), setting.AppURL+"user2/repo1/pulls/6")
+ assert.Contains(t, stderrBuf.String(), setting.AppURL+"user2/repo1/pulls/7")
baseRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user2", Name: "repo1"})
pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{
@@ -1044,7 +1044,7 @@ func TestPullNonMergeForAdminWithBranchProtection(t *testing.T) {
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
- mergeReq := NewRequestWithValues(t, "POST", "/api/v1/repos/user2/repo1/pulls/6/merge", map[string]string{
+ mergeReq := NewRequestWithValues(t, "POST", "/api/v1/repos/user2/repo1/pulls/7/merge", map[string]string{
"_csrf": csrf,
"head_commit_id": "",
"merge_when_checks_succeed": "false",
diff --git a/tests/testdata/data/attachments/1/b/1b267670-1793-4cd0-abc1-449269b7cff9 b/tests/testdata/data/attachments/1/b/1b267670-1793-4cd0-abc1-449269b7cff9
new file mode 100644
index 0000000000..8fc22b562f
Binary files /dev/null and b/tests/testdata/data/attachments/1/b/1b267670-1793-4cd0-abc1-449269b7cff9 differ