Merge pull request #542 from OlsonAndrewD/480-fix-pr-refresh-showing-create-form

Fix refresh of PR list switching to "create" form.

Author: grokys

src/GitHub.VisualStudio/PkgCmdID.cs

@@ -2,7 +2,7 @@
 // MUST match PkgCmdID.h
 namespace GitHub.VisualStudio
 {
-    static class PkgCmdIDList
+    public static class PkgCmdIDList
     {
         public const int addConnectionCommand = 0x110;
         public const int idGitHubToolbar = 0x1120;

src/GitHub.VisualStudio/Properties/AssemblyInfo.cs

@@ -3,4 +3,4 @@
 
 [assembly: AssemblyTitle("GitHub.VisualStudio")]
 [assembly: AssemblyDescription("GitHub for Visual Studio VSPackage")]
-[assembly: Guid("fad77eaa-3fe1-4c4b-88dc-3753b6263cd7")]
+[assembly: Guid("fad77eaa-3fe1-4c4b-88dc-3753b6263cd7")]

src/GitHub.VisualStudio/UI/Views/GitHubPaneViewModel.cs

@@ -279,8 +279,8 @@ void StartFlow(UIControllerFlow controllerFlow, [AllowNull]IConnection conn, Vie
         void GoForward(ViewWithData data)
         {
             currentNavItem++;
-            if (currentNavItem < navStack.Count - 1)
-                navStack.RemoveRange(currentNavItem, navStack.Count - 1 - currentNavItem);
+            if (currentNavItem < navStack.Count)
+                navStack.RemoveRange(currentNavItem, navStack.Count - currentNavItem);
             navStack.Add(data);
         }
 

src/UnitTests/GitHub.VisualStudio/UI/Views/GitHubPaneViewModelTests.cs

@@ -0,0 +1,130 @@
+using GitHub.Api;
+using GitHub.Exports;
+using GitHub.Models;
+using GitHub.Primitives;
+using GitHub.Services;
+using GitHub.UI;
+using GitHub.VisualStudio;
+using GitHub.VisualStudio.UI.Views;
+using NSubstitute;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel.Composition;
+using System.ComponentModel.Design;
+using System.Linq;
+using System.Reactive.Linq;
+using UnitTests;
+using Xunit;
+
+public class GitHubPaneViewModelTests : TestBaseClass
+{
+    readonly IServiceProvider serviceProvider;
+    readonly IUIController uiController;
+    readonly FakeMenuCommandService menuCommandService;
+    readonly GitHubPaneViewModel viewModel;
+    UIViewType lastUiControllerJump;
+
+    public GitHubPaneViewModelTests()
+    {
+        var repositoryHosts = Substitutes.RepositoryHosts;
+        repositoryHosts.IsLoggedInToAnyHost.Returns(true);
+
+        var teamExplorerServiceHolder = Substitute.For<ITeamExplorerServiceHolder>();
+        var activeRepo = Substitute.For<ILocalRepositoryModel>();
+        activeRepo.CloneUrl.Returns(new UriString("https://github.com/foo/foo"));
+        teamExplorerServiceHolder
+            .When(x => x.Subscribe(Arg.Any<object>(), Arg.Any<Action<ILocalRepositoryModel>>()))
+            .Do(x =>
+            {
+                var invokeAction = x.Arg<Action<ILocalRepositoryModel>>();
+                invokeAction(activeRepo);
+            });
+
+        var connectionManager = Substitutes.ConnectionManager;
+        var connection = Substitutes.Connection;
+        var connectionHostAddress = HostAddress.Create(activeRepo.CloneUrl.ToString());
+        connection.HostAddress.Returns(connectionHostAddress);
+        connectionManager.Connections.Returns(new ObservableCollection<IConnection>(new[] {
+                connection
+            }));
+        connection.Login().Returns(Observable.Return(connection));
+
+        var host = Substitute.For<IRepositoryHost>();
+        host.IsLoggedIn.Returns(true);
+        repositoryHosts.LookupHost(connectionHostAddress).Returns(host);
+
+        serviceProvider = Substitutes.GetFullyMockedServiceProvider();
+        menuCommandService = new FakeMenuCommandService();
+        serviceProvider.GetService(typeof(IMenuCommandService)).Returns(menuCommandService);
+
+        var uiProvider = serviceProvider as IUIProvider;
+        uiProvider.TryGetService(typeof(IUIProvider)).Returns(serviceProvider);
+
+        uiController = Substitute.For<IUIController>();
+        uiController.CurrentFlow.Returns(UIControllerFlow.PullRequests);
+        uiController.SelectedFlow.Returns(UIControllerFlow.PullRequests);
+        uiController
+            .When(x => x.Jump(Arg.Any<ViewWithData>()))
+            .Do(x => lastUiControllerJump = x.Arg<ViewWithData>().ViewType);
+
+        var exportFactoryProvider = Substitutes.ExportFactoryProvider;
+        uiProvider.TryGetService(typeof(IExportFactoryProvider)).Returns(exportFactoryProvider);
+        exportFactoryProvider.UIControllerFactory.Returns(new ExportFactory<IUIController>(
+            () => Tuple.Create<IUIController, Action>(uiController, () => { })));
+
+        viewModel = new GitHubPaneViewModel(
+            Substitute.For<ISimpleApiClientFactory>(),
+            teamExplorerServiceHolder,
+            connectionManager,
+            repositoryHosts,
+            Substitute.For<INotificationDispatcher>());
+
+        viewModel.ActiveRepo = activeRepo;
+    }
+
+    [Fact]
+    public void ListRefreshKeepsListVisible_DoesNotSwitchToPRCreation()
+    {
+        RunSteps(new[]
+        {
+            new NavStep(LoadDirection.Forward, UIViewType.PRList),
+            new NavStep(LoadDirection.Forward, UIViewType.PRCreation),
+            new NavStep(LoadDirection.Back, UIViewType.PRList),
+            new NavStep(LoadDirection.Forward, UIViewType.PRCreation),
+            new NavStep(LoadDirection.Forward, UIViewType.PRList),
+        });
+
+        menuCommandService.ExecuteCommand(PkgCmdIDList.refreshCommand);
+
+        Assert.Equal(UIViewType.PRList, lastUiControllerJump);
+    }
+
+    private void RunSteps(IEnumerable<NavStep> steps)
+    {
+        var observableSteps = steps
+            .Select(x => new LoadData
+            {
+                Direction = x.Direction,
+                Data = new ViewWithData() { ViewType = x.ViewType },
+                View = Substitute.For<IView>()
+            })
+            .ToObservable();
+
+        uiController.SelectFlow(UIControllerFlow.PullRequests).Returns(observableSteps);
+
+        viewModel.Initialize(serviceProvider);
+    }
+
+    private class NavStep
+    {
+        public NavStep(LoadDirection direction, UIViewType viewtype)
+        {
+            Direction = direction;
+            ViewType = viewtype;
+        }
+
+        public LoadDirection Direction { get; private set; }
+        public UIViewType ViewType { get; private set; }
+    }
+}

src/UnitTests/TestDoubles/FakeMenuCommandService.cs

@@ -17,6 +17,15 @@ public void AddCommand(MenuCommand command)
         addedCommands.Add(command);
     }
 
+    public void ExecuteCommand(int commandId)
+    {
+        var command = addedCommands.Find(_ => _.CommandID.ID == commandId);
+        if (command != null)
+        {
+            command.Invoke();
+        }
+    }
+
     public void AddVerb(DesignerVerb verb)
     {
         throw new NotImplementedException();

src/UnitTests/UnitTests.csproj

@@ -190,6 +190,7 @@
     <Compile Include="GitHub.VisualStudio\Services\ConnectionManagerTests.cs" />
     <Compile Include="GitHub.VisualStudio\Services\RepositoryPublishServiceTests.cs" />
     <Compile Include="GitHub.VisualStudio\TeamExplorer\Home\GraphsNavigationItemTests.cs" />
+    <Compile Include="GitHub.VisualStudio\UI\Views\GitHubPaneViewModelTests.cs" />
     <Compile Include="GitHubPackageTests.cs" />
     <Compile Include="Helpers\CommandTestHelpers.cs" />
     <Compile Include="Helpers\LazySubstitute.cs" />