feat(tests): add domain integration tests

Author: Matthew Fisher

tests/Makefile

@@ -24,6 +24,7 @@ test-full: test-style
 	godep go test -tags integration -v -run TestAuth
 	godep go test -tags integration -v -run TestBuilds
 	godep go test -tags integration -v -run TestConfig
+	godep go test -tags integration -v -run TestDomains
 	godep go test -tags integration -v -run TestKeys
 	godep go test -tags integration -v -run TestPerms
 	godep go test -tags integration -v -run TestPs

tests/apps_test.go

@@ -94,7 +94,7 @@ func appsLogsTest(t *testing.T, params *utils.DeisTestConfig) {
 		t.Fatal(err)
 	}
 	utils.Execute(t, gitPushCmd, params, false, "")
-	utils.Curl(t, params)
+	utils.CurlApp(t, *params)
 	utils.Execute(t, cmd, params, false, "created initial release")
 	utils.Execute(t, cmd, params, false, "listening on 5000...")
 	if err := utils.Chdir(".."); err != nil {
@@ -103,7 +103,7 @@ func appsLogsTest(t *testing.T, params *utils.DeisTestConfig) {
 }
 
 func appsOpenTest(t *testing.T, params *utils.DeisTestConfig) {
-	utils.Curl(t, params)
+	utils.CurlApp(t, *params)
 }
 
 func appsRunTest(t *testing.T, params *utils.DeisTestConfig) {

tests/config_test.go

@@ -50,7 +50,7 @@ func configSetup(t *testing.T) *utils.DeisTestConfig {
 	// ensure custom buildpack URLS are in order
 	utils.Execute(t, configSetBuildpackCmd, cfg, false, "https://github.com/heroku/heroku-buildpack-go#98f37cc")
 	utils.Execute(t, gitPushCmd, cfg, false, "")
-	utils.CurlWithFail(t, cfg, false, "the Deis team")
+	utils.CurlApp(t, *cfg)
 	utils.CheckList(t, "run env --app={{.AppName}}", cfg, "DEIS_APP", false)
 	utils.CheckList(t, "run env --app={{.AppName}}", cfg, "DEIS_RELEASE", false)
 	if err := utils.Chdir(".."); err != nil {

tests/domain_test.go

@@ -0,0 +1,49 @@
+// +build integration
+
+package tests
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/deis/deis/tests/utils"
+)
+
+var (
+	domainsAddCmd = "domains:add {{.AppDomain}} --app {{.AppName}}"
+	domainsRemoveCmd = "domains:remove {{.AppDomain}} --app {{.AppName}}"
+)
+
+func TestDomain(t *testing.T) {
+	cfg := domainSetup(t)
+	domainTest(t, cfg)
+	utils.AppsDestroyTest(t, cfg)
+}
+
+func domainSetup(t *testing.T) *utils.DeisTestConfig {
+	cfg := utils.GetGlobalConfig()
+	cfg.AppName = "domainsample"
+	utils.Execute(t, authLoginCmd, cfg, false, "")
+	utils.Execute(t, gitCloneCmd, cfg, false, "")
+	if err := utils.Chdir(cfg.ExampleApp); err != nil {
+		t.Fatal(err)
+	}
+	utils.Execute(t, appsCreateCmd, cfg, false, "")
+	utils.Execute(t, gitPushCmd, cfg, false, "")
+	utils.CurlApp(t, *cfg)
+	if err := utils.Chdir(".."); err != nil {
+		t.Fatal(err)
+	}
+	return cfg
+}
+
+func domainTest(t *testing.T, cfg *utils.DeisTestConfig) {
+	utils.Execute(t, domainsAddCmd, cfg, false, "done")
+	// ensure both the root domain and the custom domain work
+	utils.CurlApp(t, *cfg)
+	utils.Curl(t, fmt.Sprintf("http://%s", cfg.AppDomain))
+	utils.Execute(t, domainsRemoveCmd, cfg, false, "done")
+	// only the root domain should work now
+	utils.CurlApp(t, *cfg)
+	// TODO (bacongobbler): add test to ensure that the custom domain fails to connect
+}

tests/ps_test.go

@@ -3,6 +3,7 @@
 package tests
 
 import (
+	"fmt"
 	"os"
 	"strings"
 	"testing"
@@ -30,7 +31,7 @@ func TestPs(t *testing.T) {
 	time.Sleep(time.Millisecond * 7000)
 
 	// test for a 503 response
-	utils.CurlWithFail(t, params, true, "503")
+	utils.CurlWithFail(t, fmt.Sprintf("http://%s.%s", params.AppName, params.Domain), true, "503")
 
 	utils.AppsDestroyTest(t, params)
 	utils.Execute(t, psScaleCmd, params, true, "404 NOT FOUND")

tests/utils/itutils.go

@@ -31,6 +31,7 @@ type DeisTestConfig struct {
 	Password    string
 	Email       string
 	ExampleApp  string
+	AppDomain   string
 	AppName     string
 	ProcessNum  string
 	ImageID     string
@@ -63,6 +64,10 @@ func GetGlobalConfig() *DeisTestConfig {
 	if exampleApp == "" {
 		exampleApp = randomApp
 	}
+	appDomain := os.Getenv("DEIS_TEST_APP_DOMAIN")
+	if appDomain == "" {
+		appDomain = fmt.Sprintf("test.%s", domain)
+	}
 	var envCfg = DeisTestConfig{
 		AuthKey:     authKey,
 		Hosts:       hosts,
@@ -73,6 +78,7 @@ func GetGlobalConfig() *DeisTestConfig {
 		Password:    "asdf1234",
 		Email:       "test@test.co.nz",
 		ExampleApp:  exampleApp,
+		AppDomain:   appDomain,
 		AppName:     "sample",
 		ProcessNum:  "2",
 		ImageID:     "buildtest",
@@ -97,15 +103,18 @@ func doCurl(url string) ([]byte, error) {
 	return body, nil
 }
 
-// Curl connects to a Deis endpoint to see if the example app is running.
-func Curl(t *testing.T, params *DeisTestConfig) {
-	CurlWithFail(t, params, false, "")
+// Curl connects to an endpoint to see if the endpoint is responding.
+func Curl(t *testing.T, url string) {
+	CurlWithFail(t, url, false, "")
 }
 
-// CurlWithFail connects to a Deis endpoint to see if the example app is running.
-func CurlWithFail(t *testing.T, params *DeisTestConfig, failFlag bool, expect string) {
-	url := "http://" + params.AppName + "." + params.Domain
+// CurlApp is a convenience function to see if the example app is running.
+func CurlApp(t *testing.T, cfg DeisTestConfig) {
+	CurlWithFail(t, fmt.Sprintf("http://%s.%s", cfg.AppName, cfg.Domain), false, "")
+}
 
+// CurlWithFail connects to a Deis endpoint to see if the example app is running.
+func CurlWithFail(t *testing.T, url string, failFlag bool, expect string) {
 	// FIXME: try the curl a few times
 	for i := 0; i < 20; i++ {
 		body, err := doCurl(url)