Merge pull request #346 from vdice/updates-for-csdk-113

ref(*): adjust error message expectations

Author: Vaughn Dice

tests/apps_test.go

@@ -53,7 +53,7 @@ var _ = Describe("deis apps", func() {
 
 			Specify("that user cannot get information about that app", func() {
 				sess, err := cmd.Start("deis info -a %s", &user, bogusAppName)
-				Eventually(sess.Err).Should(Say(util.PrependError(deis.ErrNotFound)))
+				Eventually(sess.Err).Should(Say(util.PrependError(apps.ErrNoAppMatch)))
 				Expect(err).NotTo(HaveOccurred())
 				Eventually(sess).Should(Exit(1))
 			})
@@ -67,15 +67,15 @@ var _ = Describe("deis apps", func() {
 
 			Specify("that user cannot open that app", func() {
 				sess, err := cmd.Start("deis open -a %s", &user, bogusAppName)
-				Eventually(sess.Err).Should(Say(util.PrependError(deis.ErrNotFound)))
+				Eventually(sess.Err).Should(Say(util.PrependError(apps.ErrNoAppMatch)))
 				Expect(err).NotTo(HaveOccurred())
 				Eventually(sess).Should(Exit(1))
 			})
 
 			Specify("that user cannot run a command in that app's environment", func() {
 				sess, err := cmd.Start("deis apps:run -a %s echo Hello, 世界", &user, bogusAppName)
 				Eventually(sess).Should(Say("Running 'echo Hello, 世界'..."))
-				Eventually(sess.Err).Should(Say(util.PrependError(deis.ErrNotFound)))
+				Eventually(sess.Err).Should(Say(util.PrependError(apps.ErrNoAppMatch)))
 				Expect(err).NotTo(HaveOccurred())
 				Eventually(sess).ShouldNot(Exit(0))
 			})

tests/builds_test.go

@@ -1,7 +1,6 @@
 package tests
 
 import (
-	deis "github.com/deis/controller-sdk-go"
 	"github.com/deis/workflow-e2e/tests/cmd"
 	"github.com/deis/workflow-e2e/tests/cmd/apps"
 	"github.com/deis/workflow-e2e/tests/cmd/auth"
@@ -38,7 +37,7 @@ var _ = Describe("deis builds", func() {
 
 			Specify("that user cannot create a build for that app", func() {
 				sess, err := cmd.Start("deis builds:create -a %s %s", &user, bogusAppName, builds.ExampleImage)
-				Eventually(sess.Err).Should(Say(util.PrependError(deis.ErrNotFound)))
+				Eventually(sess.Err).Should(Say(util.PrependError(apps.ErrNoAppMatch)))
 				Expect(err).NotTo(HaveOccurred())
 				Eventually(sess).Should(Exit(1))
 			})

tests/certs_test.go

@@ -78,14 +78,14 @@ var _ = Describe("deis certs", func() {
 
 		Specify("that user cannot get info on a non-existent cert", func() {
 			sess, err := cmd.Start("deis certs:info %s", &user, nonExistentCertName)
-			Eventually(sess.Err).Should(Say(util.PrependError(deis.ErrNotFound)))
+			Eventually(sess.Err).Should(Say(util.PrependError(certs.ErrNoCertMatch)))
 			Expect(err).NotTo(HaveOccurred())
 			Eventually(sess).Should(Exit(1))
 		})
 
 		Specify("that user cannot remove a non-existent cert", func() {
 			sess, err := cmd.Start("deis certs:remove %s", &user, nonExistentCertName)
-			Eventually(sess.Err).Should(Say(util.PrependError(deis.ErrNotFound)))
+			Eventually(sess.Err).Should(Say(util.PrependError(certs.ErrNoCertMatch)))
 			Expect(err).NotTo(HaveOccurred())
 			Eventually(sess).Should(Exit(1))
 		})
@@ -117,14 +117,14 @@ var _ = Describe("deis certs", func() {
 
 				Specify("that user cannot attach a non-existent cert to that domain", func() {
 					sess, err := cmd.Start("deis certs:attach %s %s", &user, nonExistentCertName, domain)
-					Eventually(sess.Err).Should(Say(util.PrependError(deis.ErrNotFound)))
+					Eventually(sess.Err).Should(Say(util.PrependError(certs.ErrNoCertMatch)))
 					Expect(err).NotTo(HaveOccurred())
 					Eventually(sess).Should(Exit(1))
 				})
 
 				Specify("that user cannot detatch a non-existent cert from that domain", func() {
 					sess, err := cmd.Start("deis certs:detach %s %s", &user, nonExistentCertName, domain)
-					Eventually(sess.Err).Should(Say(util.PrependError(deis.ErrNotFound)))
+					Eventually(sess.Err).Should(Say(util.PrependError(certs.ErrNoCertMatch)))
 					Expect(err).NotTo(HaveOccurred())
 					Eventually(sess).Should(Exit(1))
 				})
@@ -147,14 +147,14 @@ var _ = Describe("deis certs", func() {
 
 			Specify("that user cannot attach a cert to a non-existent domain", func() {
 				sess, err := cmd.Start("deis certs:attach %s %s", &user, cert.Name, nonExistentDomain)
-				Eventually(sess.Err).Should(Say(util.PrependError(deis.ErrNotFound)))
+				Eventually(sess.Err).Should(Say(util.PrependError(domains.ErrNoDomainMatch)))
 				Expect(err).NotTo(HaveOccurred())
 				Eventually(sess).Should(Exit(1))
 			})
 
 			Specify("that user cannot detach a cert from a non-existent domain", func() {
 				sess, err := cmd.Start("deis certs:detach %s %s", &user, cert.Name, nonExistentDomain)
-				Eventually(sess.Err).Should(Say(util.PrependError(deis.ErrNotFound)))
+				Eventually(sess.Err).Should(Say(util.PrependError(domains.ErrNoDomainMatch)))
 				Expect(err).NotTo(HaveOccurred())
 				Eventually(sess).Should(Exit(1))
 			})

tests/cmd/apps/commands.go

@@ -1,6 +1,7 @@
 package apps
 
 import (
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -17,6 +18,8 @@ import (
 	. "github.com/onsi/gomega/gexec"
 )
 
+var ErrNoAppMatch = errors.New("\"No App matches the given query.\"")
+
 // The functions in this file implement SUCCESS CASES for commonly used `deis apps` subcommands.
 // This allows each of these to be re-used easily in multiple contexts.
 

tests/cmd/certs/commands.go

@@ -1,6 +1,7 @@
 package certs
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/deis/workflow-e2e/tests/cmd"
@@ -12,6 +13,8 @@ import (
 	. "github.com/onsi/gomega/gexec"
 )
 
+var ErrNoCertMatch = errors.New("\"No Certificate matches the given query.\"")
+
 // The functions in this file implement SUCCESS CASES for commonly used `deis certs` subcommands.
 // This allows each of these to be re-used easily in multiple contexts.
 

tests/cmd/domains/commands.go

@@ -1,6 +1,7 @@
 package domains
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/deis/workflow-e2e/tests/cmd"
@@ -12,6 +13,8 @@ import (
 	. "github.com/onsi/gomega/gexec"
 )
 
+var ErrNoDomainMatch = errors.New("\"No Domain matches the given query.\"")
+
 // The functions in this file implement SUCCESS CASES for commonly used `deis domains` subcommands.
 // This allows each of these to be re-used easily in multiple contexts.
 

tests/domains_test.go

@@ -6,7 +6,6 @@ import (
 	"net/http"
 	"strconv"
 
-	deis "github.com/deis/controller-sdk-go"
 	"github.com/deis/workflow-e2e/tests/cmd"
 	"github.com/deis/workflow-e2e/tests/cmd/apps"
 	"github.com/deis/workflow-e2e/tests/cmd/auth"
@@ -67,7 +66,7 @@ var _ = Describe("deis domains", func() {
 
 			Specify("that user cannot remove a non-existent domain from that app", func() {
 				sess, err := cmd.Start("deis domains:remove --app=%s %s", &user, app.Name, "non.existent.domain")
-				Eventually(sess.Err, settings.MaxEventuallyTimeout).Should(Say(util.PrependError(deis.ErrNotFound)))
+				Eventually(sess.Err, settings.MaxEventuallyTimeout).Should(Say(util.PrependError(domains.ErrNoDomainMatch)))
 				Expect(err).NotTo(HaveOccurred())
 				Eventually(sess).Should(Exit(1))
 			})