Merge pull request #126 from arschles/config-test

feat(_tests): add config tests

Author: arschles

_tests/apps_test.go

@@ -1,16 +1,10 @@
 package _tests_test
 
 import (
-	"fmt"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"math/rand"
 )
 
-func getRandAppName() string {
-	return fmt.Sprintf("apps-test-%d", rand.Int())
-}
-
 var _ = Describe("Apps", func() {
 	app1Name := getRandAppName()
 	app2Name := getRandAppName()

_tests/config_test.go

@@ -2,44 +2,77 @@ package _tests_test
 
 import (
 	. "github.com/onsi/ginkgo"
-	// . "github.com/onsi/gomega"
+	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("Config", func() {
 	Context("with a deployed app", func() {
+		appName := getRandAppName()
+		BeforeEach(func() {
+			login(url, testUser, testPassword)
+		})
+
+		It("can create a new app", func() {
+			output, err := execute("deis apps:create %s", appName)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(output).To(SatisfyAll(
+				ContainSubstring("Creating Application... done, created %s", appName),
+				ContainSubstring("Git remote deis added"),
+				ContainSubstring("remote available at ")))
+		})
+
+		It("can list environment variables", func() {
+			out, err := execute("deis config:set FOO=bar -a %s", appName)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(out).To(SatisfyAll(
+				ContainSubstring("Creating config... done"),
+				ContainSubstring("FOO      bar"),
+				ContainSubstring("=== %s Config", appName),
+			))
+			out, err = execute("deis config:list -a %s", appName)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(out).To(SatisfyAll(
+				ContainSubstring("=== %s Config", appName),
+				ContainSubstring("FOO      bar"),
+			))
+			// TODO: the following won't work as-is because there is no app running
+			// "deis run env -a %s"
 
-		XIt("can list environment variables", func() {
-			// "deis config:set FOO=bar--app=%s"
-			// "deis run env --app=%s"
-			// "deis config:list --app=%s"
 		})
 
-		XIt("can set an integer environment variable", func() {
-			// "deis config:set FOO=10 --app=%s"
-			// "deis run env --app=%s"
+		It("can set an integer environment variable", func() {
+			out, err := execute("deis config:set FOO=1 -a %s", appName)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(out).To(ContainSubstring("FOO      1"))
 		})
 
-		XIt("can set an environment variable containing spaces", func() {
-			// "config:set POWERED_BY=\"the Deis team\" --app={{.AppName}}"
-			// "deis run env --app=%s"
+		It("can set an environment variable containing spaces", func() {
+			out, err := execute(`deis config:set POWERED_BY=the\ Deis\ team -a %s`, appName)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(out).To(ContainSubstring("POWERED_BY      the Deis team"))
 		})
 
-		XIt("can set a multi-line environment variable", func() {
-			// `deis config:set FOO="This is a
-			//multiline string" --app={{.AppName}}`
-			// "deis run env --app=%s"
+		It("can set a multi-line environment variable", func() {
+			out, err := execute(`deis config:set FOO=This\ is\ a\
+				multiline\ string -a %s`, appName)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(out).To(ContainSubstring(`FOO             This\ is\ a\
+multiline\ string`))
 		})
 
-		XIt("can set an environment variable with multibyte chars", func() {
-			// "deis config:set FOO=讲台 --app=%s"
-			// "deis run env --app=%s"
+		It("can set an environment variable with multibyte chars", func() {
+			out, err := execute("deis config:set FOO=讲台 -a %s", appName)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(out).To(ContainSubstring("FOO             讲台"))
 		})
 
-		XIt("can unset an environment variable", func() {
-			// "deis config:set FOO=bar --app=%s"
-			// "deis run env --app=%s"
-			// "deis config:unset FOO --app=%s"
-			// "deis run env --app=%s"
+		It("can unset an environment variable", func() {
+			out, err := execute("deis config:set FOO=bar -a %s", appName)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(out).To(ContainSubstring("FOO             bar"))
+			out, err = execute("deis config:unset FOO -a %s", appName)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(out).NotTo(ContainSubstring("FOO"))
 		})
 
 		XIt("can pull the configuration to an .env file", func() {

_tests/package.go

@@ -1,11 +1,2 @@
 // Package _tests contains integration tests for the Deis open source PaaS.
 package _tests
-
-import (
-	"github.com/onsi/ginkgo/config"
-	"math/rand"
-)
-
-func init() {
-	rand.Seed(config.GinkgoConfig.RandomSeed)
-}

_tests/tests_suite_test.go

@@ -3,6 +3,7 @@ package _tests_test
 import (
 	"bytes"
 	"fmt"
+	"math/rand"
 	"os"
 	"os/exec"
 	"os/user"
@@ -16,6 +17,14 @@ import (
 	"testing"
 )
 
+func init() {
+	rand.Seed(GinkgoConfig.RandomSeed)
+}
+
+func getRandAppName() string {
+	return fmt.Sprintf("apps-test-%d", rand.Int())
+}
+
 func TestTests(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Tests Suite")
@@ -33,7 +42,7 @@ var (
 
 var _ = BeforeSuite(func() {
 	workflowHost := os.Getenv("DEIS_WORKFLOW_SERVICE_HOST")
-	workflowPort := os.Getenv("DEIS_WORKFLOW_SERVICE_HOST")
+	workflowPort := os.Getenv("DEIS_WORKFLOW_SERVICE_PORT")
 	Expect(workflowHost).ShouldNot(BeEmpty())
 	Expect(workflowPort).ShouldNot(BeEmpty())
 	Expect("../client/deis").Should(BeAnExistingFile())