fix regression and cleanup tests

pkg/registry/digest/digest_test.go

@@ -10,13 +10,15 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"os"
-	"testing"
 )
 
-func TestDigest(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "Digest Suite")
-}
+var _ = Describe("Testing with Ginkgo", func() {
+	It("digest", func() {
+
+		RegisterFailHandler(Fail)
+		RunSpecs(GinkgoT(), "Digest Suite")
+	})
+})
 
 var ghImage = types.ImageInspect{
 	ID: "sha256:6972c414f322dfa40324df3c503d4b217ccdec6d576e408ed10437f508f4181b",

pkg/registry/helpers/helpers_test.go

@@ -3,14 +3,12 @@ package helpers
 import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	log "github.com/sirupsen/logrus"
 	"testing"
 )
 
-func TestDigest(t *testing.T) {
-	log.SetLevel(log.DebugLevel)
+func TestHelpers(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "Digest Suite")
+	RunSpecs(t, "Helper Suite")
 }
 
 var _ = Describe("the helpers", func() {

pkg/registry/trust_test.go

@@ -1,59 +1,71 @@
 package registry
 
 import (
-	"github.com/stretchr/testify/assert"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
 	"os"
 	"testing"
 )
 
-func TestEncodedEnvAuth_ShouldReturnAnErrorIfRepoEnvsAreUnset(t *testing.T) {
-	os.Unsetenv("REPO_USER")
-	os.Unsetenv("REPO_PASS")
-	_, err := EncodedEnvAuth("")
-	assert.Error(t, err)
-}
-func TestEncodedEnvAuth_ShouldReturnAuthHashIfRepoEnvsAreSet(t *testing.T) {
-	expectedHash := "eyJ1c2VybmFtZSI6ImNvbnRhaW5ycnItdXNlciIsInBhc3N3b3JkIjoiY29udGFpbnJyci1wYXNzIn0="
-
-	os.Setenv("REPO_USER", "containrrr-user")
-	os.Setenv("REPO_PASS", "containrrr-pass")
-	config, _ := EncodedEnvAuth("")
-
-	assert.Equal(t, config, expectedHash)
+func TestTrust(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Trust Suite")
 }
 
-func TestEncodedConfigAuth_ShouldReturnAnErrorIfFileIsNotPresent(t *testing.T) {
-	os.Setenv("DOCKER_CONFIG", "/dev/null/should-fail")
-	_, err := EncodedConfigAuth("")
-	assert.Error(t, err)
-}
+var _ = Describe("Testing with Ginkgo", func() {
+	It("encoded env auth_ should return an error if repo envs are unset", func() {
+		_ = os.Unsetenv("REPO_USER")
+		_ = os.Unsetenv("REPO_PASS")
 
-/*
- * TODO:
- * This part only confirms that it still works in the same way as it did
- * with the old version of the docker api client sdk. I'd say that
- * ParseServerAddress likely needs to be elaborated a bit to default to
- * dockerhub in case no server address was provided.
- *
- * ++ @simskij, 2019-04-04
- */
+		_, err := EncodedEnvAuth("")
+		Expect(err).To(HaveOccurred())
+	})
+	It("encoded env auth_ should return auth hash if repo envs are set", func() {
+		var err error
+		expectedHash := "eyJ1c2VybmFtZSI6ImNvbnRhaW5ycnItdXNlciIsInBhc3N3b3JkIjoiY29udGFpbnJyci1wYXNzIn0="
 
-func TestParseServerAddress_ShouldReturnErrorIfPassedEmptyString(t *testing.T) {
-	_, err := ParseServerAddress("")
-	assert.Error(t, err)
-}
+		err = os.Setenv("REPO_USER", "containrrr-user")
+		Expect(err).NotTo(HaveOccurred())
 
-func TestParseServerAddress_ShouldReturnTheRepoNameIfPassedAFullyQualifiedImageName(t *testing.T) {
-	val, _ := ParseServerAddress("github.com/containrrrr/config")
-	assert.Equal(t, val, "github.com")
-}
+		err = os.Setenv("REPO_PASS", "containrrr-pass")
+		Expect(err).NotTo(HaveOccurred())
 
-func TestParseServerAddress_ShouldReturnTheOrganizationPartIfPassedAnImageNameMissingServerName(t *testing.T) {
-	val, _ := ParseServerAddress("containrrr/config")
-	assert.Equal(t, val, "containrrr")
-}
+		config, err := EncodedEnvAuth("")
+		Expect(config).To(Equal(expectedHash))
+		Expect(err).NotTo(HaveOccurred())
+	})
+	It("encoded config auth_ should return an error if file is not present", func() {
+		var err error
 
-func TestParseServerAddress_ShouldReturnTheServerNameIfPassedAFullyQualifiedImageName(t *testing.T) {
-	val, _ := ParseServerAddress("github.com/containrrrr/config")
-	assert.Equal(t, val, "github.com")
-}
+		err = os.Setenv("DOCKER_CONFIG", "/dev/null/should-fail")
+		Expect(err).NotTo(HaveOccurred())
+
+		_, err = EncodedConfigAuth("")
+		Expect(err).To(HaveOccurred())
+
+	})
+	/*
+	 * TODO:
+	 * This part only confirms that it still works in the same way as it did
+	 * with the old version of the docker api client sdk. I'd say that
+	 * ParseServerAddress likely needs to be elaborated a bit to default to
+	 * dockerhub in case no server address was provided.
+	 *
+	 * ++ @simskij, 2019-04-04
+	 */
+	It("parse server address_ should return error if passed empty string", func() {
+
+		_, err := ParseServerAddress("")
+		Expect(err).To(HaveOccurred())
+	})
+	It("parse server address_ should return the organization part if passed an image name missing server name", func() {
+
+		val, _ := ParseServerAddress("containrrr/config")
+		Expect(val).To(Equal("containrrr"))
+	})
+	It("parse server address_ should return the server name if passed a fully qualified image name", func() {
+
+		val, _ := ParseServerAddress("github.com/containrrrr/config")
+		Expect(val).To(Equal("github.com"))
+	})
+})