Update TC-Dashboard-100 date and refactor RunCommand and TestCaseExecutor for improved navigation and error handling

Author: Thomas Duft

samples/Runs/Dashboard/TC-Dashboard-100.md

@@ -1,6 +1,6 @@
 # TC-Dashboard-100: Dashboard as administrator
 
-- **Date**: 2024-12-10
+- **Date**: 2025-01-17
 - **Test Priority**: High
 - **Module Name**: Dashboard
 - **Type**: Execution

src/testr.Cli/Commands/RunCommand.cs

@@ -60,7 +60,7 @@ public RunCommand()
     );
 
     _continueOnFailure = Option<bool>(
-      "-c|--continue-on-failure",
+      "--continue-on-failure",
       "Continues the Test Case execution even if the Test Case fails.",
       CommandOptionType.NoValue,
       cfg => cfg.DefaultValue = false,

src/testr.Cli/Domain/TestCaseExecutor.cs

@@ -35,24 +35,24 @@ CancellationToken cancellationToken
     // execute precondition instructions if available
     if (preconditionExecutionParam != null)
     {
+      await NavigateToRouteAsync(page, domain, preconditionExecutionParam.Route);
+
       foreach (var instruction in preconditionExecutionParam.Instructions)
       {
         await TestAsync(
           page,
-          domain,
-          preconditionExecutionParam.Route,
           instruction,
           instruction => ConsoleHelper.WriteLine($"- Executing step: {instruction.TestStep.Id} - {instruction.TestStep.Description}")
         );
       }
     }
 
+    await NavigateToRouteAsync(page, domain, executionParam.Route);
+
     foreach (var instruction in executionParam.Instructions)
     {
       var result = await TestAsync(
         page,
-        domain,
-        executionParam.Route,
         instruction,
         instruction => ConsoleHelper.WriteLineYellow($"- Executing step: {instruction.TestStep.Id} - {instruction.TestStep.Description}")
       );
@@ -93,37 +93,44 @@ private async Task<IBrowserContext> GetBrowserContext(IBrowser browser)
     return context;
   }
 
-  private async Task<TestStepResult> TestAsync(
+  private async Task NavigateToRouteAsync(
     IPage page,
     string domain,
-    string route,
-    TestStepInstruction instruction,
-    Action<TestStepInstruction> consoleAction
+    string route
   )
   {
-    try
+    var requestUri = $"{domain}/{route}";
+    if (requestUri != _requestUri)
     {
-      var requestUri = $"{domain}/{route}";
-      if (requestUri != _requestUri)
+      await page.GotoAsync(requestUri);
+      _requestUri = requestUri;
+
+      // being safe and try again in certain case :-)
+      if (!page.Url.StartsWith(requestUri))
       {
-        await page.GotoAsync(requestUri);
-        _requestUri = requestUri;
+        await Task.Delay(1000);
 
-        // being safe and try again in certain case :-)
-        if (!page.Url.StartsWith(requestUri))
-        {
-          await page.GotoAsync(requestUri);
-        }
+        await page.GotoAsync(requestUri);
       }
+    }
+  }
 
+  private async Task<TestStepResult> TestAsync(
+    IPage page,
+    TestStepInstruction instruction,
+    Action<TestStepInstruction> consoleAction
+  )
+  {
+    try
+    {
       await ProcessStepAsync(page, instruction, consoleAction);
-
-      return TestStepResult.Success(instruction.TestStep);
     }
     catch (Exception ex)
     {
       return TestStepResult.Failed(instruction.TestStep, ex.Message);
     }
+
+    return TestStepResult.Success(instruction.TestStep);
   }
 
   private static async Task<bool> ProcessStepAsync(

src/testr.Cli/Domain/TestStepResult.cs

@@ -28,7 +28,14 @@ public static TestStepResult Failed(TestStep step, string error)
     return new TestStepResult(step)
     {
       IsSuccess = false,
-      Error = error
+      Error = SanitizeError(error)
     };
   }
+
+  private static string SanitizeError(string error)
+  {
+    return error
+      .Replace("\r\n", " ")
+      .Replace("\n", " ");
+  }
 }