Fix integration tests

sillsdev · Apr 26, 2024 · 375907c · 375907c
1 parent ec3b763
commit 375907c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/backend/Testing/Fixtures/IntegrationFixture.cs b/backend/Testing/Fixtures/IntegrationFixture.cs
@@ -45,6 +45,7 @@ private static void DeletePreviousTestFiles()
 
     private void InitTemplateRepo()
     {
+        if (TemplateRepo.Exists) return;
         using var stream = TemplateRepoZip.OpenRead();
         ZipFile.ExtractToDirectory(stream, TemplateRepo.FullName);
     }

diff --git a/backend/Testing/Services/Utils.cs b/backend/Testing/Services/Utils.cs
@@ -1,5 +1,6 @@
 using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
+using Quartz.Util;
 using Shouldly;
 using Testing.ApiTests;
 using static Testing.Services.Constants;
@@ -26,7 +27,7 @@ public static ProjectConfig GetNewProjectConfig(HgProtocol? protocol = null, [Ca
         var id = Guid.NewGuid();
         var shortId = id.ToString().Split("-")[0];
         var projectCode = $"{ToProjectCodeFriendlyString(projectName)}-{shortId}-dev-flex";
-        var dir = GetNewProjectDir(projectCode, projectName);
+        var dir = GetNewProjectDir(projectCode, "");
         return new ProjectConfig(id, projectName, projectCode, dir);
     }
 
@@ -90,7 +91,7 @@ public static async Task WaitForLexboxMetadataUpdateAsync()
     private static string GetNewProjectDir(string projectCode,
         [CallerMemberName] string projectName = "")
     {
-        var projectDir = Path.Join(BasePath, projectName);
+        var projectDir = projectName.IsNullOrWhiteSpace() ? BasePath : Path.Join(BasePath, projectName);
         // Add a random id to the path to be certain we prevent naming clashes
         var randomIndexedId = $"{_folderIndex++}-{Guid.NewGuid().ToString().Split("-")[0]}";
         //fwdata file containing folder name will be the same as the file name