cleanup
This commit is contained in:
@@ -2,10 +2,6 @@ package playlist
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
<<<<<<< HEAD
|
|
||||||
"fmt"
|
|
||||||
=======
|
|
||||||
>>>>>>> origin/resource-store-bridge
|
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
@@ -38,11 +34,7 @@ func TestIntegrationFoldersApp(t *testing.T) {
|
|||||||
|
|
||||||
v1Disco, err := json.MarshalIndent(resources, "", " ")
|
v1Disco, err := json.MarshalIndent(resources, "", " ")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
<<<<<<< HEAD
|
|
||||||
fmt.Printf("%s", string(v1Disco))
|
|
||||||
=======
|
|
||||||
//fmt.Printf("%s", string(v1Disco))
|
//fmt.Printf("%s", string(v1Disco))
|
||||||
>>>>>>> origin/resource-store-bridge
|
|
||||||
require.JSONEq(t, `{
|
require.JSONEq(t, `{
|
||||||
"kind": "APIResourceList",
|
"kind": "APIResourceList",
|
||||||
"apiVersion": "v1",
|
"apiVersion": "v1",
|
||||||
|
|||||||
Reference in New Issue
Block a user