restore and fix login tests

Author: peterguy

cmd/src/login_test.go

@@ -17,23 +17,34 @@ import (
 )
 
 func TestLogin(t *testing.T) {
-	check := func(t *testing.T, cfg *config) (output string, err error) {
+	check := func(t *testing.T, cfg *config, endpointArgURL *url.URL) (output string, err error) {
 		t.Helper()
 
 		var out bytes.Buffer
 		err = loginCmd(context.Background(), loginParams{
-			cfg:         cfg,
-			client:      cfg.apiClient(nil, io.Discard),
-			out:         &out,
-			oauthClient: fakeOAuthClient{startErr: fmt.Errorf("oauth unavailable")},
+			cfg:              cfg,
+			client:           cfg.apiClient(nil, io.Discard),
+			out:              &out,
+			oauthClient:      fakeOAuthClient{startErr: fmt.Errorf("oauth unavailable")},
+			loginEndpointURL: endpointArgURL,
 		})
 		return strings.TrimSpace(out.String()), err
 	}
 
-	t.Run("no access token", func(t *testing.T) {
-		endpoint := &url.URL{Scheme: "https", Host: "sourcegraph.example.com"}
-		out, err := check(t, &config{endpointURL: endpoint})
-		if err != cmderrors.ExitCode1 {
+	t.Run("different endpoint in config vs. arg", func(t *testing.T) {
+		out, err := check(t, &config{endpointURL: &url.URL{Scheme: "https", Host: "example.com"}}, &url.URL{Scheme: "https", Host: "sourcegraph.example.com"})
+		if err == nil {
+			t.Fatal(err)
+		}
+		if !strings.Contains(out, "The configured endpoint is https://example.com, not https://sourcegraph.example.com.") {
+			t.Errorf("got output %q, want configured endpoint error", out)
+		}
+	})
+
+	t.Run("no access token triggers oauth flow", func(t *testing.T) {
+		u := &url.URL{Scheme: "https", Host: "example.com"}
+		out, err := check(t, &config{endpointURL: u}, u)
+		if err == nil {
 			t.Fatal(err)
 		}
 		if !strings.Contains(out, "OAuth Device flow authentication failed:") {
@@ -43,7 +54,7 @@ func TestLogin(t *testing.T) {
 
 	t.Run("warning when using config file", func(t *testing.T) {
 		endpoint := &url.URL{Scheme: "https", Host: "example.com"}
-		out, err := check(t, &config{endpointURL: endpoint, configFilePath: "f"})
+		out, err := check(t, &config{endpointURL: endpoint, configFilePath: "f"}, endpoint)
 		if err != cmderrors.ExitCode1 {
 			t.Fatal(err)
 		}
@@ -62,7 +73,7 @@ func TestLogin(t *testing.T) {
 		defer s.Close()
 
 		u, _ := url.ParseRequestURI(s.URL)
-		out, err := check(t, &config{endpointURL: u, accessToken: "x"})
+		out, err := check(t, &config{endpointURL: u, accessToken: "x"}, u)
 		if err != cmderrors.ExitCode1 {
 			t.Fatal(err)
 		}
@@ -80,7 +91,7 @@ func TestLogin(t *testing.T) {
 		defer s.Close()
 
 		u, _ := url.ParseRequestURI(s.URL)
-		out, err := check(t, &config{endpointURL: u, accessToken: "x"})
+		out, err := check(t, &config{endpointURL: u, accessToken: "x"}, u)
 		if err != nil {
 			t.Fatal(err)
 		}