test: fix failed tests after code changes

internal/gperr/base.go

@@ -37,11 +37,11 @@ func (err *baseError) Subjectf(format string, args ...any) Error {
 }
 
 func (err baseError) With(extra error) Error {
-	return &nestedError{err.Err, []error{extra}}
+	return &nestedError{&err, []error{extra}}
 }
 
 func (err baseError) Withf(format string, args ...any) Error {
-	return &nestedError{err.Err, []error{fmt.Errorf(format, args...)}}
+	return &nestedError{&err, []error{fmt.Errorf(format, args...)}}
 }
 
 func (err *baseError) Error() string {

internal/gperr/utils_test.go

@@ -45,11 +45,11 @@ func TestFormatting(t *testing.T) {
 func TestMultiError(t *testing.T) {
 	err := testMultiErr{[]error{testErr{}, testErr{}}}
 	plain := Plain(err)
-	if string(plain) != "test error\ntest error" {
+	if string(plain) != "test error\ntest error\n" {
 		t.Errorf("expected test error, got %s", string(plain))
 	}
 	md := Markdown(err)
-	if string(md) != "**test error**\n**test error**" {
+	if string(md) != "**test error**\n**test error**\n" {
 		t.Errorf("expected test error, got %s", string(md))
 	}
 }

internal/homepage/list_icons_test.go

@@ -102,21 +102,19 @@ func TestListWalkxCodeIcons(t *testing.T) {
 	}
 	test := []testCases{
 		{
-			Key: NewIconKey(IconSourceWalkXCode, "2fauth"),
+			Key: NewIconKey(IconSourceWalkXCode, "app1"),
 			IconMeta: IconMeta{
-				SVG:         true,
-				PNG:         true,
-				WebP:        true,
-				Light:       true,
-				DisplayName: "2FAuth",
+				SVG:   true,
+				PNG:   true,
+				WebP:  true,
+				Light: true,
 			},
 		},
 		{
-			Key: NewIconKey(IconSourceWalkXCode, "dittofeed"),
+			Key: NewIconKey(IconSourceWalkXCode, "app2"),
 			IconMeta: IconMeta{
-				PNG:         true,
-				WebP:        true,
-				DisplayName: "Dittofeed",
+				PNG:  true,
+				WebP: true,
 			},
 		},
 	}

internal/route/provider/all_fields.yaml

@@ -26,7 +26,7 @@ example: # matching `example.y.z`
     hideXForwarded:
   homepage:
     name: Example App
-    icon: png/adguard-home.png
+    icon: "@selfhst/adguard-home.png"
     description: An example app
     category: example
   access_log:

internal/route/provider/docker_labels.yaml

@@ -27,7 +27,7 @@ proxy.app: |
     hideXForwarded:
   homepage:
     name: Example App
-    icon: png/adguard-home.png
+    icon: "@selfhst/adguard-home.png"
     description: An example app
     category: example
   access_log:
@@ -89,7 +89,7 @@ proxy.app1.middlewares.cidr_whitelist: |
   message: IP not allowed
 proxy.app1.middlewares.hideXForwarded:
 proxy.app1.homepage.name: Example App
-proxy.app1.homepage.icon: png/adguard-home.png
+proxy.app1.homepage.icon: "@selfhst/adguard-home.png"
 proxy.app1.homepage.description: An example app
 proxy.app1.homepage.category: example
 proxy.app1.access_log.buffer_size: 100

internal/utils/testing/testing.go

@@ -37,7 +37,7 @@ func ExpectErrorT[T error](t *testing.T, err error) {
 
 func ExpectEqual[T any](t *testing.T, got T, want T) {
 	t.Helper()
-	require.EqualValues(t, got, want)
+	require.EqualValues(t, want, got)
 }
 
 func ExpectContains[T any](t *testing.T, got T, wants []T) {