Merge branch 'main' into it-test-improvements-main

Author: gururajsh

command/flag/app_type.go

@@ -5,5 +5,5 @@ import flags "github.com/jessevdk/go-flags"
 type AppType string
 
 func (AppType) Complete(prefix string) []flags.Completion {
-	return completions([]string{"buildpack", "docker"}, prefix, false)
+	return completions([]string{"buildpack", "docker", "cnb"}, prefix, false)
 }

command/flag/app_type_test.go

@@ -19,14 +19,16 @@ var _ = Describe("AppType", func() {
 
 			Entry("completes to 'buildpack' when passed 'b'", "b",
 				[]flags.Completion{{Item: "buildpack"}}),
+			Entry("completes to 'cnb' when passed 'c'", "c",
+				[]flags.Completion{{Item: "cnb"}}),
 			Entry("completes to 'docker' when passed 'd'", "d",
 				[]flags.Completion{{Item: "docker"}}),
 			Entry("completes to 'buildpack' when passed 'bU'", "bU",
 				[]flags.Completion{{Item: "buildpack"}}),
 			Entry("completes to 'docker' when passed 'Do'", "Do",
 				[]flags.Completion{{Item: "docker"}}),
-			Entry("returns 'buildpack' and 'docker' when passed nothing", "",
-				[]flags.Completion{{Item: "buildpack"}, {Item: "docker"}}),
+			Entry("returns 'buildpack', 'cnb', and 'docker' when passed nothing", "",
+				[]flags.Completion{{Item: "buildpack"}, {Item: "docker"}, {Item: "cnb"}}),
 			Entry("completes to nothing when passed 'wut'", "wut",
 				[]flags.Completion{}),
 		)

command/flag/space_role.go

@@ -11,7 +11,7 @@ type SpaceRole struct {
 }
 
 func (SpaceRole) Complete(prefix string) []flags.Completion {
-	return completions([]string{"SpaceManager", "SpaceDeveloper", "SpaceAuditor"}, prefix, false)
+	return completions([]string{"SpaceManager", "SpaceDeveloper", "SpaceAuditor", "SpaceSupporter"}, prefix, false)
 }
 
 func (s *SpaceRole) UnmarshalFlag(val string) error {

command/flag/space_role_test.go

@@ -16,10 +16,10 @@ var _ = Describe("SpaceRole", func() {
 				completions := spaceRole.Complete(prefix)
 				Expect(completions).To(Equal(matches))
 			},
-			Entry("returns 'SpaceManager', 'SpaceDeveloper' and 'SpaceAuditor' when passed 'S'", "S",
-				[]flags.Completion{{Item: "SpaceManager"}, {Item: "SpaceDeveloper"}, {Item: "SpaceAuditor"}}),
-			Entry("returns 'SpaceManager', 'SpaceDeveloper' and 'SpaceAuditor' when passed 's'", "s",
-				[]flags.Completion{{Item: "SpaceManager"}, {Item: "SpaceDeveloper"}, {Item: "SpaceAuditor"}}),
+			Entry("returns 'SpaceManager', 'SpaceDeveloper', 'SpaceAuditor' and 'SpaceSupporter' when passed 'S'", "S",
+				[]flags.Completion{{Item: "SpaceManager"}, {Item: "SpaceDeveloper"}, {Item: "SpaceAuditor"}, {Item: "SpaceSupporter"}}),
+			Entry("returns 'SpaceManager', 'SpaceDeveloper', 'SpaceAuditor' and 'SpaceSupporter' when passed 's'", "s",
+				[]flags.Completion{{Item: "SpaceManager"}, {Item: "SpaceDeveloper"}, {Item: "SpaceAuditor"}, {Item: "SpaceSupporter"}}),
 			Entry("completes to 'SpaceAuditor' when passed 'Spacea'", "Spacea",
 				[]flags.Completion{{Item: "SpaceAuditor"}}),
 			Entry("completes to 'SpaceDeveloper' when passed 'Spaced'", "Spaced",
@@ -28,8 +28,10 @@ var _ = Describe("SpaceRole", func() {
 				[]flags.Completion{{Item: "SpaceManager"}}),
 			Entry("completes to 'SpaceManager' when passed 'spacEM'", "spacEM",
 				[]flags.Completion{{Item: "SpaceManager"}}),
-			Entry("returns 'SpaceManager', 'SpaceDeveloper' and 'SpaceAuditor' when passed nothing", "",
-				[]flags.Completion{{Item: "SpaceManager"}, {Item: "SpaceDeveloper"}, {Item: "SpaceAuditor"}}),
+			Entry("completes to 'SpaceSupporter' when passed 'Spaces'", "Spaces",
+				[]flags.Completion{{Item: "SpaceSupporter"}}),
+			Entry("returns 'SpaceManager', 'SpaceDeveloper', 'SpaceAuditor' and 'SpaceSupporter' when passed nothing", "",
+				[]flags.Completion{{Item: "SpaceManager"}, {Item: "SpaceDeveloper"}, {Item: "SpaceAuditor"}, {Item: "SpaceSupporter"}}),
 			Entry("completes to nothing when passed 'wut'", "wut",
 				[]flags.Completion{}),
 		)