Merge branch 'Ginger-Automation:master' into master

Ginger-Automation · Dec 5, 2023 · e09efae · e09efae
2 parents 4d23a5f + 1d92c27
commit e09efae
Show file tree

Hide file tree

Showing 606 changed files with 28,232 additions and 4,020 deletions.
diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
@@ -35,13 +35,13 @@ jobs:
           - name: create version environment variable - alpha
             if: ${{ github.event.inputs.revision != 0 }}
             run: |
-                echo "gingertag=20${{ github.event.inputs.major}}.${{ github.event.inputs.minor}}-Alpha\ ${{github.event.inputs.build}}.${{ github.event.inputs.revision}}" >> $GITHUB_ENV
+                echo "gingertag=20${{ github.event.inputs.major}}.${{ github.event.inputs.minor}}-Alpha.${{github.event.inputs.build}}.${{ github.event.inputs.revision}}" >> $GITHUB_ENV
                 echo "gingernumber=${{ github.event.inputs.major}}.${{ github.event.inputs.minor}}.${{ github.event.inputs.build}}.${{ github.event.inputs.revision}}" >> $GITHUB_ENV
           
           - name: create version environment variable - BETA
             if: ${{ (github.event.inputs.build != 0) && (github.event.inputs.revision == 0 )}} 
             run: |
-              echo "gingertag=20${{ github.event.inputs.major}}.${{ github.event.inputs.minor}}-Beta\ ${{ github.event.inputs.build}}" >> $GITHUB_ENV
+              echo "gingertag=20${{ github.event.inputs.major}}.${{ github.event.inputs.minor}}-Beta.${{ github.event.inputs.build}}" >> $GITHUB_ENV
               echo "gingernumber=${{ github.event.inputs.major}}.${{ github.event.inputs.minor}}.${{ github.event.inputs.build}}.${{ github.event.inputs.revision}}" >> $GITHUB_ENV
 
           - name: create version environment variable - Release

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -4,12 +4,6 @@ on:
     workflow_dispatch:
     workflow_call:
 
-    pull_request:
-        branches: 
-          - master
-          - Features/Linux-Migration
-          - Releases/*
-          - Releases/*/*
 
 jobs:
 #    Codacy:

diff --git a/.github/workflows/Deploy-2.yml b/.github/workflows/Deploy-2.yml
@@ -57,9 +57,9 @@ jobs:
 # ------------------------------------------------------------------------------------------------------
 # Create new Release for ginger
 # ------------------------------------------------------------------------------------------------------
-          - name: Create Github new Release
+          - name: Create Github Release
             id: create-new-release
-            uses: actions/create-release@v1
+            uses: GongT/actions-recreate-release@v1
             env:
               GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
             with:

diff --git a/.github/workflows/LinuxBuild.yml b/.github/workflows/LinuxBuild.yml
@@ -1,12 +1,12 @@
 name: Ginger Linux Build
 
 on:
-  pull_request:
-    branches: 
-      - master
-      - Features/Linux-Migration
-      - Releases/*
-      - Releases/*/*
+  # pull_request:
+  #   branches: 
+  #     - master
+  #     - Features/Linux-Migration
+  #     - Releases/*
+  #     - Releases/*/*
 
   workflow_dispatch: 
 

diff --git a/.github/workflows/MacBuild.yml b/.github/workflows/MacBuild.yml
@@ -1,12 +1,12 @@
 name: Ginger Mac Build
 
 on:
-  pull_request:
-    branches: 
-      - master
-      - Features/Linux-Migration
-      - Releases/*
-      - Releases/*/*
+  # pull_request:
+  #   branches: 
+  #     - master
+  #     - Features/Linux-Migration
+  #     - Releases/*
+  #     - Releases/*/*
 
   workflow_dispatch: 
 
@@ -62,4 +62,4 @@ jobs:
         with:
           name: Ginger MacOS UnitTests    # Name of the check run which will be created
           path: "**/*.trx"                # Path to test results
-          reporter: dotnet-trx            # Format of test results        
+          reporter: dotnet-trx            # Format of test results        
diff --git a/.github/workflows/Release-2.yml b/.github/workflows/Release-2.yml
@@ -33,8 +33,12 @@ jobs:
 
             - name: Create Directory for GingerRuntime
               run: | 
