Tweak SC bindings

Author: Hosch250

RetailCoder.VBE/Root/RubberduckModule.cs

@@ -104,10 +104,10 @@ public override void Load()
                 .InSingletonScope()
                 .WithConstructorArgument<IDockableUserControl>(new CodeInspectionsWindow { ViewModel = Kernel.Get<InspectionResultsViewModel>() });
 
-            Bind<IControlView>().To<ChangesView>().Named("changesView");
-            Bind<IControlView>().To<BranchesView>().Named("branchesView");
-            Bind<IControlView>().To<UnsyncedCommitsView>().Named("unsyncedCommitsView");
-            Bind<IControlView>().To<SettingsView>().Named("settingsView");
+            Bind<IControlView>().To<ChangesView>();
+            Bind<IControlView>().To<BranchesView>();
+            Bind<IControlView>().To<UnsyncedCommitsView>();
+            Bind<IControlView>().To<SettingsView>();
 
             Bind<IControlViewModel>().To<ChangesViewViewModel>()
                 .WhenInjectedInto<ChangesView>();

RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs

@@ -52,10 +52,7 @@ public SourceControlViewViewModel(
             ISourceControlProviderFactory providerFactory,
             IFolderBrowserFactory folderBrowserFactory,
             ISourceControlConfigProvider configService,
-            [Named("changesView")] IControlView changesView,
-            [Named("branchesView")] IControlView branchesView,
-            [Named("unsyncedCommitsView")] IControlView unsyncedCommitsView,
-            [Named("settingsView")] IControlView settingsView,
+            IEnumerable<IControlView> views,
             ICodePaneWrapperFactory wrapperFactory,
             IMessageBox messageBox)
         {
@@ -95,13 +92,7 @@ public SourceControlViewViewModel(
             _sinks.ComponentRenamed += ComponentRenamed;
             _sinks.ProjectRemoved += ProjectRemoved;
 
-            TabItems = new ObservableCollection<IControlView>
-            {
-                changesView,
-                branchesView,
-                unsyncedCommitsView,
-                settingsView
-            };
+            TabItems = new ObservableCollection<IControlView>(views);
             SetTab(SourceControlTab.Changes);
 
             Status = RubberduckUI.Offline;

RubberduckTests/SourceControl/SourceControlViewModelTests.cs

@@ -110,9 +110,16 @@ private void VerifyChildPresentersHaveProviders()
 
         private void SetupVM()
         {
+            var views = new List<IControlView>
+            {
+                new ChangesView(_changesVM),
+                new BranchesView(_branchesVM),
+                new UnsyncedCommitsView(_unsyncedVM),
+                new SettingsView(_settingsVM)
+            };
+
             _vm = new SourceControlViewViewModel(_vbe.Object, new RubberduckParserState(new Mock<ISinks>().Object), new Mock<ISinks>().Object, _providerFactory.Object, _folderBrowserFactory.Object,
-                _configService.Object, new ChangesView(_changesVM), new BranchesView(_branchesVM),
-                new UnsyncedCommitsView(_unsyncedVM), new SettingsView(_settingsVM), new CodePaneWrapperFactory(), new Mock<IMessageBox>().Object);
+                _configService.Object, views, new CodePaneWrapperFactory(), new Mock<IMessageBox>().Object);
         }
 
         [TestMethod]