Fix waitForRunFinishedAnalyticsEvent

Author: Amar3tto

playground/frontend/playground_components_dev/lib/src/widget_tester.dart

@@ -31,6 +31,33 @@ import 'examples/example_descriptor.dart';
 import 'expect.dart';
 
 extension WidgetTesterExtension on WidgetTester {
+  Future<RunFinishedAnalyticsEvent> waitForRunFinishedAnalyticsEvent({
+      Duration timeout = const Duration(seconds: 30),
+      Duration step = const Duration(milliseconds: 100),
+      Object? previousEvent, // optional guard
+    }) async {
+      final deadline = DateTime.now().add(timeout);
+
+      while (DateTime.now().isBefore(deadline)) {
+        // Drive frames/timers on Web-server device.
+        await pump(step);
+
+        final e = PlaygroundComponents.analyticsService.lastEvent;
+
+        // Optional: ensure we don't accept an old event from a previous run.
+        if (previousEvent != null && identical(e, previousEvent)) {
+          continue;
+        }
+
+        if (e is RunFinishedAnalyticsEvent) return e;
+      }
+
+      throw TestFailure(
+        'Timed out waiting for RunFinishedAnalyticsEvent. '
+        'Last event: ${PlaygroundComponents.analyticsService.lastEvent}',
+      );
+    }
+
   //workaround for https://github.com/flutter/flutter/issues/120060
   Future<void> enterCodeFieldText(String text) async {
     final codeField = widget(find.snippetCodeField());
@@ -148,38 +175,25 @@ extension WidgetTesterExtension on WidgetTester {
     expectOutputIfDeployed(example, this);
   }
 
-  Future<RunFinishedAnalyticsEvent> _waitForRunFinishedAnalyticsEvent({
-    Duration timeout = const Duration(seconds: 30),
-    Duration pollInterval = const Duration(milliseconds: 100),
-  }) async {
-    final sw = Stopwatch()..start();
-    while (sw.elapsed < timeout) {
-      final e = PlaygroundComponents.analyticsService.lastEvent;
-      if (e is RunFinishedAnalyticsEvent) return e;
-      await Future.delayed(pollInterval);
-    }
-    throw TestFailure(
-      'Timed out waiting for RunFinishedAnalyticsEvent. '
-      'Last event: ${PlaygroundComponents.analyticsService.lastEvent}',
-    );
-  }
-
   Future<void> modifyRunExpectReal(ExampleDescriptor example) async {
     modifyCodeController();
 
     final playgroundController = findPlaygroundController();
     final eventSnippetContext = playgroundController.eventSnippetContext;
     expect(eventSnippetContext.snippet, null);
 
+    final before = PlaygroundComponents.analyticsService.lastEvent;
     await tap(find.runOrCancelButton());
-    await pumpAndSettle();
+    await pump(); // start the click handler
 
     final actualText = findOutputText();
     expect(actualText, isNot(startsWith(kCachedResultsLog)));
     expectOutputIfDeployed(example, this);
 
-    // Wait until the run is fully finished and analytics event is emitted.
-    final finishedEvent = await _waitForRunFinishedAnalyticsEvent();
+    final finishedEvent = await waitForRunFinishedAnalyticsEvent(
+      previousEvent: before,
+      timeout: const Duration(seconds: 60), // optional bump for web
+    );
 
     expect(finishedEvent.snippetContext, eventSnippetContext);
   }