Skip to content

Commit 9cef129

Browse files
0koGusted
authored andcommitted
feat(ui themes): better place for theme list ctx, testing (go-gitea#7163)
`AllThemes` is only used by `user/settings/appearance.tmpl`, not by all settings pages. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7163 Reviewed-by: Gusted <[email protected]> Co-authored-by: 0ko <[email protected]> Co-committed-by: 0ko <[email protected]>
1 parent 30982b9 commit 9cef129

File tree

3 files changed

+50
-1
lines changed

3 files changed

+50
-1
lines changed

routers/web/user/setting/profile.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ func Repos(ctx *context.Context) {
329329
func Appearance(ctx *context.Context) {
330330
ctx.Data["Title"] = ctx.Tr("settings.appearance")
331331
ctx.Data["PageIsSettingsAppearance"] = true
332+
ctx.Data["AllThemes"] = setting.UI.Themes
332333

333334
var hiddenCommentTypes *big.Int
334335
val, err := user_model.GetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsKeyHiddenCommentTypes)

routers/web/web.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ func registerRoutes(m *web.Route) {
640640
m.Post("/unblock", user_setting.UnblockUser)
641641
})
642642
m.Get("/storage_overview", user_setting.StorageOverview)
643-
}, reqSignIn, ctxDataSet("PageIsUserSettings", true, "AllThemes", setting.UI.Themes, "EnablePackages", setting.Packages.Enabled, "EnableQuota", setting.Quota.Enabled))
643+
}, reqSignIn, ctxDataSet("PageIsUserSettings", true, "EnablePackages", setting.Packages.Enabled, "EnableQuota", setting.Quota.Enabled))
644644

645645
m.Group("/user", func() {
646646
m.Get("/activate", auth.Activate)
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// Copyright 2025 The Forgejo Authors. All rights reserved.
2+
// SPDX-License-Identifier: GPL-3.0-or-later
3+
4+
package integration
5+
6+
import (
7+
"net/http"
8+
"testing"
9+
10+
"code.gitea.io/gitea/tests"
11+
12+
"github.com/stretchr/testify/assert"
13+
)
14+
15+
func TestThemeChange(t *testing.T) {
16+
defer tests.PrepareTestEnv(t)()
17+
user := loginUser(t, "user2")
18+
19+
testSelectedTheme(t, user, "forgejo-auto")
20+
21+
testChangeTheme(t, user, "forgejo-dark")
22+
testSelectedTheme(t, user, "forgejo-dark")
23+
}
24+
25+
// testSelectedTheme checks that the expected theme is used in html[data-theme]
26+
// and is default on appearance page
27+
func testSelectedTheme(t *testing.T, session *TestSession, expectedTheme string) {
28+
t.Helper()
29+
response := session.MakeRequest(t, NewRequest(t, "GET", "/user/settings/appearance"), http.StatusOK)
30+
page := NewHTMLParser(t, response.Body)
31+
32+
dataTheme, dataThemeExists := page.Find("html").Attr("data-theme")
33+
assert.True(t, dataThemeExists)
34+
assert.EqualValues(t, expectedTheme, dataTheme)
35+
36+
selectorTheme, selectorThemeExists := page.Find("form[action='/user/settings/appearance/theme'] input[name='theme']").Attr("value")
37+
assert.True(t, selectorThemeExists)
38+
assert.EqualValues(t, expectedTheme, selectorTheme)
39+
}
40+
41+
// testSelectedTheme changes user's theme
42+
func testChangeTheme(t *testing.T, session *TestSession, newTheme string) {
43+
t.Helper()
44+
session.MakeRequest(t, NewRequestWithValues(t, "POST", "/user/settings/appearance/theme", map[string]string{
45+
"_csrf": GetCSRF(t, session, "/user/settings/appearance"),
46+
"theme": newTheme,
47+
}), http.StatusSeeOther)
48+
}

0 commit comments

Comments
 (0)