cim/zitadel-oidc
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into op

Browse source 
# Conflicts:
#	pkg/client/rp/relaying_party.go
This commit is contained in:
Livio Amstutz 2021-10-28 07:51:28 +02:00
commit cef977adc2
8 changed files with 95 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

32
pkg/http/marshal_test.go
View file

@ -44,6 +44,36 @@ func TestConcatenateJSON(t *testing.T) {
[]byte(`{"some": "thing","another": "thing"}`),
false,
},
{
"first empty",
args{
[]byte(`{}`),
[]byte(`{"some": "thing"}`),
},
[]byte(`{"some": "thing"}`),
false,
},
{
"second empty",
args{
[]byte(`{"some": "thing"}`),
[]byte(`{}`),
},
[]byte(`{"some": "thing"}`),
false,
},
{
"both empty",
args{
[]byte(`{}`),
[]byte(`{}`),
},
[]byte(`{}`),
false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
@ -53,7 +83,7 @@ func TestConcatenateJSON(t *testing.T) {
return
}
if !bytes.Equal(got, tt.want) {
t.Errorf("ConcatenateJSON() got = %v, want %v", got, tt.want)
t.Errorf("ConcatenateJSON() got = %v, want %v", string(got), tt.want)
}
})
}