From 5341bea0aed5bed344201bb9e18882ccd71d04b3 Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Thu, 12 Nov 2026 15:19:04 -0800 Subject: [PATCH] Wait for CSS generation and reload events in CLI test --- .../test/integration/css_hot_reload_test.dart | 66 ++++++++----------- 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/packages/jaspr_cli/test/integration/css_hot_reload_test.dart b/packages/jaspr_cli/test/integration/css_hot_reload_test.dart index ae600abb2..7be0bb27d 100644 --- a/packages/jaspr_cli/test/integration/css_hot_reload_test.dart +++ b/packages/jaspr_cli/test/integration/css_hot_reload_test.dart @@ -1,14 +1,11 @@ -// ignore_for_file: avoid_print - -import 'dart:async'; import 'dart:io'; -import 'package:http/http.dart' as http; import 'package:jaspr_cli/src/commands/create_command.dart'; import 'package:jaspr_cli/src/commands/serve_command.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; +import '../src/fakes/fake_io.dart'; import 'commands_integration_test.dart'; import 'utils.dart'; import 'variants.dart'; @@ -67,45 +64,40 @@ final styles = [ """; stylesFile.writeAsStringSync(stylesContent); - final serveResult = runner.run('serve --auto=reload -v', dir: dirs.app, checkExitCode: false); - - // Wait until server is started. - await Future.delayed(Duration(seconds: 10)); - while (true) { - try { - await http.head(Uri.parse('http://localhost:8080')); - break; - } on SocketException catch (_) {} - await Future.delayed(Duration(seconds: 5)); - } + final output = FakeIOSink(); + final serveResult = IOOverrides.runZoned( + () => runner.run('serve --auto=reload -v', dir: dirs.app, checkExitCode: false), + stdin: FakeStdin.new, + stdout: () => FakeStdout(output.sink), + ).whenComplete(output.sink.close); + addTearDown(() async { + await output.queue.cancel(immediate: true); + await runner.runner.commands.values.whereType().single.stop(); + expect(await serveResult, 0); + }); - // Wait a little extra to ensure initial CSS is completely built - await Future.delayed(Duration(seconds: 2)); - - // Check initial CSS final cssFile = File(p.join(appDir.path, '.dart_tool', 'jaspr', 'generated', 'main.css')); - expect(cssFile.existsSync(), isTrue); + await expectLater( + output.queue, + emitsWithTimeout(emitsThrough(contains('Generated main.css')), timeout: Duration(minutes: 3)), + ); expect(cssFile.readAsStringSync(), contains('.test-class {\n color: red;\n}')); - // Mutate CSS + // The server only starts after the initial CSS generation completes, + // so once it's listening, startup has settled and the next change + // to the styles file triggers a regular rebuild and CSS reload. + await expectLater( + output.queue, + emitsWithTimeout(emitsThrough(contains('Server started and listening on ')), timeout: Duration(minutes: 1)), + ); stylesContent = stylesContent.replaceAll('color: Colors.red', 'color: Colors.blue'); stylesFile.writeAsStringSync(stylesContent); - // Wait for hot reload and poll - bool updated = false; - for (var i = 0; i < 20; i++) { - await Future.delayed(Duration(seconds: 2)); - if (cssFile.readAsStringSync().contains('.test-class {\n color: blue;\n}')) { - updated = true; - break; - } - } - - expect(updated, isTrue, reason: 'CSS was not updated within 40 seconds'); - - // Wait for the server to be stopped. - await runner.runner.commands.values.whereType().firstOrNull?.stop(); - await serveResult; - }, timeout: Timeout(Duration(minutes: 4))); + await expectLater( + output.queue, + emitsWithTimeout(emitsThrough(contains('Reloaded main.css')), timeout: Duration(seconds: 40)), + ); + expect(cssFile.readAsStringSync(), contains('.test-class {\n color: blue;\n}')); + }, timeout: Timeout(Duration(minutes: 5))); }); }