From ee8d06f464226362e3db440a1579f89d9a85e1df Mon Sep 17 00:00:00 2001 From: Julien <120588494+julien4215@users.noreply.github.com> Date: Thu, 16 Jan 2025 12:25:43 +0100 Subject: [PATCH 1/2] Add missing await to mockNetworkImagesFor --- test/view/broadcast/broadcast_list_screen_test.dart | 9 +++++---- test/view/broadcast/broadcast_round_screen_test.dart | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/view/broadcast/broadcast_list_screen_test.dart b/test/view/broadcast/broadcast_list_screen_test.dart index b76c3f55bc..d6a755c81c 100644 --- a/test/view/broadcast/broadcast_list_screen_test.dart +++ b/test/view/broadcast/broadcast_list_screen_test.dart @@ -46,7 +46,7 @@ final client = MockClient((request) { void main() { group('BroadcastListScreen', () { testWidgets('Displays broadcast tournament screen', variant: kPlatformVariant, (tester) async { - mockNetworkImagesFor(() async { + await mockNetworkImagesFor(() async { final app = await makeTestProviderScopeApp( tester, home: const BroadcastListScreen(), @@ -62,15 +62,16 @@ void main() { expect(find.byType(CircularProgressIndicator), findsOneWidget); - // wait for broadcast tournaments to load + // Wait for broadcast tournaments to load await tester.pump(const Duration(milliseconds: 100)); expect(find.byType(BroadcastCard), findsAtLeast(1)); }); }); + // TODO: Fix test for iOS testWidgets('Scroll broadcast tournament screen', variant: kPlatformVariant, (tester) async { - mockNetworkImagesFor(() async { + await mockNetworkImagesFor(() async { final app = await makeTestProviderScopeApp( tester, home: const BroadcastListScreen(), @@ -86,7 +87,7 @@ void main() { expect(find.byType(CircularProgressIndicator), findsOneWidget); - // wait for broadcast tournaments to load + // Wait for broadcast tournaments to load await tester.pump(const Duration(milliseconds: 100)); await tester.scrollUntilVisible(find.text('Completed'), 100.0); diff --git a/test/view/broadcast/broadcast_round_screen_test.dart b/test/view/broadcast/broadcast_round_screen_test.dart index 1ebb4c1fdd..f7d3094cc0 100644 --- a/test/view/broadcast/broadcast_round_screen_test.dart +++ b/test/view/broadcast/broadcast_round_screen_test.dart @@ -88,7 +88,7 @@ void main() { testWidgets('Test overview tab with an upcoming tournament', variant: kPlatformVariant, ( tester, ) async { - mockNetworkImagesFor(() async { + await mockNetworkImagesFor(() async { final client = MockClient((request) { if (request.url.path == '/api/broadcast/KnP1dgul') { return mockResponse( From 9c89e76283e2d1706865a7a8ae8b6cbbf9b35bba Mon Sep 17 00:00:00 2001 From: Julien <120588494+julien4215@users.noreply.github.com> Date: Sat, 18 Jan 2025 00:35:19 +0100 Subject: [PATCH 2/2] Fix broadcast list screen iOS test --- lib/src/view/broadcast/broadcast_list_screen.dart | 2 +- test/view/broadcast/broadcast_list_screen_test.dart | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/src/view/broadcast/broadcast_list_screen.dart b/lib/src/view/broadcast/broadcast_list_screen.dart index c20e559db2..ce03992a34 100644 --- a/lib/src/view/broadcast/broadcast_list_screen.dart +++ b/lib/src/view/broadcast/broadcast_list_screen.dart @@ -173,7 +173,7 @@ class _BodyState extends ConsumerState<_Body> { slivers: [ for (final section in sections) SliverMainAxisGroup( - key: ValueKey(section), + key: ValueKey(section.$1), slivers: [ if (Theme.of(context).platform == TargetPlatform.iOS) CupertinoSliverNavigationBar( diff --git a/test/view/broadcast/broadcast_list_screen_test.dart b/test/view/broadcast/broadcast_list_screen_test.dart index d6a755c81c..c394f8f66f 100644 --- a/test/view/broadcast/broadcast_list_screen_test.dart +++ b/test/view/broadcast/broadcast_list_screen_test.dart @@ -69,7 +69,6 @@ void main() { }); }); - // TODO: Fix test for iOS testWidgets('Scroll broadcast tournament screen', variant: kPlatformVariant, (tester) async { await mockNetworkImagesFor(() async { final app = await makeTestProviderScopeApp( @@ -90,7 +89,7 @@ void main() { // Wait for broadcast tournaments to load await tester.pump(const Duration(milliseconds: 100)); - await tester.scrollUntilVisible(find.text('Completed'), 100.0); + await tester.scrollUntilVisible(find.byKey(const ValueKey('past')), 100.0); }); }); });