-                  mv ./Documents/ReadMe.txt  ./Runtime/ReadMe.txt
-                  mv ./Documents/gingerInstall.sh  ./Runtime/gingerInstall.sh
+                  mv ./Documents/ReadMe.txt ./Runtime/ReadMe.txt
+                  mv ./Documents/gingerInstall.sh ./Runtime/gingerInstall.sh
+                  chmod +x ./Runtime/gingerInstall.sh
+                  sudo apt install dos2unix
+                  dos2unix -b ./Runtime/ReadMe.txt
+                  dos2unix -b ./Runtime/gingerInstall.sh
 
             -   uses: sibiraj-s/action-archiver@v1
                 with:

diff --git a/.github/workflows/WindowsBuild.yml b/.github/workflows/WindowsBuild.yml
@@ -1,12 +1,12 @@
 name: Ginger Windows Build
 
 on:
-  pull_request:
-    branches: 
-      - master
-      - Features/Linux-Migration
-      - Releases/*
-      - Releases/*/*
+  # pull_request:
+  #   branches: 
+  #     - master
+  #     - Features/Linux-Migration
+  #     - Releases/*
+  #     - Releases/*/*
 
   workflow_dispatch: 
 
@@ -114,4 +114,4 @@ jobs:
 #           sealightsToken: "$(SLAGENTTOKEN)"
 #           SealightsBuildSessionId : $(Build.ArtifactStagingDirectory)\SealightsBuildSessionId.txt 
 
-
+
diff --git a/CLITestsGithub.sh b/CLITestsGithub.sh
@@ -17,7 +17,7 @@ echo "**************************************************************************
 echo "run simple solution"
 echo "******************************************************************************************************************************"
 
-dotnet GingerRuntime.dll run -s "/home/runner/work/Ginger/Ginger/Ginger/GingerCoreNETUnitTest/TestResources/Solutions/CLI" -e "Default" -r "Default Run Set"
+dotnet GingerRuntime.dll run -s "/home/runner/work/Ginger/Ginger/Ginger/GingerCoreNETUnitTest/TestResources/Solutions/CLI" -e "Default" -r "Default Run Set" -v "debug"
 
 
 # echo "******************************************************************************************************************************"

diff --git a/Ginger/Ginger/ALM/ALMConnectionPage.xaml b/Ginger/Ginger/ALM/ALMConnectionPage.xaml
@@ -10,10 +10,10 @@
 	Title="ALM Connection Settings">
 
     <ScrollViewer VerticalScrollBarVisibility="Auto">
-        <Grid Background="{StaticResource $BackgroundColor_LightGray}">
+        <Grid Background="{StaticResource $BackgroundColor_White}">
             <StackPanel>
                 <StackPanel x:Name="ALMSelectPanel"  Visibility="Visible">
-                    <DockPanel Background="{StaticResource $Color_DarkBlue}">
+                    <DockPanel Background="{StaticResource $PrimaryColor_Black}">
                         <Label Style="{StaticResource @SectionHeaderLabelStyle}" HorizontalAlignment="Stretch">Step 1: Select ALM Type</Label>
                     </DockPanel>
 
@@ -49,7 +49,7 @@
 
                 <StackPanel x:Name="ALMSettingsPannel">
                     <StackPanel x:Name="ALMServerDetailsPanel" Visibility="Visible">
-                        <DockPanel Background="{StaticResource $Color_DarkBlue}">
+                        <DockPanel Background="{StaticResource $PrimaryColor_Black}">
                             <Label Style="{StaticResource @SectionHeaderLabelStyle}" HorizontalAlignment="Stretch">Step 2: Server Details</Label>
                         </DockPanel>
                         <StackPanel>
@@ -95,7 +95,7 @@
                     </StackPanel>
 
                     <StackPanel x:Name="ALMProjectDetailsPanel"  Visibility="Visible">
