fix ginko testsuite

This commit is contained in:
Willy Kloucek
2022-04-28 10:05:51 +02:00
parent 4a9b31f3b4
commit 83f75bf089
7 changed files with 21 additions and 9 deletions
+4 -4
View File
@@ -12,11 +12,11 @@
],
"env": {
// log settings for human developers
//"OCIS_LOG_LEVEL": "debug",
//"OCIS_LOG_PRETTY": "true",
//"OCIS_LOG_COLOR": "true",
"OCIS_LOG_LEVEL": "debug",
"OCIS_LOG_PRETTY": "true",
"OCIS_LOG_COLOR": "true",
// enable basic auth for dev setup so that we can use curl for testing
//"PROXY_ENABLE_BASIC_AUTH": "true",
"PROXY_ENABLE_BASIC_AUTH": "true",
// set insecure options because we don't have valid certificates in dev environments
"OCIS_INSECURE": "true",
// demo users
@@ -6,6 +6,15 @@ import (
"github.com/owncloud/ocis/extensions/graph/pkg/config"
)
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}
func DefaultConfig() *config.Config {
return &config.Config{
Debug: config.Debug{
@@ -3,7 +3,7 @@ package svc_test
import (
"testing"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)
@@ -13,7 +13,7 @@ import (
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1"
"github.com/cs3org/reva/v2/pkg/rgrpc/status"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/owncloud/ocis/extensions/graph/mocks"
@@ -38,7 +38,7 @@ var _ = Describe("Graph", func() {
httpClient = &mocks.HTTPClient{}
eventsPublisher = mocks.Publisher{}
svc = service.NewService(
service.Config(defaults.DefaultConfig()),
service.Config(defaults.FullDefaultConfig()),
service.WithGatewayClient(gatewayClient),
service.WithHTTPClient(httpClient),
service.EventsPublisher(&eventsPublisher),
@@ -723,6 +723,9 @@ func getService() svc.Service {
Root: "/",
Addr: "localhost:9110",
},
Reva: &config.Reva{
Address: "",
},
TokenManager: &config.TokenManager{
JWTSecret: jwtSecret,
},
+1 -1
View File
@@ -3,7 +3,7 @@ package crypto_test
import (
"testing"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"github.com/owncloud/ocis/ocis-pkg/crypto"
"github.com/owncloud/ocis/ocis-pkg/log"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
cfg "github.com/owncloud/ocis/ocis-pkg/config"
)