test fixes

tests/integration/cli_test_util.go

@@ -23,15 +23,31 @@ type cliTest struct {
 	stdout     *bytes.Buffer
 	injector   injector
 	configFile string
+	t          *testing.T
 }
 
 func (test *cliTest) WriteConfig(t *testing.T, config *configs.Root) {
 	test.configFile = writeTempConfig(t, config)
 }
 
 func (test *cliTest) Execute(args []string) error {
-	// Pass in config file path, if we have one
-	if test.configFile != "" {
+	var hasConfigFlag bool
+	for _, arg := range args {
+		if arg == "--config" {
+			hasConfigFlag = true
+			break
+		}
+	}
+
+	// Use a temporary config file, if none is otherwise set
+	if !hasConfigFlag {
+		// Write an empty config file, if none has been set
+		// we want to avoid accidentally using the system's ~/.dce/config.yml`,
+		// by default
+		if test.configFile == "" {
+			test.WriteConfig(test.t, &configs.Root{})
+		}
+
 		args = append(args, "--config", test.configFile)
 	}
 
@@ -54,6 +70,7 @@ func NewCLITest(t *testing.T) *cliTest {
 	cli := &cliTest{
 		MockPrompter: prompter,
 		stdout:       &stdout,
+		t:            t,
 	}
 
 	// Wrap the `PreRun` method, to inject the mock prompter,

tests/integration/leases_test.go

@@ -14,6 +14,38 @@ import (
 	"time"
 )
 
+func TestLeasesCreate(t *testing.T) {
+
+	t.Run("with --expires-on flag", func(t *testing.T) {
+		leasesCreateTest(t, &leaseCreateTestCase{
+			commandArgs: []string{
+				"leases", "create",
+				"-p", "test-user",
+				"-b", "100", "-c", "USD",
+				"-e", "[email protected]",
+				"--expires-on", "1h",
+			},
+			expectedCreateLeaseRequest: operations.PostLeasesBody{
+				BudgetAmount:             aws.Float64(100),
+				BudgetCurrency:           aws.String("USD"),
+				BudgetNotificationEmails: []string{"[email protected]"},
+				ExpiresOn:                float64(time.Now().Add(time.Hour).Unix()),
+				PrincipalID:              aws.String("test-user"),
+			},
+			mockAccountID: "123456789012",
+			expectedJSONOutput: map[string]interface{}{
+				"accountId":                "123456789012",
+				"budgetAmount":             float64(100),
+				"budgetCurrency":           "USD",
+				"budgetNotificationEmails": []interface{}{"[email protected]"},
+				"principalId":              "test-user",
+				"expiresOn":                time.Now().Add(time.Hour).Unix(),
+			},
+		})
+	})
+
+}
+
 type leaseCreateTestCase struct {
 	// Args to pass to the dce-cli
 	commandArgs []string
@@ -113,64 +145,3 @@ func leasesCreateTest(t *testing.T, testCase *leaseCreateTestCase) {
 	api.AssertExpectations(t)
 	out.AssertNumberOfCalls(t, "Write", 1)
 }
-
-func TestLeasesCreate(t *testing.T) {
-
-	t.Run("with all required flags, only", func(t *testing.T) {
-		leasesCreateTest(t, &leaseCreateTestCase{
-			commandArgs: []string{
-				"leases", "create",
-				"-p", "test-user",
-				"-b", "100", "-c", "USD",
-				"-e", "[email protected]", "-e", "[email protected]",
-			},
-			expectedCreateLeaseRequest: operations.PostLeasesBody{
-				BudgetAmount:             aws.Float64(100),
-				BudgetCurrency:           aws.String("USD"),
-				BudgetNotificationEmails: []string{"[email protected]", "[email protected]"},
-				// Defaults to 7d
-				ExpiresOn:   float64(time.Now().Add(time.Hour * 24 * 7).Unix()),
-				PrincipalID: aws.String("test-user"),
-			},
-			mockAccountID: "123456789012",
-			expectedJSONOutput: map[string]interface{}{
-				"accountId":                "123456789012",
-				"budgetAmount":             float64(100),
-				"budgetCurrency":           "USD",
-				"budgetNotificationEmails": []interface{}{"[email protected]", "[email protected]"},
-				"principalId":              "test-user",
-				// Defaults to 7d
-				"expiresOn": time.Now().Add(time.Hour * 24 * 7).Unix(),
-			},
-		})
-	})
-
-	t.Run("with --expires-on flag", func(t *testing.T) {
-		leasesCreateTest(t, &leaseCreateTestCase{
-			commandArgs: []string{
-				"leases", "create",
-				"-p", "test-user",
-				"-b", "100", "-c", "USD",
-				"-e", "[email protected]",
-				"--expires-on", "1h",
-			},
-			expectedCreateLeaseRequest: operations.PostLeasesBody{
-				BudgetAmount:             aws.Float64(100),
-				BudgetCurrency:           aws.String("USD"),
-				BudgetNotificationEmails: []string{"[email protected]"},
-				ExpiresOn:                float64(time.Now().Add(time.Hour).Unix()),
-				PrincipalID:              aws.String("test-user"),
-			},
-			mockAccountID: "123456789012",
-			expectedJSONOutput: map[string]interface{}{
-				"accountId":                "123456789012",
-				"budgetAmount":             float64(100),
-				"budgetCurrency":           "USD",
-				"budgetNotificationEmails": []interface{}{"[email protected]"},
-				"principalId":              "test-user",
-				"expiresOn":                time.Now().Add(time.Hour).Unix(),
-			},
-		})
-	})
-
-}