ref(apps_test.go): further convert to use gexec based command execution

Author: arschles

_tests/apps_test.go

@@ -119,48 +119,51 @@ var _ = Describe("Apps", func() {
 		})
 
 		It("can't create an existing app", func() {
-			output, err := execute("deis apps:create %s", app1Name)
-			Expect(err).To(HaveOccurred())
-			Expect(output).To(ContainSubstring("This field must be unique"))
+			sess, err := start("deis apps:create %s", app1Name)
+			Expect(err).ToNot(BeNil())
+			Eventually(sess).ShouldNot(gexec.Exit(0))
+			Eventually(sess).Should(gbytes.Say("This field must be unique"))
 		})
 
 		It("can get app info", func() {
-			output, err := execute("deis info")
-			Expect(err).NotTo(HaveOccurred())
-			Expect(output).To(SatisfyAll(
-				HavePrefix("=== %s Application", app2Name),
-				ContainSubstring("=== %s Processes", app2Name),
-				ContainSubstring(".1 up (v"),
-				ContainSubstring("=== %s Domains", app2Name)))
+			sess, err := start("deis info")
+			Expect(err).To(BeNil())
+			Eventually(sess).Should(gexec.Exit(0))
+			Eventually(sess).Should(gbytes.Say("=== %s Application", app2Name))
+			Eventually(sess).Should(gbytes.Say("=== %s Processes", app2Name))
+			Eventually(sess).Should(gbytes.Say(".1 up (v"))
+			Eventually(sess).Should(gbytes.Say("=== %s Domains", app2Name))
 		})
 
 		It("can get app logs", func() {
-			output, err := execute("deis logs")
-			Expect(err).NotTo(HaveOccurred())
-			Expect(output).To(SatisfyAll(
-				ContainSubstring("%s[deis-controller]: %s created initial release", app2Name, testUser),
-				ContainSubstring("%s[deis-controller]: %s deployed", app2Name, testUser),
-				ContainSubstring("%s[deis-controller]: %s scaled containers", app2Name, testUser)))
+			sess, err := start("deis logs")
+			Expect(err).To(BeNil())
+			Eventually(sess).Should(gexec.Exit(0))
+			Eventually(sess).Should(gbytes.Say("%s[deis-controller]: %s created initial release", app2Name, testUser))
+			Eventually(sess).Should(gbytes.Say("%s[deis-controller]: %s deployed", app2Name, testUser))
+			Eventually(sess).Should(gbytes.Say("%s[deis-controller]: %s scaled containers", app2Name, testUser))
 		})
 
 		// TODO: how to test "deis open" which spawns a browser?
 		XIt("can open the app's URL", func() {
-			_, err := execute("deis open")
-			Expect(err).NotTo(HaveOccurred())
+			sess, err := start("deis open")
+			Expect(err).To(BeNil())
+			Eventually(sess).Should(gexec.Exit(0))
 		})
 
 		It("can't open a bogus app URL", func() {
-			output, err := execute("deis open -a %s", getRandAppName())
-			Expect(err).To(HaveOccurred())
-			Expect(output).To(ContainSubstring("404 NOT FOUND"))
+			sess, err := start("deis open -a %s", getRandAppName())
+			Expect(err).ToNot(BeNil())
+			Eventually(sess).ShouldNot(gexec.Exit(0))
+			Eventually(sess).Should(gbytes.Say("404 NOT FOUND"))
 		})
 
 		It("can run a command in the app environment", func() {
-			output, err := execute("deis apps:run echo Hello, 世界")
-			Expect(err).NotTo(HaveOccurred())
-			Expect(output).To(SatisfyAll(
-				HavePrefix("Running 'echo Hello, 世界'..."),
-				HaveSuffix("Hello, 世界\n")))
+			sess, err := start("deis apps:run echo Hello, 世界")
+			Expect(err).To(BeNil())
+			Eventually(sess).Should(gexec.Exit(0))
+			Eventually(sess).Should(gbytes.Say("Running 'echo Hello, 世界'..."))
+			Eventually(sess).Should(gbytes.Say("Hello, 世界\n"))
 		})
 
 		// TODO: this requires a second user account