Use gotest.tools/golden to simplify test file loading

"dep ensure" also bumped some dependencies
CircleCI-Public · Aug 31, 2018 · 162afbd · 162afbd
1 parent a7159ae
commit 162afbd
Show file tree

Hide file tree

Showing 26 changed files with 4,373 additions and 9 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/cmd/orb_test.go b/cmd/orb_test.go
@@ -10,6 +10,8 @@ import (
 
 	"io"
 
+	"gotest.tools/golden"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
@@ -1081,23 +1083,18 @@ var _ = Describe("Orb integration tests", func() {
 
 			It("makes a namespace query and requests all orbs on that namespace", func() {
 				By("setting up a mock server")
-
 				// These requests and responses are generated from production data,
 				// but using a 5-per-page limit instead of the 20 requested.
-				tmpBytes, err := ioutil.ReadFile(filepath.Join("testdata/gql_orb_list_with_namespace", "first_request.json"))
-				Expect(err).ShouldNot(HaveOccurred())
+				tmpBytes := golden.Get(GinkgoT(), filepath.FromSlash("gql_orb_list_with_namespace/first_request.json"))
 				firstGqlRequest := string(tmpBytes)
 
-				tmpBytes, err = ioutil.ReadFile(filepath.Join("testdata/gql_orb_list_with_namespace", "second_request.json"))
-				Expect(err).ShouldNot(HaveOccurred())
+				tmpBytes = golden.Get(GinkgoT(), filepath.FromSlash("gql_orb_list_with_namespace/second_request.json"))
 				secondGqlRequest := string(tmpBytes)
 
-				tmpBytes, err = ioutil.ReadFile(filepath.Join("testdata/gql_orb_list_with_namespace", "first_response.json"))
-				Expect(err).ShouldNot(HaveOccurred())
+				tmpBytes = golden.Get(GinkgoT(), filepath.FromSlash("gql_orb_list_with_namespace/first_response.json"))
 				firstGqlResponse := string(tmpBytes)
 
-				tmpBytes, err = ioutil.ReadFile(filepath.Join("testdata/gql_orb_list_with_namespace", "second_response.json"))
-				Expect(err).ShouldNot(HaveOccurred())
+				tmpBytes = golden.Get(GinkgoT(), filepath.FromSlash("gql_orb_list_with_namespace/second_response.json"))
 				secondGqlResponse := string(tmpBytes)
 
 				// Use Gomega's default matcher instead of our custom appendPostHandler

diff --git a/vendor/github.com/google/go-cmp/LICENSE b/vendor/github.com/google/go-cmp/LICENSE