Fix error msg:delete-private-domain shared domain

[finishes #162998032] Authored-by: Piyali Banerjee <pbanerjee@pivotal.io>
cloudfoundry-community · May 2, 2019 · 5010c00 · 5010c00
1 parent cd2db7f
commit 5010c00
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/actor/v7action/domain.go b/actor/v7action/domain.go
@@ -87,7 +87,7 @@ func (actor Actor) CheckSharedDomain(domainName string) (Warnings, error) {
 		return allWarnings, err
 	}
 	if domain.Shared() {
-		err = fmt.Errorf("Domain %s is a shared domain, not a private domain.", domainName)
+		err = fmt.Errorf("Domain '%s' is a shared domain, not a private domain.", domainName)
 	}
 
 	return allWarnings, err

diff --git a/actor/v7action/domain_test.go b/actor/v7action/domain_test.go
@@ -77,7 +77,7 @@ var _ = Describe("Domain Actions", func() {
 	})
 
 	Describe("check if shared domain", func() {
-		When("deleting attempting to delete a shared domain", func() {
+		When("attempting to delete a shared domain", func() {
 			BeforeEach(func() {
 				fakeCloudControllerClient.GetDomainsReturns(
 					[]ccv3.Domain{
@@ -90,7 +90,7 @@ var _ = Describe("Domain Actions", func() {
 
 			It("delegates to the cloud controller client", func() {
 				warnings, executeErr := actor.CheckSharedDomain("the-domain.com")
-				Expect(executeErr).To(MatchError("Domain the-domain.com is a shared domain, not a private domain."))
+				Expect(executeErr).To(MatchError("Domain 'the-domain.com' is a shared domain, not a private domain."))
 				Expect(warnings).To(ConsistOf("get-domains-warning"))
 			})
 		})

diff --git a/command/v7/delete_private_domain_command.go b/command/v7/delete_private_domain_command.go
@@ -57,9 +57,6 @@ func (cmd DeletePrivateDomainCommand) Execute(args []string) error {
 	shareCheckWarnings, shareCheckErr := cmd.Actor.CheckSharedDomain(domain)
 
 	if shareCheckErr != nil {
-		cmd.UI.DisplayText("Domain '{{.DomainName}}' is a shared domain, not a private domain.", map[string]interface{}{
-			"DomainName": domain,
-		})
 		cmd.UI.DisplayWarnings(shareCheckWarnings)
 		return shareCheckErr
 	}

diff --git a/integration/v7/isolated/delete_private_domain_command_test.go b/integration/v7/isolated/delete_private_domain_command_test.go
@@ -73,8 +73,9 @@ var _ = Describe("delete-private-domain command", func() {
 				When("the user attempts to delete-private-domain a shared domain", func() {
 					It("it fails and provides the appropriate error message", func() {
 						session := helpers.CFWithStdin(buffer, "delete-private-domain", sharedDomainName)
-						Eventually(session).Should(Say(`Domain '%s' is a shared domain, not a private domain.`, sharedDomainName))
 						Eventually(session).Should(Say("FAILED"))
+						Eventually(session.Err).Should(Say(`Domain '%s' is a shared domain, not a private domain.`, sharedDomainName))
+
 						Eventually(session).Should(Exit(1))
 					})
 				})