Merge pull request #5 from pvormste/remove-gomega

remove gomega

go.mod

@@ -4,6 +4,6 @@ go 1.13
 
 require (
 	github.com/JeremyLoy/config v1.2.1
-	github.com/onsi/gomega v1.8.1
 	github.com/stretchr/testify v1.4.0
+	gopkg.in/yaml.v2 v2.2.4 // indirect
 )

go.sum

@@ -2,38 +2,14 @@ github.com/JeremyLoy/config v1.2.1 h1:DJfUgTESmtd4UA4bkgAD1kIMO0Qd605SKfuShi92Wr
 github.com/JeremyLoy/config v1.2.1/go.mod h1:YcGKcrAs8JJ0AEjPLWL3mCpXWgtuguf9G8WE5H/pLe0=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/onsi/ginkgo v1.6.0 h1:Ix8l273rp3QzYgXSR+c8d1fTG7UPgYkOSELPhiY/YGw=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34=
-github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

yetconfig/env_files_test.go

@@ -4,39 +4,39 @@ import (
 	"os"
 	"testing"
 
-	. "github.com/onsi/gomega"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestSelectEnvFileByEnvironment(t *testing.T) {
 	t.Run("should return .env.prod for production", func(t *testing.T) {
-		tt := NewGomegaWithT(t)
+		assert := assert.New(t)
 
 		err := os.Setenv("ENVIRONMENT", "production")
-		tt.Expect(err).To(Not(HaveOccurred()))
+		require.NoError(t, err)
 
 		actualEnvFile := selectEnvFileByEnvironment()
-		tt.Expect(actualEnvFile).To(Equal(envFileProduction))
+		assert.Equal(envFileProduction, actualEnvFile)
 	})
 
 	t.Run("should return .env.staging for staging", func(t *testing.T) {
-		tt := NewGomegaWithT(t)
+		assert := assert.New(t)
 
 		err := os.Setenv("ENVIRONMENT", "staging")
-		tt.Expect(err).To(Not(HaveOccurred()))
+		require.NoError(t, err)
 
 		actualEnvFile := selectEnvFileByEnvironment()
-		tt.Expect(actualEnvFile).To(Equal(envFileStaging))
+		assert.Equal(envFileStaging, actualEnvFile)
 	})
 
 	t.Run("should return .env.dev for develop", func(t *testing.T) {
-		tt := NewGomegaWithT(t)
+		assert := assert.New(t)
 
 		err := os.Setenv("ENVIRONMENT", "develop")
-		tt.Expect(err).To(Not(HaveOccurred()))
+		require.NoError(t, err)
 
 		actualEnvFile := selectEnvFileByEnvironment()
-		tt.Expect(actualEnvFile).To(Equal(envFileDevelop))
+		assert.Equal(envFileDevelop, actualEnvFile)
 	})
 }
 

yetenv/env_test.go

@@ -5,7 +5,8 @@ import (
 	"os"
 	"testing"
 
-	. "github.com/onsi/gomega"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestGetEnvironment(t *testing.T) {
@@ -19,13 +20,13 @@ func TestGetEnvironment(t *testing.T) {
 			value := value
 
 			t.Run(fmt.Sprintf("ENVIRONMENT=%s", value), func(t *testing.T) {
-				tt := NewGomegaWithT(t)
+				assert := assert.New(t)
 
 				err := os.Setenv("ENVIRONMENT", value)
-				tt.Expect(err).ToNot(HaveOccurred())
+				require.NoError(t, err)
 
 				actualEnv := GetEnvironment()
-				tt.Expect(actualEnv).To(Equal(Production))
+				assert.Equal(Production, actualEnv)
 			})
 		}
 	})
@@ -40,13 +41,13 @@ func TestGetEnvironment(t *testing.T) {
 			value := value
 
 			t.Run(fmt.Sprintf("ENVIRONMENT=%s", value), func(t *testing.T) {
-				tt := NewGomegaWithT(t)
+				assert := assert.New(t)
 
 				err := os.Setenv("ENVIRONMENT", value)
-				tt.Expect(err).ToNot(HaveOccurred())
+				require.NoError(t, err)
 
 				actualEnv := GetEnvironment()
-				tt.Expect(actualEnv).To(Equal(Staging))
+				assert.Equal(Staging, actualEnv)
 			})
 		}
 	})
@@ -62,13 +63,13 @@ func TestGetEnvironment(t *testing.T) {
 			value := value
 
 			t.Run(fmt.Sprintf("ENVIRONMENT=%s", value), func(t *testing.T) {
-				tt := NewGomegaWithT(t)
+				assert := assert.New(t)
 
 				err := os.Setenv("ENVIRONMENT", value)
-				tt.Expect(err).ToNot(HaveOccurred())
+				require.NoError(t, err)
 
 				actualEnv := GetEnvironment()
-				tt.Expect(actualEnv).To(Equal(Develop))
+				assert.Equal(Develop, actualEnv)
 			})
 		}
 	})