Merge branch 'master' into fixes/tool-window-discoverability

Author: jcansdale

.github/workflows/main.yml

@@ -63,15 +63,15 @@ jobs:
     - name: Run unit tests
       shell: bash
       run: |
-        vstest.console /TestAdapterPath:test /Settings:test\test.runsettings \
-          test\GitHub.App.UnitTests\bin\${{ env.config }}\net46\GitHub.App.UnitTests.dll \
-          test\GitHub.Exports.Reactive.UnitTests\bin\${{ env.config }}\net46\GitHub.Exports.Reactive.UnitTests.dll \
-          test\GitHub.Exports.UnitTests\bin\${{ env.config }}\net46\GitHub.Exports.UnitTests.dll \
-          test\GitHub.Extensions.UnitTests\bin\${{ env.config }}\net46\GitHub.Extensions.UnitTests.dll \
-          test\GitHub.InlineReviews.UnitTests\bin\${{ env.config }}\net46\GitHub.InlineReviews.UnitTests.dll \
-          test\GitHub.Services.Vssdk.UnitTests\bin\${{ env.config }}\net461\GitHub.Services.Vssdk.UnitTests.dll \
-          test\GitHub.StartPage.UnitTests\bin\${{ env.config }}\net46\GitHub.StartPage.UnitTests.dll \
-          test\GitHub.TeamFoundation.UnitTests\bin\${{ env.config }}\net46\GitHub.TeamFoundation.UnitTests.dll \
-          test\GitHub.UI.UnitTests\bin\${{ env.config }}\net46\GitHub.UI.UnitTests.dll \
-          test\GitHub.VisualStudio.UnitTests\bin\${{ env.config }}\net46\GitHub.VisualStudio.UnitTests.dll \
-          test\MetricsTests\MetricsTests\bin\${{ env.config }}\MetricsTests.dll
+        vstest.console /TestAdapterPath:test /Settings:test/test.runsettings \
+          test/GitHub.App.UnitTests/bin/${{ env.config }}/net46/GitHub.App.UnitTests.dll \
+          test/GitHub.Exports.Reactive.UnitTests/bin/${{ env.config }}/net46/GitHub.Exports.Reactive.UnitTests.dll \
+          test/GitHub.Exports.UnitTests/bin/${{ env.config }}/net46/GitHub.Exports.UnitTests.dll \
+          test/GitHub.Extensions.UnitTests/bin/${{ env.config }}/net46/GitHub.Extensions.UnitTests.dll \
+          test/GitHub.InlineReviews.UnitTests/bin/${{ env.config }}/net46/GitHub.InlineReviews.UnitTests.dll \
+          test/GitHub.Services.Vssdk.UnitTests/bin/${{ env.config }}/net461/GitHub.Services.Vssdk.UnitTests.dll \
+          test/GitHub.StartPage.UnitTests/bin/${{ env.config }}/net46/GitHub.StartPage.UnitTests.dll \
+          test/GitHub.TeamFoundation.UnitTests/bin/${{ env.config }}/net46/GitHub.TeamFoundation.UnitTests.dll \
+          test/GitHub.UI.UnitTests/bin/${{ env.config }}/net46/GitHub.UI.UnitTests.dll \
+          test/GitHub.VisualStudio.UnitTests/bin/${{ env.config }}/net46/GitHub.VisualStudio.UnitTests.dll \
+          test/MetricsTests/MetricsTests/bin/${{ env.config }}/MetricsTests.dll

src/GitHub.App/ViewModels/Dialog/LoginCredentialsViewModel.cs

@@ -1,8 +1,6 @@
 using System;
 using System.ComponentModel.Composition;
 using System.Reactive.Linq;
-using GitHub.App;
-using GitHub.Primitives;
 using GitHub.Services;
 using ReactiveUI;
 
@@ -28,8 +26,7 @@ public LoginCredentialsViewModel(
                 (x, y) => x.Value || y.Value
             ).ToProperty(this, vm => vm.IsLoginInProgress);
 
-            UpdateLoginMode();
-            connectionManager.Connections.CollectionChanged += (_, __) => UpdateLoginMode();
+            LoginMode = LoginMode.DotComOrEnterprise;
 
             Done = Observable.Merge(
                 loginToGitHubViewModel.Login,
@@ -55,21 +52,5 @@ public LoginMode LoginMode
         public bool IsLoginInProgress { get { return isLoginInProgress.Value; } }
 
         public IObservable<object> Done { get; }
-
-        void UpdateLoginMode()
-        {
-            var result = LoginMode.DotComOrEnterprise;
-
-            foreach (var connection in ConnectionManager.Connections)
-            {
-                if (connection.IsLoggedIn)
-                {
-                    result &= ~((connection.HostAddress == HostAddress.GitHubDotComHostAddress) ?
-                        LoginMode.DotComOnly : LoginMode.EnterpriseOnly);
-                }
-            }
-
-            LoginMode = result;
-        }
     }
 }

test/GitHub.App.UnitTests/ViewModels/Dialog/LoginCredentialsViewModelTests.cs

@@ -76,8 +76,10 @@ public async Task AllowsLoginFromEnterpriseAfterGitHubLoginHasFailedAsync()
     public class TheLoginModeProperty : TestBaseClass
     {
         [Test]
-        public void LoginModeTracksAvailableConnections()
+        public void LoginModeIgnoresAvailableConnections()
         {
+            // We always want to option to log-in to GitHub or GitHub Enterprise
+
             var connectionManager = Substitute.For<IConnectionManager>();
             var connections = new ObservableCollectionEx<IConnection>();
             var gitHubLogin = Substitute.For<ILoginToGitHubViewModel>();
@@ -96,13 +98,13 @@ public void LoginModeTracksAvailableConnections()
             Assert.That(LoginMode.DotComOrEnterprise, Is.EqualTo(loginViewModel.LoginMode));
 
             connections.Add(enterpriseConnection);
-            Assert.That(LoginMode.DotComOnly, Is.EqualTo(loginViewModel.LoginMode));
+            Assert.That(LoginMode.DotComOrEnterprise, Is.EqualTo(loginViewModel.LoginMode));
 
             connections.Add(gitHubConnection);
-            Assert.That(LoginMode.None, Is.EqualTo(loginViewModel.LoginMode));
+            Assert.That(LoginMode.DotComOrEnterprise, Is.EqualTo(loginViewModel.LoginMode));
 
             connections.RemoveAt(0);
-            Assert.That(LoginMode.EnterpriseOnly, Is.EqualTo(loginViewModel.LoginMode));
+            Assert.That(LoginMode.DotComOrEnterprise, Is.EqualTo(loginViewModel.LoginMode));
         }
     }