fix(irc): resolve merge conflicts with latest main
This commit is contained in:
parent
4b8c48a40a
commit
8ddffaa3f3
1 changed files with 19 additions and 19 deletions
|
|
@ -1,19 +1,19 @@
|
|||
package config
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"reflect"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestFlexibleStringSliceUnmarshalJSON_String(t *testing.T) {
|
||||
var got FlexibleStringSlice
|
||||
if err := json.Unmarshal([]byte(`"general, #ops,dev"`), &got); err != nil {
|
||||
t.Fatalf("Unmarshal() error = %v", err)
|
||||
}
|
||||
|
||||
want := FlexibleStringSlice{"general", "#ops", "dev"}
|
||||
if !reflect.DeepEqual(got, want) {
|
||||
t.Fatalf("FlexibleStringSlice = %#v, want %#v", got, want)
|
||||
}
|
||||
}
|
||||
package config
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"reflect"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestFlexibleStringSliceUnmarshalJSON_String(t *testing.T) {
|
||||
var got FlexibleStringSlice
|
||||
if err := json.Unmarshal([]byte(`"general, #ops,dev"`), &got); err != nil {
|
||||
t.Fatalf("Unmarshal() error = %v", err)
|
||||
}
|
||||
|
||||
want := FlexibleStringSlice{"general", "#ops", "dev"}
|
||||
if !reflect.DeepEqual(got, want) {
|
||||
t.Fatalf("FlexibleStringSlice = %#v, want %#v", got, want)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue