Merge pull request #176 from Nfactor26/allow-fixtures-to-be-deleted

Allow fixtures to be deleted

Author: Nfactor26

src/Pixel.Automation.TestExplorer.ViewModels/TestExplorerViewModel.cs

@@ -232,15 +232,15 @@ public async Task EditTestFixtureAsync(TestFixtureViewModel fixtureVM)
         /// Delete an existing TestFixture
         /// </summary>
         /// <param name="testFixtureVM"></param>
-        public async void DeleteTestFixture(TestFixtureViewModel testFixtureVM)
+        public async Task DeleteTestFixtureAsync(TestFixtureViewModel testFixtureVM)
         {
+            Guard.Argument(testFixtureVM, nameof(testFixtureVM)).NotNull();
             MessageBoxResult result = MessageBox.Show("Are you sure you want to delete this test fixture along with all tests?", "Confirm Delete", MessageBoxButton.OKCancel);
             if (result == MessageBoxResult.OK)
             {
                 await this.testFixtureManager.DeleteTestFixtureAsync(testFixtureVM.TestFixture);
                 this.TestFixtures.Remove(testFixtureVM);              
-                logger.Information("TestFixture {0} was deleted from local storage.", testFixtureVM.DisplayName);
-
+                logger.Information("TestFixture @{0} was deleted.", testFixtureVM.DisplayName);
             }
         }
 

src/Pixel.Automation.TestExplorer.Views/TestExplorerView.xaml

@@ -23,12 +23,8 @@
         <local:TestDataSourceDropHandler x:Key="dataSourceDropHandler"/>
 
         <HierarchicalDataTemplate DataType="{x:Type localVM:TestFixtureViewModel}" ItemsSource="{Binding Tests}">
-
         </HierarchicalDataTemplate>
 
-        <!--<iconPacks:PackIconFontAwesome x:Key="SuccessIcon" Kind="ThumbsUpSolid" Foreground="Green" x:Shared="False" />
-        <iconPacks:PackIconFontAwesome  x:Key="FailureIcon" Kind="ThumbsDownSolid" Foreground="Red" x:Shared="False" />
-        <iconPacks:PackIconOcticons x:Key="AbortedIcon" Kind="Stop"  Foreground="Yellow" x:Shared="False"/>-->
         <iconPacks:PackIconEntypo x:Key="SuccessIcon" Kind="EmojiHappy" Foreground="Green" x:Shared="False"/>
         <iconPacks:PackIconEntypo x:Key="FailureIcon" Kind="EmojiSad" Foreground="Red" x:Shared="False"/>
         <iconPacks:PackIconEntypo x:Key="AbortedIcon" Kind="EmojiNeutral" Foreground="Yellow" x:Shared="False"/>
@@ -196,18 +192,20 @@
                                     <ContextMenu cal:Action.TargetWithoutContext="{Binding PlacementTarget.Tag, RelativeSource={RelativeSource Self}}">
                                         <MenuItem x:Name="OpenTestFixture" Header="Open"                                       
                                             cal:Message.Attach="[Event Click] = [Action OpenTestFixtureAsync($dataContext)]"/>
-                                        <MenuItem x:Name="Save" Header="Save" IsEnabled="{Binding IsOpenForEdit}"                                
-                                                cal:Message.Attach="[Event Click] = [Action SaveTestFixtureDataAsync($dataContext)]"/>
                                         <MenuItem x:Name="CloseTestFixture" Header="Close"  IsEnabled="{Binding IsOpenForEdit}"                                            
                                                 cal:Message.Attach="[Event Click] = [Action CloseTestFixtureAsync($dataContext,'false')]"/>
+                                        <MenuItem x:Name="Save" Header="Save" IsEnabled="{Binding IsOpenForEdit}"                                
+                                                cal:Message.Attach="[Event Click] = [Action SaveTestFixtureDataAsync($dataContext)]"/>                                      
                                         <MenuItem x:Name="SaveAndClose" Header="Save and Close"  IsEnabled="{Binding IsOpenForEdit}"                                           
                                                 cal:Message.Attach="[Event Click] = [Action CloseTestFixtureAsync($dataContext,'true')]"/>
                                         <MenuItem x:Name="AddTestCase" Header="Add Test"                                       
                                             cal:Message.Attach="[Event Click] = [Action AddTestCaseAsync($dataContext)]"/>
                                         <MenuItem x:Name="Edit" Header="Edit Details"                                       
                                             cal:Message.Attach="[Event Click] = [Action EditTestFixtureAsync($dataContext)]"/>
                                         <MenuItem x:Name="EditScript" Header="Edit Script" IsEnabled="{Binding IsOpenForEdit}"                                        
-                                            cal:Message.Attach="[Event Click] = [Action EditTestFixtureScriptAsync($dataContext)]"/>                                     
+                                            cal:Message.Attach="[Event Click] = [Action EditTestFixtureScriptAsync($dataContext)]"/>
+                                        <MenuItem x:Name="Delete" Header="Delete" IsEnabled="{Binding IsOpenForEdit, Converter={StaticResource inverseBoolConverter}}" 
+                                                cal:Message.Attach="[Event Click] = [Action DeleteTestFixtureAsync($dataContext)]"/>
                                     </ContextMenu>
                                 </Expander.ContextMenu>
                             </Expander>

src/Pixel.Persistence.Services.Client/ProjectDataManager.cs

@@ -389,11 +389,7 @@ public async Task DeleteTestFixtureAsync(TestFixture testFixture)
     {       
         if (IsOnlineMode)
         {
-            await this.fixturesClient.DeleteFixtureAsync(this.automationProject.ProjectId, this.projectVersion.ToString(), testFixture.FixtureId);
-            foreach(var testCase in testFixture.Tests)
-            {
-                await DeleteTestCaseAsync(testCase);
-            }
+            await this.fixturesClient.DeleteFixtureAsync(this.automationProject.ProjectId, this.projectVersion.ToString(), testFixture.FixtureId);            
         }
         var fixtureFiles = this.projectFileSystem.GetTestFixtureFiles(testFixture);
         Directory.Delete(fixtureFiles.FixtureDirectory, true);