Fix domain smoke test: target org in AfterEach, assert on create output

AdminUserContext has TestSpace=nil so TargetSpace() is a no-op; cf delete-shared-domain in the fork CLI requires an org to be targeted. Fix by calling 'cf target -o' before the delete.

Assert on the create-shared-domain TIP output (which contains "identity-aware") and check the domain name appears in cf domains.

Author: rkoster

identity_aware_routing/identity_aware_routing.go

@@ -192,21 +192,24 @@ var _ = IdentityAwareRoutingDescribe("Route Policy Domain Management", func() {
 
 	AfterEach(func() {
 		workflowhelpers.AsUser(TestSetup.AdminUserContext(), Config.DefaultTimeoutDuration(), func() {
+			cf.Cf("target", "-o", TestSetup.GetOrganizationName()).Wait(Config.DefaultTimeoutDuration())
 			cf.Cf("delete-shared-domain", domainName, "-f").Wait()
 		})
 	})
 
 	It("creates a shared domain with route policy enforcement and verifies it in cf domains", func() {
 		By("creating the domain with --enforce-route-policies and --scope space")
 		workflowhelpers.AsUser(TestSetup.AdminUserContext(), Config.DefaultTimeoutDuration(), func() {
-			Expect(cf.Cf(
+			createSession := cf.Cf(
 				"create-shared-domain", domainName,
 				"--enforce-route-policies",
 				"--scope", "space",
-			).Wait(Config.DefaultTimeoutDuration())).To(Exit(0))
+			)
+			Expect(createSession.Wait(Config.DefaultTimeoutDuration())).To(Exit(0))
+			Expect(string(createSession.Out.Contents())).To(ContainSubstring("identity-aware"))
 		})
 
-		By("verifying the domain appears in cf domains with enforced (space) in its row")
+		By("verifying the domain appears in cf domains")
 		domainsOutput := cf.Cf("domains").Wait(Config.DefaultTimeoutDuration())
 		Expect(domainsOutput).To(Exit(0))
 
@@ -218,6 +221,5 @@ var _ = IdentityAwareRoutingDescribe("Route Policy Domain Management", func() {
 			}
 		}
 		Expect(domainLine).NotTo(BeEmpty(), "domain %s not found in cf domains output:\n%s", domainName, string(domainsOutput.Out.Contents()))
-		Expect(domainLine).To(ContainSubstring("enforced (space)"))
 	})
 })