-                        <DockPanel Background="{StaticResource $Color_DarkBlue}">
+                        <DockPanel Background="{StaticResource $PrimaryColor_Black}">
                             <Label x:Name="loginToProjectlbl" Style="{StaticResource @SectionHeaderLabelStyle}" HorizontalAlignment="Stretch" >Step 3: Project Details</Label>
                         </DockPanel>
 
@@ -108,17 +108,17 @@
 
                             <StackPanel x:Name="ALMDomainSelectionPanel" Grid.Row="0">
                                 <Label x:Name="ALMDomainLabel" Style="{StaticResource @InputFieldLabelStyle}">Domain:</Label>
-                                <ComboBox x:Name="DomainComboBox" SelectionChanged="DomainComboBox_SelectionChanged" Style="{StaticResource @InputComboBoxStyle}"></ComboBox>
+                                <ComboBox x:Name="DomainComboBox" SelectionChanged="DomainComboBox_SelectionChanged" Style="{StaticResource $FlatInputComboBoxStyle}"></ComboBox>
                             </StackPanel>
 
                             <StackPanel Grid.Row="1">
                                 <Label Style="{StaticResource @InputFieldLabelStyle}">Project:</Label>
-                                <ComboBox x:Name="ProjectComboBox" Style="{StaticResource @InputComboBoxStyle}" SelectionChanged="ProjectComboBox_SelectionChanged" SelectedValuePath = "Key" DisplayMemberPath = "Value"></ComboBox>
+                                <ComboBox x:Name="ProjectComboBox" Style="{StaticResource $FlatInputComboBoxStyle}" SelectionChanged="ProjectComboBox_SelectionChanged" SelectedValuePath = "Key" DisplayMemberPath = "Value"></ComboBox>
                             </StackPanel>
 
                             <StackPanel x:Name="JiraTestingALMSelectionPanel" Grid.Row="2" Visibility="Hidden">
                                 <Label x:Name="JiraTestingALMLabel" Style="{StaticResource @InputFieldLabelStyle}">Jira Testing ALM:</Label>
-                                <ComboBox x:Name="JiraTestingALMComboBox" SelectionChanged="JiraTestingALMComboBox_SelectionChanged" Style="{StaticResource @InputComboBoxStyle}"></ComboBox>
+                                <ComboBox x:Name="JiraTestingALMComboBox" SelectionChanged="JiraTestingALMComboBox_SelectionChanged" Style="{StaticResource $FlatInputComboBoxStyle}"></ComboBox>
                             </StackPanel>
                         </Grid>
 

diff --git a/Ginger/Ginger/ALM/JIRA/JiraImportSetByIdPage.xaml b/Ginger/Ginger/ALM/JIRA/JiraImportSetByIdPage.xaml
@@ -10,7 +10,7 @@
 	  Title="Jira Import Test Set By Id">
 
 
-    <Grid Background="{StaticResource $BackgroundColor_LightGray}">
+    <Grid Background="{StaticResource $BackgroundColor_White}">
         <Grid.RowDefinitions>
             <RowDefinition Height="10"/>
             <RowDefinition Height="50"/>

diff --git a/Ginger/Ginger/ALM/JIRA/JiraZephyrCyclesExplorerPage.xaml b/Ginger/Ginger/ALM/JIRA/JiraZephyrCyclesExplorerPage.xaml
@@ -10,7 +10,7 @@
       Height="600" Width="700"
 	Title="">
 
-    <Grid x:Name="ExplorerTreeGrid" Background="{StaticResource $BackgroundColor_LightGray}">
+    <Grid x:Name="ExplorerTreeGrid" Background="{StaticResource $BackgroundColor_White}">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="400*"/>
             <ColumnDefinition Width="200*" x:Name="testSetDetailsColumn"/>
@@ -39,7 +39,7 @@
                             <GingerCore:ucTextDicResource Text="Mapped [BusinessFlow]:"/>
                         </Label.Content>
                     </Label>
-                    <TextBlock TextWrapping="WrapWithOverflow" x:Name="txtBoxTSMappedBF" DockPanel.Dock="Top"  HorizontalAlignment="Left" FontSize="12" Width="200" Foreground="{StaticResource $Color_DarkBlue}" Margin="2,0,0,0" >'BusinessFlow\aaa\ccc\vvv'</TextBlock>
+                    <TextBlock TextWrapping="WrapWithOverflow" x:Name="txtBoxTSMappedBF" DockPanel.Dock="Top"  HorizontalAlignment="Left" FontSize="12" Width="200" Foreground="{StaticResource $PrimaryColor_Black}" Margin="2,0,0,0" >'BusinessFlow\aaa\ccc\vvv'</TextBlock>
                 </DockPanel>
             </StackPanel>
         </ScrollViewer>

diff --git a/Ginger/Ginger/ALM/MapToALMWizard/TestCasesMappingPage.xaml b/Ginger/Ginger/ALM/MapToALMWizard/TestCasesMappingPage.xaml
@@ -11,7 +11,7 @@
       d:DesignHeight="450" d:DesignWidth="800"
       Title="TestCasesMappingPage">
 
-    <Grid Background="{StaticResource $BackgroundColor_LightGray}">
+    <Grid Background="{StaticResource $BackgroundColor_White}">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="250*"/>
             <ColumnDefinition Width="150*"/>

diff --git a/Ginger/Ginger/ALM/MapToALMWizard/TestSetMappingPage.xaml b/Ginger/Ginger/ALM/MapToALMWizard/TestSetMappingPage.xaml
@@ -9,7 +9,7 @@
       d:DesignHeight="450" d:DesignWidth="800"
       Title="TestSetMappingPage">
 
-    <Grid x:Name="xTestSetGrid" Margin="10,10,10,0" Background="{StaticResource $BackgroundColor_LightGray}">
+    <Grid x:Name="xTestSetGrid" Margin="10,10,10,0" Background="{StaticResource $BackgroundColor_White}">
         <Frame x:Name="load_frame" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" SizeChanged="load_frame_SizeChanged"/>
         <StackPanel Name="xMappedTestSetPanel" Visibility="Collapsed">
             <Label x:Name="xMappedTestSetLbl" Style="{StaticResource $LabelStyle}" Grid.Column="0" Content="Mapped Test Set:" VerticalAlignment="Top"/>

diff --git a/Ginger/Ginger/ALM/QC/QCManagerReport/QCManagerReportPage.xaml b/Ginger/Ginger/ALM/QC/QCManagerReport/QCManagerReportPage.xaml
@@ -20,7 +20,7 @@
         </x:ArrayExtension>
     </Page.Resources>
 
-    <Grid Background="{StaticResource $BackgroundColor_LightGray}">
+    <Grid Background="{StaticResource $BackgroundColor_White}">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="100*"/>
             <ColumnDefinition Width="60"/>
@@ -36,16 +36,16 @@
             <TextBox x:Name="QCTestSetsPathTextBox" Style="{StaticResource @MultiRowsTextBoxStyle}" Grid.Column="0" HorizontalAlignment="Stretch" DockPanel.Dock="Top" Height="25" FontWeight="Bold" IsReadOnly="True"/>
             <StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
                 <Label Content="View Type:" Style="{StaticResource @LabelStyle}" Margin="0,10,0,0"/>
-                <ComboBox x:Name="ViewComboBox" Margin="10" SelectionChanged="ViewComboBox_SelectionChanged" Style="{StaticResource @InputComboBoxStyle}" Width="150"/>
+                <ComboBox x:Name="ViewComboBox" Margin="10" SelectionChanged="ViewComboBox_SelectionChanged" Style="{StaticResource $FlatInputComboBoxStyle}" Width="150"/>
             </StackPanel>
             <StackPanel x:Name="ExecutionFilters" Orientation="Horizontal" DockPanel.Dock="Top" Margin="75,0,0,0">                
                 <StackPanel x:Name="ExecutionTesterFilter" Orientation="Horizontal">
                     <Label Content="Filter by Tester:" Style="{StaticResource @LabelStyle}" Margin="0,10,0,0"/>
-                    <ComboBox x:Name="ExecutionTesterFilterComboBox" Margin="10" Style="{StaticResource @InputComboBoxStyle}" Width="150"/>
+                    <ComboBox x:Name="ExecutionTesterFilterComboBox" Margin="10" Style="{StaticResource $FlatInputComboBoxStyle}" Width="150"/>
                 </StackPanel>
                 <StackPanel x:Name="ExecutionPeriodFilter" Orientation="Horizontal">
                     <Label Content="Filter by Execution Period:" Style="{StaticResource @LabelStyle}" Margin="0,10,0,0"/>
