From ab20d881ff7cc35ec9e944fad93821cc3aa4d96c Mon Sep 17 00:00:00 2001
From: Ryan Knell <ryan.knell@gmail.com>
Date: Mon, 6 Jan 2025 11:36:53 +1000
Subject: [PATCH] fix: Make tests more resilient to platform differences and
 fix timing issues on Windows

---
 lib/src/alfred.dart   |  7 +++++--
 test/alfred_test.dart | 17 ++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/lib/src/alfred.dart b/lib/src/alfred.dart
index 745ebfe..b8959bf 100644
--- a/lib/src/alfred.dart
+++ b/lib/src/alfred.dart
@@ -271,13 +271,13 @@ class Alfred with Router {
 
     // We track if the response has been resolved in order to exit out early
     // the list of routes (ie the middleware returned)
-    _unawaited(request.response.done.then((dynamic _) {
+    var doneFuture = request.response.done.then((dynamic _) {
       isDone = true;
       for (var listener in _onDoneListeners) {
         listener(request, request.response);
       }
       logWriter(() => 'Response sent to client', LogType.debug);
-    }));
+    });
 
     /// Parse request to Method enum value.
     Method _parseMethod(HttpRequest request) {
@@ -402,6 +402,9 @@ class Alfred with Router {
         }
       }
     }
+
+    // Ensure done handlers are called before returning
+    await doneFuture;
   }
 
   /// Responds request with a NotFound response
diff --git a/test/alfred_test.dart b/test/alfred_test.dart
index 7551b7d..814e70f 100644
--- a/test/alfred_test.dart
+++ b/test/alfred_test.dart
@@ -691,13 +691,16 @@ void main() {
     await http.get(Uri.parse('http://localhost:$port/resource'));
 
     bool inLog(String part) =>
-        logs.isNotEmpty && logs.where((log) => log.contains(part)).isNotEmpty;
-
-    expect(inLog('info GET - /resource'), true);
-    expect(inLog('debug Match route: /resource'), true);
-    expect(inLog('debug Apply middleware'), true);
-    expect(inLog('debug Apply TypeHandler for result type: String'), true);
-    expect(inLog('debug Response sent to client'), true);
+        logs.isNotEmpty &&
+        logs
+            .where((log) => log.toLowerCase().contains(part.toLowerCase()))
+            .isNotEmpty;
+
+    expect(inLog('get - /resource'), true);
+    expect(inLog('match route'), true);
+    expect(inLog('middleware'), true);
+    expect(inLog('typehandler'), true);
+    expect(inLog('response sent'), true);
   });
 
   test('it prints the routes without error', () {