Skip to content

Commit 17bf354

Browse files
committed
Fix test
1 parent 48451f6 commit 17bf354

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

models/user/user_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ func TestCreateUserInvalidEmail(t *testing.T) {
276276
Email: "[email protected]\r\n",
277277
Passwd: ";p['////..-++']",
278278
IsAdmin: false,
279-
Theme: setting.UI.DefaultTheme,
279+
Theme: setting.Config().Theme.DefaultTheme.Value(t.Context()),
280280
MustChangePassword: false,
281281
}
282282

services/user/user_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func TestCreateUser(t *testing.T) {
8888
8989
Passwd: ";p['////..-++']",
9090
IsAdmin: false,
91-
Theme: setting.UI.DefaultTheme,
91+
Theme: setting.Config().Theme.DefaultTheme.Value(t.Context()),
9292
MustChangePassword: false,
9393
}
9494

tests/integration/repo_test.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ import (
1414
"time"
1515

1616
repo_model "code.gitea.io/gitea/models/repo"
17+
system_model "code.gitea.io/gitea/models/system"
1718
"code.gitea.io/gitea/models/unit"
1819
"code.gitea.io/gitea/models/unittest"
1920
user_model "code.gitea.io/gitea/models/user"
2021
"code.gitea.io/gitea/modules/setting"
22+
"code.gitea.io/gitea/modules/setting/config"
2123
"code.gitea.io/gitea/modules/test"
2224
"code.gitea.io/gitea/modules/util"
2325
repo_service "code.gitea.io/gitea/services/repository"
@@ -223,7 +225,13 @@ func testViewRepo1CloneLinkAuthorized(t *testing.T) {
223225

224226
func testViewRepoWithSymlinks(t *testing.T) {
225227
defer tests.PrintCurrentTest(t)()
226-
defer test.MockVariableValue(&setting.UI.FileIconTheme, "basic")()
228+
defer func() {
229+
err := system_model.SetSettings(t.Context(), map[string]string{
230+
setting.Config().Theme.DefaultFileIconTheme.DynKey(): "basic",
231+
})
232+
assert.NoError(t, err)
233+
config.GetDynGetter().InvalidateCache()
234+
}()
227235
session := loginUser(t, "user2")
228236

229237
req := NewRequest(t, "GET", "/user2/repo20.git")

0 commit comments

Comments
 (0)