-                    <ComboBox x:Name="ExecutionPeriodFilterComboBox" Margin="10" Style="{StaticResource @InputComboBoxStyle}" Width="150"/>
+                    <ComboBox x:Name="ExecutionPeriodFilterComboBox" Margin="10" Style="{StaticResource $FlatInputComboBoxStyle}" Width="150"/>
                 </StackPanel>
             </StackPanel>
         </DockPanel>

diff --git a/Ginger/Ginger/ALM/QC/QCTestLabExplorerPage.xaml b/Ginger/Ginger/ALM/QC/QCTestLabExplorerPage.xaml
@@ -10,7 +10,7 @@
       Height="600" Width="700"
 	Title="">
 
-    <Grid x:Name="ExplorerTreeGrid" Background="{StaticResource $BackgroundColor_LightGray}">
+    <Grid x:Name="ExplorerTreeGrid" Background="{StaticResource $BackgroundColor_White}">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="400*"/>
             <ColumnDefinition Width="200*" x:Name="testSetDetailsColumn"/>
@@ -39,7 +39,7 @@
                             <GingerCore:ucTextDicResource Text="Mapped [BusinessFlow]:"/>
                         </Label.Content>
                     </Label>
-                    <TextBlock TextWrapping="WrapWithOverflow" x:Name="txtBoxTSMappedBF" DockPanel.Dock="Top"  HorizontalAlignment="Left" FontSize="12" Width="200" Foreground="{StaticResource $Color_DarkBlue}" Margin="2,0,0,0" >'BusinessFlow\aaa\ccc\vvv'</TextBlock>
+                    <TextBlock TextWrapping="WrapWithOverflow" x:Name="txtBoxTSMappedBF" DockPanel.Dock="Top"  HorizontalAlignment="Left" FontSize="12" Width="200" Foreground="{StaticResource $PrimaryColor_Black}" Margin="2,0,0,0" >'BusinessFlow\aaa\ccc\vvv'</TextBlock>
                 </DockPanel>
             </StackPanel>
         </ScrollViewer>

diff --git a/Ginger/Ginger/ALM/QC/QCTestPlanExplorerPage.xaml b/Ginger/Ginger/ALM/QC/QCTestPlanExplorerPage.xaml
@@ -9,7 +9,7 @@
       mc:Ignorable="d" 
       Height="600" Width="700" Title="QC/ALM Test Plan">
 
-    <Grid x:Name="ExplorerTreeGrid" Background="{StaticResource $BackgroundColor_LightGray}">
+    <Grid x:Name="ExplorerTreeGrid" Background="{StaticResource $BackgroundColor_White}">
 
         <Grid.RowDefinitions>
             <RowDefinition Height="580*"/>

diff --git a/Ginger/Ginger/ALM/Qtest/QtestCyclesExplorerPage.xaml b/Ginger/Ginger/ALM/Qtest/QtestCyclesExplorerPage.xaml
@@ -10,7 +10,7 @@
       Height="600" Width="700"
 	Title="">
 
-    <Grid x:Name="ExplorerTreeGrid" Background="{StaticResource $BackgroundColor_LightGray}">
+    <Grid x:Name="ExplorerTreeGrid" Background="{StaticResource $BackgroundColor_White}">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="400*"/>
             <ColumnDefinition Width="200*" x:Name="testSetDetailsColumn"/>
@@ -39,7 +39,7 @@
                             <GingerCore:ucTextDicResource Text="Mapped [BusinessFlow]:"/>
                         </Label.Content>
                     </Label>
