From 0cf9ac58508ce424dad57e1df6a58a38abf78bb8 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeyou@microsoft.com>
Date: Thu, 10 Aug 2017 13:44:38 -0400
Subject: [PATCH] Two changes for Sprint 122 (#300)

* Add unit test for #291 (ensuring domain is used with ArgumentBuilder)

* Ensure we log an exception when 'Device Flow' fails
---
 src/team-extension.ts                      |  3 +--
 test/tfvc/commands/argumentbuilder.test.ts | 13 +++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/team-extension.ts b/src/team-extension.ts
index 9f28fa6ef6..92a5c183f2 100644
--- a/src/team-extension.ts
+++ b/src/team-extension.ts
@@ -183,9 +183,8 @@ export class TeamExtension  {
                     if (err.message) {
                         msg = `${msg} (${err.message})`;
                     }
-                    Logger.LogError(msg);
                     //FUTURE: Add a ButtonMessageItem to provide additional help? Log a bug?
-                    VsCodeUtils.ShowErrorMessage(msg);
+                    this._manager.ReportError(err, msg, true);
                 }
                 this._signingIn = false;
             }
diff --git a/test/tfvc/commands/argumentbuilder.test.ts b/test/tfvc/commands/argumentbuilder.test.ts
index a85137ef79..e715a84114 100644
--- a/test/tfvc/commands/argumentbuilder.test.ts
+++ b/test/tfvc/commands/argumentbuilder.test.ts
@@ -63,6 +63,19 @@ describe("Tfvc-ArgumentBuilder", function() {
         assert.equal(args.length, 4);
     });
 
+    it("should verify constructor with context - user and domain", function() {
+        context.CredentialInfo = new CredentialInfo(user, pass, "domain", "workstation");
+        const cmd: string = "mycmd";
+        const builder: ArgumentBuilder = new ArgumentBuilder(cmd, context);
+        assert.equal(builder.GetCommand(), cmd);
+        const args = builder.Build();
+        assert.equal(args[0], cmd);
+        assert.equal(args[1], "-noprompt");
+        assert.equal(args[2], "-collection:" + collectionUrl);
+        assert.equal(args[3], "-login:" + `domain\\${user}` + "," + pass);
+        assert.equal(args.length, 4);
+    });
+
     it("should verify constructor error", function() {
         assert.throws(() => new ArgumentBuilder(undefined), TfvcError, /Argument is required/);
     });