test

Author: hiifong

models/migrations/v1_24/v315.go

@@ -30,7 +30,7 @@ func (s *Setting) TableName() string {
 }
 
 func MigrateIniToDatabase(x *xorm.Engine) error {
-	uiMap, err := util.ConfigSectionToMap(setting.UI, "ui")
+	uiMap, err := util.ConfigSectionToMap(setting.UI, "ui", []string{"Reactions", "CustomEmojis"}...)
 	if err != nil {
 		return err
 	}
@@ -42,7 +42,9 @@ func MigrateIniToDatabase(x *xorm.Engine) error {
 		return err
 	}
 
-	sess.Sync(new(Setting))
+	if err = sess.Sync(new(Setting)); err != nil {
+		return err
+	}
 
 	_ = getRevision(sess) // prepare the "revision" key ahead
 

models/migrations/v1_24/v315_test.go

@@ -4,24 +4,24 @@
 package v1_24 //nolint
 
 import (
+	"context"
 	"testing"
 
-	"code.gitea.io/gitea/models/migrations/base"
+	"code.gitea.io/gitea/models/db"
+	"code.gitea.io/gitea/models/unittest"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func Test_MigrateIniToDatabase(t *testing.T) {
-	// Prepare and load the testing database
-	x, deferable := base.PrepareTestEnv(t, 0, new(Setting))
-	defer deferable()
-	if x == nil || t.Failed() {
-		return
+	if err := db.InitEngine(context.Background()); err != nil {
+		t.Fatal(err)
 	}
+	x := unittest.GetXORMEngine()
 
 	assert.NoError(t, MigrateIniToDatabase(x))
 
 	cnt, err := x.Table("system_setting").Where("setting_key LIKE 'ui.%'").Count()
 	assert.NoError(t, err)
-	assert.EqualValues(t, 23, cnt)
+	assert.EqualValues(t, 21, cnt)
 }

modules/util/util.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"math/big"
 	"reflect"
+	"slices"
 	"strconv"
 	"strings"
 
@@ -260,7 +261,7 @@ func ReserveLineBreakForTextarea(input string) string {
 	return strings.ReplaceAll(input, "\r\n", "\n")
 }
 
-func ConfigSectionToMap(in any, keyPrefix string) (map[string]string, error) {
+func ConfigSectionToMap(in any, keyPrefix string, skipFields ...string) (map[string]string, error) {
 	if keyPrefix == "" {
 		return nil, fmt.Errorf("keyPrefix is empty")
 	}
@@ -278,6 +279,9 @@ func ConfigSectionToMap(in any, keyPrefix string) (map[string]string, error) {
 	for i := 0; i < v.NumField(); i++ {
 		fi := t.Field(i)
 		fieldName := fi.Name
+		if slices.Contains(skipFields, fieldName) {
+			continue
+		}
 		if tagValue := fi.Tag.Get("ini"); tagValue == "-" {
 			continue
 		} else if tagValue != "" {