-                    <TextBlock TextWrapping="WrapWithOverflow" x:Name="txtBoxTSMappedBF" DockPanel.Dock="Top"  HorizontalAlignment="Left" FontSize="12" Width="200" Foreground="{StaticResource $Color_DarkBlue}" Margin="2,0,0,0" >'BusinessFlow\aaa\ccc\vvv'</TextBlock>
+                    <TextBlock TextWrapping="WrapWithOverflow" x:Name="txtBoxTSMappedBF" DockPanel.Dock="Top"  HorizontalAlignment="Left" FontSize="12" Width="200" Foreground="{StaticResource $PrimaryColor_Black}" Margin="2,0,0,0" >'BusinessFlow\aaa\ccc\vvv'</TextBlock>
                 </DockPanel>
             </StackPanel>
         </ScrollViewer>

diff --git a/Ginger/Ginger/ALM/Qtest/QtestModuleExplorerPage.xaml b/Ginger/Ginger/ALM/Qtest/QtestModuleExplorerPage.xaml
@@ -9,7 +9,7 @@
       mc:Ignorable="d" 
       Height="600" Width="700" Title="Qtest/ALM Test Plan">
 
-    <Grid x:Name="ExplorerTreeGrid" Background="{StaticResource $BackgroundColor_LightGray}">
+    <Grid x:Name="ExplorerTreeGrid" Background="{StaticResource $BackgroundColor_White}">
 
         <Grid.RowDefinitions>
             <RowDefinition Height="580*"/>

diff --git a/Ginger/Ginger/ALM/RQM/RQMImportPlanByIdPage.xaml b/Ginger/Ginger/ALM/RQM/RQMImportPlanByIdPage.xaml
@@ -10,7 +10,7 @@
 	  Title="RQM Import Test Plan By Id">
 
 
-    <Grid Background="{StaticResource $BackgroundColor_LightGray}">
+    <Grid Background="{StaticResource $BackgroundColor_White}">
         <Grid.RowDefinitions>
             <RowDefinition Height="10"/>
             <RowDefinition Height="50"/>

diff --git a/Ginger/Ginger/ALM/ZephyrEnt/ZephyrEntPlanningExplorerPage.xaml b/Ginger/Ginger/ALM/ZephyrEnt/ZephyrEntPlanningExplorerPage.xaml
@@ -9,7 +9,7 @@
       Height="600" Width="700"
 	  Title="">
 
-    <Grid x:Name="ExplorerTreeGrid" Background="{StaticResource $BackgroundColor_LightGray}">
+    <Grid x:Name="ExplorerTreeGrid" Background="{StaticResource $BackgroundColor_White}">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="400*"/>
             <ColumnDefinition Width="200*" x:Name="testSetDetailsColumn"/>
@@ -38,7 +38,7 @@
                             <GingerCore:ucTextDicResource Text="Mapped [BusinessFlow]:"/>
                         </Label.Content>
                     </Label>
-                    <TextBlock TextWrapping="WrapWithOverflow" x:Name="txtBoxTSMappedBF" DockPanel.Dock="Top"  HorizontalAlignment="Left" FontSize="12" Width="200" Foreground="{StaticResource $Color_DarkBlue}" Margin="2,0,0,0" >'BusinessFlow\aaa\ccc\vvv'</TextBlock>
+                    <TextBlock TextWrapping="WrapWithOverflow" x:Name="txtBoxTSMappedBF" DockPanel.Dock="Top"  HorizontalAlignment="Left" FontSize="12" Width="200" Foreground="{StaticResource $PrimaryColor_Black}" Margin="2,0,0,0" >'BusinessFlow\aaa\ccc\vvv'</TextBlock>
                 </DockPanel>
             </StackPanel>
         </ScrollViewer>

diff --git a/Ginger/Ginger/ALM/ZephyrEnt/ZephyrEntRepositoryExplorerPage.xaml b/Ginger/Ginger/ALM/ZephyrEnt/ZephyrEntRepositoryExplorerPage.xaml
@@ -9,7 +9,7 @@
       d:DesignHeight="450" d:DesignWidth="800"
       Height="600" Width="700" Title="ALM Test Repository">
 
-    <Grid x:Name="ExplorerTreeGrid" Background="{StaticResource $BackgroundColor_LightGray}">
+    <Grid x:Name="ExplorerTreeGrid" Background="{StaticResource $BackgroundColor_White}">
         <Grid.RowDefinitions>
             <RowDefinition Height="580*"/>
             <RowDefinition Height="20"/>