From cb5d4d53e3f3fa7a808277e1f75b743262df5166 Mon Sep 17 00:00:00 2001 From: Matteo Ruina Date: Sun, 17 Dec 2023 15:13:56 +0100 Subject: [PATCH] Fix dot import --- pkg/kmsca/suite_test.go | 16 ++++++++-------- pkg/kmsmock/suite_test.go | 16 ++++++++-------- pkg/signer/suite_test.go | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pkg/kmsca/suite_test.go b/pkg/kmsca/suite_test.go index d0a9360..dc555bf 100644 --- a/pkg/kmsca/suite_test.go +++ b/pkg/kmsca/suite_test.go @@ -19,8 +19,8 @@ package kmsca import ( "testing" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" + "github.com/onsi/ginkgo" + "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" @@ -30,17 +30,17 @@ import ( // http://onsi.github.io/ginkgo/ to learn more about Ginkgo. func TestAPIs(t *testing.T) { - RegisterFailHandler(Fail) + gomega.RegisterFailHandler(ginkgo.Fail) - RunSpecsWithDefaultAndCustomReporters(t, + ginkgo.RunSpecsWithDefaultAndCustomReporters(t, "Controller Suite", - []Reporter{printer.NewlineReporter{}}) + []ginkgo.Reporter{printer.NewlineReporter{}}) } -var _ = BeforeSuite(func(done Done) { - logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter))) +var _ = ginkgo.BeforeSuite(func(done ginkgo.Done) { + logf.SetLogger(zap.New(zap.WriteTo(ginkgo.GinkgoWriter))) close(done) }, 60) -var _ = AfterSuite(func() { +var _ = ginkgo.AfterSuite(func() { }) diff --git a/pkg/kmsmock/suite_test.go b/pkg/kmsmock/suite_test.go index 0e2776a..1301bb5 100644 --- a/pkg/kmsmock/suite_test.go +++ b/pkg/kmsmock/suite_test.go @@ -19,8 +19,8 @@ package kmsmock import ( "testing" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" + "github.com/onsi/ginkgo" + "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" @@ -30,17 +30,17 @@ import ( // http://onsi.github.io/ginkgo/ to learn more about Ginkgo. func TestAPIs(t *testing.T) { - RegisterFailHandler(Fail) + gomega.RegisterFailHandler(ginkgo.Fail) - RunSpecsWithDefaultAndCustomReporters(t, + ginkgo.RunSpecsWithDefaultAndCustomReporters(t, "Controller Suite", - []Reporter{printer.NewlineReporter{}}) + []ginkgo.Reporter{printer.NewlineReporter{}}) } -var _ = BeforeSuite(func(done Done) { - logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter))) +var _ = ginkgo.BeforeSuite(func(done ginkgo.Done) { + logf.SetLogger(zap.New(zap.WriteTo(ginkgo.GinkgoWriter))) close(done) }, 60) -var _ = AfterSuite(func() { +var _ = ginkgo.AfterSuite(func() { }) diff --git a/pkg/signer/suite_test.go b/pkg/signer/suite_test.go index 4f6cdc2..d71c502 100644 --- a/pkg/signer/suite_test.go +++ b/pkg/signer/suite_test.go @@ -19,8 +19,8 @@ package signer import ( "testing" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" + "github.com/onsi/ginkgo" + "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" @@ -30,17 +30,17 @@ import ( // http://onsi.github.io/ginkgo/ to learn more about Ginkgo. func TestAPIs(t *testing.T) { - RegisterFailHandler(Fail) + gomega.RegisterFailHandler(ginkgo.Fail) - RunSpecsWithDefaultAndCustomReporters(t, + ginkgo.RunSpecsWithDefaultAndCustomReporters(t, "Controller Suite", - []Reporter{printer.NewlineReporter{}}) + []ginkgo.Reporter{printer.NewlineReporter{}}) } -var _ = BeforeSuite(func(done Done) { - logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter))) +var _ = ginkgo.BeforeSuite(func(done ginkgo.Done) { + logf.SetLogger(zap.New(zap.WriteTo(ginkgo.GinkgoWriter))) close(done) }, 60) -var _ = AfterSuite(func() { +var _ = ginkgo.AfterSuite(func() { })