Merge pull request #1760 from Ginger-Automation/BugFix/ALMIssuesFixes…

…ForRelease Bug fix/alm issues fixes for release
Ginger-Automation · Oct 30, 2020 · 7d75617 · 7d75617
2 parents 6db3557 + 0ac97de
commit 7d75617
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Ginger/Ginger/ALM/Repository/JIRA_Repository.cs b/Ginger/Ginger/ALM/Repository/JIRA_Repository.cs
@@ -237,7 +237,7 @@ public override void ImportALMTests(string importDestinationFolderPath)
         {
             if (ALMCore.DefaultAlmConfig.JiraTestingALM == GingerCoreNET.ALMLib.ALMIntegration.eTestingALMType.Xray)
             {
-                JIRA.JiraImportReviewPage win = new JIRA.JiraImportReviewPage();
+                JIRA.JiraImportReviewPage win = new JIRA.JiraImportReviewPage(importDestinationPath:importDestinationFolderPath);
                 win.ShowAsWindow();
             }
             if (ALMCore.DefaultAlmConfig.JiraTestingALM == GingerCoreNET.ALMLib.ALMIntegration.eTestingALMType.Zephyr)
@@ -274,7 +274,7 @@ public override bool ImportSelectedTests(string importDestinationPath, IEnumerab
                         Reporter.ToStatus(eStatusMsgKey.ALMTestSetImport, null, selectedTS.Name);
                         JiraTestSet jiraImportedTSData = ((JiraCore)this.AlmCore).GetJiraTestSetData(selectedTS);
 
-                        SetImportedTS(jiraImportedTSData);
+                        SetImportedTS(jiraImportedTSData, importDestinationPath);
                     }
                     catch (Exception ex)
                     {
@@ -399,7 +399,7 @@ public bool ImportSelectedZephyrCyclesAndFolders(string importDestinationPath, I
             return false;
         }
 
-        private void SetImportedTS(JiraTestSet importedTS)
+        private void SetImportedTS(JiraTestSet importedTS, string importDestinationPath)
         {
             ALMIntegration.Instance.AlmCore.GingerActivitiesGroupsRepo = WorkSpace.Instance.SolutionRepository.GetAllRepositoryItems<ActivitiesGroup>();
             ALMIntegration.Instance.AlmCore.GingerActivitiesRepo = WorkSpace.Instance.SolutionRepository.GetAllRepositoryItems<Activity>();
@@ -411,7 +411,7 @@ private void SetImportedTS(JiraTestSet importedTS)
                 SetBFPropertiesAfterImport(tsBusFlow);
 
                 //save bf
-                WorkSpace.Instance.SolutionRepository.AddRepositoryItem(tsBusFlow);
+                AddTestSetFlowToFolder(tsBusFlow, importDestinationPath);
                 Reporter.HideStatusMessage();
             }
             catch { }