when a user is not logged in, do not invite to use target -o or -s

Signed-off-by: Mike Gehard <[email protected]>

src/cf/commands/target.go

@@ -43,6 +43,10 @@ func (t Target) Run(c *cli.Context) {
 
 	if argsCount == 0 && orgName == "" && spaceName == "" {
 		t.ui.ShowConfiguration(t.config)
+
+		if !t.config.IsLoggedIn() {
+			return
+		}
 		if !t.config.HasOrganization() {
 			t.ui.Say("No org targeted. Use 'cf target -o' to target an org.")
 		}
@@ -59,7 +63,9 @@ func (t Target) Run(c *cli.Context) {
 
 	if orgName != "" {
 		t.setOrganization(orgName)
-		t.ui.Say("No space targeted. Use 'cf target -s' to target a space.")
+		if t.config.IsLoggedIn() {
+			t.ui.Say("No space targeted. Use 'cf target -s' to target a space.")
+		}
 		return
 	}
 
@@ -120,7 +126,7 @@ func (t *Target) saveTarget(target string, info *InfoResponse) (err error) {
 
 func (t Target) setOrganization(orgName string) {
 	if !t.config.IsLoggedIn() {
-		t.ui.Failed("You must be logged in to set an organization.", nil)
+		t.ui.Failed("You must be logged in to set an organization. Use 'cf login'.", nil)
 		return
 	}
 
@@ -137,7 +143,7 @@ func (t Target) setOrganization(orgName string) {
 
 func (t Target) setSpace(spaceName string) {
 	if !t.config.IsLoggedIn() {
-		t.ui.Failed("You must be logged in to set a space.", nil)
+		t.ui.Failed("You must be logged in to set a space. Use 'cf login'.", nil)
 		return
 	}
 

src/cf/commands/target_test.go

@@ -13,15 +13,67 @@ import (
 	"testing"
 )
 
-func TestTargetWithoutArgument(t *testing.T) {
+func TestTargetWithoutArgumentAndLoggedIn(t *testing.T) {
 	orgRepo := &testhelpers.FakeOrgRepository{}
 	spaceRepo := &testhelpers.FakeSpaceRepository{}
 	configRepo := &testhelpers.FakeConfigRepository{}
 	config := configRepo.Login()
 	config.Target = "https://api.run.pivotal.io"
 	fakeUI := callTarget([]string{}, configRepo, orgRepo, spaceRepo)
 
+	assert.Equal(t, len(fakeUI.Outputs), 4)
 	assert.Contains(t, fakeUI.Outputs[0], "https://api.run.pivotal.io")
+	assert.Contains(t, fakeUI.Outputs[1], "user: ")
+	assert.Contains(t, fakeUI.Outputs[2], "No org targeted")
+	assert.Contains(t, fakeUI.Outputs[3], "No space targeted")
+}
+
+func TestTargetWithoutArgumentsAndNotLoggedIn(t *testing.T) {
+	orgRepo := &testhelpers.FakeOrgRepository{}
+	spaceRepo := &testhelpers.FakeSpaceRepository{}
+	configRepo := &testhelpers.FakeConfigRepository{}
+	err := configRepo.ClearSession()
+	assert.NoError(t, err)
+	config, err := configRepo.Get()
+	assert.NoError(t, err)
+	config.Target = "https://api.run.pivotal.io"
+
+	fakeUI := callTarget([]string{}, configRepo, orgRepo, spaceRepo)
+	assert.Equal(t, len(fakeUI.Outputs), 2)
+	assert.Contains(t, fakeUI.Outputs[0], "https://api.run.pivotal.io")
+	assert.Contains(t, fakeUI.Outputs[1], "Logged out.")
+}
+
+func TestTargetWithOrganizationFlagAndNotLoggedIn(t *testing.T) {
+	orgRepo := &testhelpers.FakeOrgRepository{}
+	spaceRepo := &testhelpers.FakeSpaceRepository{}
+	configRepo := &testhelpers.FakeConfigRepository{}
+	err := configRepo.ClearSession()
+	assert.NoError(t, err)
+	config, err := configRepo.Get()
+	assert.NoError(t, err)
+	config.Target = "https://api.run.pivotal.io"
+
+	fakeUI := callTarget([]string{"-o", "my-organization"}, configRepo, orgRepo, spaceRepo)
+	assert.Equal(t, len(fakeUI.Outputs), 2)
+	assert.Contains(t, fakeUI.Outputs[0], "FAILED")
+	assert.Contains(t, fakeUI.Outputs[1], "You must be logged in to set an organization. Use 'cf login'.")
+}
+
+func TestTargetWithSpaceFlagAndNotLoggedIn(t *testing.T) {
+	orgRepo := &testhelpers.FakeOrgRepository{}
+	spaceRepo := &testhelpers.FakeSpaceRepository{}
+	configRepo := &testhelpers.FakeConfigRepository{}
+	err := configRepo.ClearSession()
+	assert.NoError(t, err)
+	config, err := configRepo.Get()
+	assert.NoError(t, err)
+	config.Target = "https://api.run.pivotal.io"
+
+	fakeUI := callTarget([]string{"-s", "my-space"}, configRepo, orgRepo, spaceRepo)
+	assert.Equal(t, len(fakeUI.Outputs), 2)
+	assert.Contains(t, fakeUI.Outputs[0], "FAILED")
+	assert.Contains(t, fakeUI.Outputs[1], "You must be logged in to set a space. Use 'cf login'.")
 }
 
 // With target argument