mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-15 14:08:21 +00:00
894d9b2836
Since `modules/context` has to depend on `models` and many other packages, it should be moved from `modules/context` to `services/context` according to design principles. There is no logic code change on this PR, only move packages. - Move `code.gitea.io/gitea/modules/context` to `code.gitea.io/gitea/services/context` - Move `code.gitea.io/gitea/modules/contexttest` to `code.gitea.io/gitea/services/contexttest` because of depending on context - Move `code.gitea.io/gitea/modules/upload` to `code.gitea.io/gitea/services/context/upload` because of depending on context (cherry picked from commit 29f149bd9f517225a3c9f1ca3fb0a7b5325af696) Conflicts: routers/api/packages/alpine/alpine.go routers/api/v1/repo/issue_reaction.go routers/install/install.go routers/web/admin/config.go routers/web/passkey.go routers/web/repo/search.go routers/web/repo/setting/default_branch.go routers/web/user/home.go routers/web/user/profile.go tests/integration/editor_test.go tests/integration/integration_test.go tests/integration/mirror_push_test.go trivial context conflicts also modified all other occurrences in Forgejo specific files
79 lines
2.9 KiB
Go
79 lines
2.9 KiB
Go
// Copyright 2024 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package repo
|
|
|
|
import (
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"code.gitea.io/gitea/models/db"
|
|
issues_model "code.gitea.io/gitea/models/issues"
|
|
"code.gitea.io/gitea/models/unittest"
|
|
"code.gitea.io/gitea/modules/templates"
|
|
"code.gitea.io/gitea/services/context"
|
|
"code.gitea.io/gitea/services/contexttest"
|
|
"code.gitea.io/gitea/services/pull"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestRenderConversation(t *testing.T) {
|
|
unittest.PrepareTestEnv(t)
|
|
|
|
pr, _ := issues_model.GetPullRequestByID(db.DefaultContext, 2)
|
|
_ = pr.LoadIssue(db.DefaultContext)
|
|
_ = pr.Issue.LoadPoster(db.DefaultContext)
|
|
_ = pr.Issue.LoadRepo(db.DefaultContext)
|
|
|
|
run := func(name string, cb func(t *testing.T, ctx *context.Context, resp *httptest.ResponseRecorder)) {
|
|
t.Run(name, func(t *testing.T) {
|
|
ctx, resp := contexttest.MockContext(t, "/")
|
|
ctx.Render = templates.HTMLRenderer()
|
|
contexttest.LoadUser(t, ctx, pr.Issue.PosterID)
|
|
contexttest.LoadRepo(t, ctx, pr.BaseRepoID)
|
|
contexttest.LoadGitRepo(t, ctx)
|
|
defer ctx.Repo.GitRepo.Close()
|
|
cb(t, ctx, resp)
|
|
})
|
|
}
|
|
|
|
var preparedComment *issues_model.Comment
|
|
run("prepare", func(t *testing.T, ctx *context.Context, resp *httptest.ResponseRecorder) {
|
|
comment, err := pull.CreateCodeComment(ctx, pr.Issue.Poster, ctx.Repo.GitRepo, pr.Issue, 1, "content", "", false, 0, pr.HeadCommitID, nil)
|
|
if !assert.NoError(t, err) {
|
|
return
|
|
}
|
|
comment.Invalidated = true
|
|
err = issues_model.UpdateCommentInvalidate(ctx, comment)
|
|
if !assert.NoError(t, err) {
|
|
return
|
|
}
|
|
preparedComment = comment
|
|
})
|
|
if !assert.NotNil(t, preparedComment) {
|
|
return
|
|
}
|
|
run("diff with outdated", func(t *testing.T, ctx *context.Context, resp *httptest.ResponseRecorder) {
|
|
ctx.Data["ShowOutdatedComments"] = true
|
|
renderConversation(ctx, preparedComment, "diff")
|
|
assert.Contains(t, resp.Body.String(), `<div class="content comment-container"`)
|
|
})
|
|
run("diff without outdated", func(t *testing.T, ctx *context.Context, resp *httptest.ResponseRecorder) {
|
|
ctx.Data["ShowOutdatedComments"] = false
|
|
renderConversation(ctx, preparedComment, "diff")
|
|
// unlike gitea, Forgejo renders the conversation (with the "outdated" label)
|
|
assert.Contains(t, resp.Body.String(), `repo.issues.review.outdated_description`)
|
|
})
|
|
run("timeline with outdated", func(t *testing.T, ctx *context.Context, resp *httptest.ResponseRecorder) {
|
|
ctx.Data["ShowOutdatedComments"] = true
|
|
renderConversation(ctx, preparedComment, "timeline")
|
|
assert.Contains(t, resp.Body.String(), `<div id="code-comments-`)
|
|
})
|
|
run("timeline is not affected by ShowOutdatedComments=false", func(t *testing.T, ctx *context.Context, resp *httptest.ResponseRecorder) {
|
|
ctx.Data["ShowOutdatedComments"] = false
|
|
renderConversation(ctx, preparedComment, "timeline")
|
|
assert.Contains(t, resp.Body.String(), `<div id="code-comments-`)
|
|
})
|
|
}
|