fix(irc): resolve merge conflicts with latest main

This commit is contained in:
Alix-007 2026-03-13 08:25:35 +08:00
parent 4b8c48a40a
commit 8ddffaa3f3

View file

@ -1,19 +1,19 @@
package config package config
import ( import (
"encoding/json" "encoding/json"
"reflect" "reflect"
"testing" "testing"
) )
func TestFlexibleStringSliceUnmarshalJSON_String(t *testing.T) { func TestFlexibleStringSliceUnmarshalJSON_String(t *testing.T) {
var got FlexibleStringSlice var got FlexibleStringSlice
if err := json.Unmarshal([]byte(`"general, #opsdev"`), &got); err != nil { if err := json.Unmarshal([]byte(`"general, #opsdev"`), &got); err != nil {
t.Fatalf("Unmarshal() error = %v", err) t.Fatalf("Unmarshal() error = %v", err)
} }
want := FlexibleStringSlice{"general", "#ops", "dev"} want := FlexibleStringSlice{"general", "#ops", "dev"}
if !reflect.DeepEqual(got, want) { if !reflect.DeepEqual(got, want) {
t.Fatalf("FlexibleStringSlice = %#v, want %#v", got, want) t.Fatalf("FlexibleStringSlice = %#v, want %#v", got, want)
} }
} }