Branches VM tests

Author: Hosch250

RetailCoder.VBE/UI/SourceControl/BranchesViewViewModel.cs

@@ -45,6 +45,9 @@ public void RefreshView()
             OnPropertyChanged("Branches");
 
             CurrentBranch = Provider.CurrentBranch.Name;
+
+            SourceBranch = null;
+            DestinationBranch = CurrentBranch;
         }
 
         public IEnumerable<string> Branches
@@ -274,6 +277,15 @@ private void CreateBranchCancel()
 
         private void MergeBranchOk()
         {
+            try
+            {
+                Provider.Merge(SourceBranch, DestinationBranch);
+            }
+            catch (SourceControlException ex)
+            {
+                RaiseErrorEvent(ex.Message, ex.InnerException.Message);
+            }
+
             DisplayMergeBranchesGrid = false;
         }
 

RubberduckTests/RubberduckTests.csproj

@@ -135,6 +135,7 @@
     <Compile Include="Settings\TodoSettingsTests.cs" />
     <Compile Include="Settings\UnitTestSettingsTests.cs" />
     <Compile Include="SourceControlConfig.cs" />
+    <Compile Include="SourceControl\BranchesViewModelTests.cs" />
     <Compile Include="SourceControl\ChangesViewModelTests.cs" />
     <Compile Include="StringExtensionsTests.cs" />
     <Compile Include="TodoControllerTests.cs" />