remove unnecessary tests, add IUController test

Author: paladique

src/UnitTests/GitHub.App/Controllers/UIControllerTests.cs

@@ -637,9 +637,6 @@ public void Flow()
                 Assert.True(uiController.IsStopped);
                 Assert.True(success.HasValue);
                 Assert.False(success);
-
-                var vm = provider.GetExportFactoryProvider().GetViewModel(GitHub.Exports.UIViewType.PRCreation).Value;
-                Assert.Equal(2, vm.ReceivedCalls().Where(x => x.GetMethodInfo().Name == nameof(IViewModel.Reset)).Count());
             }
         }
 
@@ -705,6 +702,65 @@ public void ShuttingDown()
                 Assert.True(success);
             }
         }
+
+        [Fact]
+        void ResetIsCalled()
+        {
+            var provider = Substitutes.GetFullyMockedServiceProvider();
+            var hosts = provider.GetRepositoryHosts();
+            var factory = SetupFactory(provider);
+            var cm = provider.GetConnectionManager();
+            var cons = new ObservableCollection<IConnection>();
+            cm.Connections.Returns(cons);
+
+            // simulate being logged in
+            cons.Add(SetupConnection(provider, hosts, hosts.GitHubHost));
+
+            using (var uiController = new UIController((IUIProvider)provider, hosts, factory, cm))
+            {
+                var count = 0;
+                bool? success = null;
+                var flow = uiController.SelectFlow(UIControllerFlow.PullRequests);
+                uiController.ListenToCompletionState()
+                            .Subscribe(s =>
+                            {
+                                success = s;
+                            });
+                flow.Subscribe(data =>
+                {
+                    var uc = data.View;
+                    switch (++count)
+                    {
+                        case 1:
+                            Assert.IsAssignableFrom<IViewFor<IPullRequestListViewModel>>(uc);
+                            ((ReplaySubject<ViewWithData>)((IHasCreationView)uc).Create).OnNext(null);
+                            break;
+                        case 2:
+                            Assert.IsAssignableFrom<IViewFor<IPullRequestCreationViewModel>>(uc);
+                            TriggerCancel(uc);
+                            break;
+                        case 3:
+                            Assert.IsAssignableFrom<IViewFor<IPullRequestListViewModel>>(uc);
+                            ((ReplaySubject<ViewWithData>)((IHasCreationView)uc).Create).OnNext(null);
+                            break;
+                        case 4:
+                            Assert.IsAssignableFrom<IViewFor<IPullRequestCreationViewModel>>(uc);
+                            TriggerDone(uc);
+                            break;
+                        case 5:
+                            Assert.IsAssignableFrom<IViewFor<IPullRequestListViewModel>>(uc);
+                            TriggerCancel(uc);
+                            break;
+                    }
+                });
+
+                uiController.Start(null);
+                Assert.Equal(5, count);
+
+                var vm = provider.GetExportFactoryProvider().GetViewModel(GitHub.Exports.UIViewType.PRCreation).Value;
+                Assert.Equal(2, vm.ReceivedCalls().Where(x => x.GetMethodInfo().Name == nameof(IViewModel.Reset)).Count());
+            }
+        }
     }
 
     public class GistFlow : UIControllerTestBase

src/UnitTests/GitHub.App/ViewModels/PullRequestCreationViewModelTests.cs

@@ -191,37 +191,4 @@ public void TemplateIsUsedIfPresent()
 
         Assert.Equal("Test PR template", vm.Description);
     }
-
-    [Fact]
-    public async Task FormClearsOnCancel()
-    {
-        var data = PrepareTestData("octokit.net", "shana", "master", "octokit", "notmaster", "origin", true, true);
-        var prservice = new PullRequestService(data.GitClient, data.GitService, data.ServiceProvider.GetOperatingSystem(), Substitute.For<IUsageTracker>());
-
-        var vm = new PullRequestCreationViewModel(data.RepositoryHost, data.ActiveRepo, prservice, data.NotificationService);
-        vm.Initialize();
-        vm.PRTitle = "a title";
-        vm.Description = "a description";
-        vm.TargetBranch = new BranchModel("notmaster", data.TargetRepo);        
-        await vm.CancelCommand.ExecuteAsync();
-
-        Assert.Equal("master", vm.TargetBranch.Name);
-        Assert.Equal(string.Empty, vm.PRTitle);
-        Assert.Equal(string.Empty, vm.Description);
-    }
-
-    [Fact]
-    public async Task FormClearsOnCreation()
-    {
-        var data = PrepareTestData("octokit.net", "shana", "master", "octokit", "notmaster", "origin", true, true);
-        var prservice = new PullRequestService(data.GitClient, data.GitService, data.ServiceProvider.GetOperatingSystem(), Substitute.For<IUsageTracker>());
-        var vm = new PullRequestCreationViewModel(data.RepositoryHost, data.ActiveRepo, prservice, data.NotificationService);
-        vm.PRTitle = "a title";
-        vm.Description = "a description";
-        await vm.CreatePullRequest.ExecuteAsync();
-
-        Assert.Equal("master", vm.TargetBranch.Name);
-        Assert.Equal(string.Empty, vm.PRTitle);
-        Assert.Equal(string.Empty, vm.Description);
-    }
 }