From e3e3f1dfdc0428488e158283d73c37a8662b4559 Mon Sep 17 00:00:00 2001
From: yusing <yusing@6uo.me>
Date: Wed, 29 Jan 2025 09:40:37 +0800
Subject: [PATCH] fixed some tests

---
 internal/homepage/homepage_test.go   | 47 +++++++++++++++-------------
 internal/homepage/icon_url_test.go   |  1 +
 internal/homepage/override_config.go |  7 -----
 internal/logging/html.go             |  1 +
 internal/route/rules/do_test.go      |  5 ---
 5 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/internal/homepage/homepage_test.go b/internal/homepage/homepage_test.go
index e799895f..7bfc3a8e 100644
--- a/internal/homepage/homepage_test.go
+++ b/internal/homepage/homepage_test.go
@@ -7,25 +7,30 @@ import (
 )
 
 func TestOverrideItem(t *testing.T) {
-	// a := &Item{
-	// 	Show:  false,
-	// 	Alias: "foo",
-	// 	Name:  "Foo",
-	// 	Icon: &IconURL{
-	// 		Value:      "/favicon.ico",
-	// 		IconSource: IconSourceRelative,
-	// 	},
-	// 	Category: "App",
-	// }
-	// overrides := GetJSONConfig()
-	// overrides.SetShowItemOverride(a.Alias, true)
-	// overrides.SetDisplayNameOverride(a.Alias, "Bar")
-	// overrides.SetDisplayCategoryOverride(a.Alias, "Test")
-	// ExpectNoError(t, overrides.SetIconOverride(a.Alias, "@walkxcode/example.png"))
-
-	// overridden := a.GetOverriddenItem()
-	// ExpectTrue(t, overridden.Show)
-	// ExpectEqual(t, overridden.Name, "Bar")
-	// ExpectEqual(t, overridden.Category, "Test")
-	// ExpectEqual(t, overridden.Icon.String(), "png/example.png")
+	InitOverridesConfig()
+	a := &Item{
+		Alias: "foo",
+		ItemConfig: &ItemConfig{
+			Show: false,
+			Name: "Foo",
+			Icon: &IconURL{
+				Value:      "/favicon.ico",
+				IconSource: IconSourceRelative,
+			},
+			Category: "App",
+		},
+	}
+	override := &ItemConfig{
+		Show:     true,
+		Name:     "Bar",
+		Category: "Test",
+		Icon: &IconURL{
+			Value:      "@walkxcode/example.png",
+			IconSource: IconSourceWalkXCode,
+		},
+	}
+	overrides := GetOverrideConfig()
+	overrides.OverrideItem(a.Alias, override)
+	overridden := a.GetOverride()
+	ExpectDeepEqual(t, overridden.ItemConfig, override)
 }
diff --git a/internal/homepage/icon_url_test.go b/internal/homepage/icon_url_test.go
index 72153978..cac4e97d 100644
--- a/internal/homepage/icon_url_test.go
+++ b/internal/homepage/icon_url_test.go
@@ -116,6 +116,7 @@ func TestIconURL(t *testing.T) {
 			if tc.wantErr {
 				ExpectError(t, ErrInvalidIconURL, err)
 			} else {
+				tc.wantValue.FullValue = tc.input
 				ExpectNoError(t, err)
 				ExpectDeepEqual(t, u, tc.wantValue)
 			}
diff --git a/internal/homepage/override_config.go b/internal/homepage/override_config.go
index 01929e69..2855b892 100644
--- a/internal/homepage/override_config.go
+++ b/internal/homepage/override_config.go
@@ -19,13 +19,6 @@ type OverrideConfig struct {
 
 var overrideConfigInstance *OverrideConfig
 
-func must(b []byte, err error) []byte {
-	if err != nil {
-		panic(err)
-	}
-	return b
-}
-
 func InitOverridesConfig() {
 	overrideConfigInstance = &OverrideConfig{
 		ItemOverrides:  make(map[string]*ItemConfig),
diff --git a/internal/logging/html.go b/internal/logging/html.go
index e8b70b47..5d25b51c 100644
--- a/internal/logging/html.go
+++ b/internal/logging/html.go
@@ -133,6 +133,7 @@ func escapeAndAppend(s string, buf *[]byte) {
 			*buf = append(*buf, "&#9;"...)
 		case '\n':
 			*buf = append(*buf, "<br>"...)
+			*buf = append(*buf, prefixHTML...)
 		default:
 			*buf = append(*buf, s[i])
 		}
diff --git a/internal/route/rules/do_test.go b/internal/route/rules/do_test.go
index 5c7b9441..5b1d69bc 100644
--- a/internal/route/rules/do_test.go
+++ b/internal/route/rules/do_test.go
@@ -39,11 +39,6 @@ func TestParseCommands(t *testing.T) {
 			input:   "rewrite / / /",
 			wantErr: ErrInvalidArguments,
 		},
-		{
-			name:    "rewrite_no_leading_slash",
-			input:   "rewrite abc /",
-			wantErr: ErrInvalidArguments,
-		},
 		// serve tests
 		{
 			name:    "serve_valid",