Merge pull request #130 from Lombiq/issue/OSOE-76

OSOE-76: Make WebAppConfigHelper probe the Release directory too
Lombiq · Feb 16, 2022 · a121853 · a121853
2 parents a457326 + a25d362
commit a121853
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/Lombiq.Tests.UI/Helpers/WebAppConfigHelper.cs b/Lombiq.Tests.UI/Helpers/WebAppConfigHelper.cs
@@ -15,15 +15,27 @@ public static class WebAppConfigHelper
         /// <returns>The absolute path to the assembly (DLL) of the application being tested.</returns>
         public static string GetAbsoluteApplicationAssemblyPath(string webAppName, string frameworkFolderName = "net5.0")
         {
-            var baseDirectory = File.Exists(webAppName + ".dll")
-                ? AppContext.BaseDirectory
-                : Path.Combine(
+            string baseDirectory;
+
+            if (File.Exists(webAppName + ".dll"))
+            {
+                baseDirectory = AppContext.BaseDirectory;
+            }
+            else
+            {
+                var outputFolderContainingPath = Path.Combine(
                     AppContext.BaseDirectory.Split(new[] { "src", "test" }, StringSplitOptions.RemoveEmptyEntries)[0],
                     "src",
                     webAppName,
-                    "bin",
-                    "Debug",
-                    frameworkFolderName);
+                    "bin");
+
+                baseDirectory = Path.Combine(outputFolderContainingPath, "Debug", frameworkFolderName);
+
+                if (!Directory.Exists(baseDirectory))
+                {
+                    baseDirectory = Path.Combine(outputFolderContainingPath, "Release", frameworkFolderName);
+                }
+            }
 
             return Path.Combine(baseDirectory, webAppName + ".dll");
         }