Merge pull request #1694 from nextcloud/refactor/tests-only-use-testapp

nextcloud · Mar 2, 2024 · 7a8bc6c · 7a8bc6c
2 parents f7a293b + 3c1e444
commit 7a8bc6c
Show file tree

Hide file tree

Showing 24 changed files with 34 additions and 57 deletions.
diff --git a/packages/neon/neon_dashboard/test/goldens/widget.png b/packages/neon/neon_dashboard/test/goldens/widget.png
diff --git a/packages/neon/neon_dashboard/test/goldens/widget_button_invalid.png b/packages/neon/neon_dashboard/test/goldens/widget_button_invalid.png
diff --git a/packages/neon/neon_dashboard/test/goldens/widget_button_more.png b/packages/neon/neon_dashboard/test/goldens/widget_button_more.png
diff --git a/packages/neon/neon_dashboard/test/goldens/widget_button_new.png b/packages/neon/neon_dashboard/test/goldens/widget_button_new.png
diff --git a/packages/neon/neon_dashboard/test/goldens/widget_button_setup.png b/packages/neon/neon_dashboard/test/goldens/widget_button_setup.png
diff --git a/packages/neon/neon_dashboard/test/goldens/widget_item.png b/packages/neon/neon_dashboard/test/goldens/widget_item.png
diff --git a/packages/neon/neon_dashboard/test/goldens/widget_item_not_round.png b/packages/neon/neon_dashboard/test/goldens/widget_item_not_round.png
diff --git a/packages/neon/neon_dashboard/test/goldens/widget_not_round.png b/packages/neon/neon_dashboard/test/goldens/widget_not_round.png
diff --git a/packages/neon/neon_dashboard/test/goldens/widget_with_empty.png b/packages/neon/neon_dashboard/test/goldens/widget_with_empty.png
diff --git a/packages/neon/neon_dashboard/test/goldens/widget_with_half_empty.png b/packages/neon/neon_dashboard/test/goldens/widget_with_half_empty.png
diff --git a/packages/neon/neon_dashboard/test/goldens/widget_with_multiple_buttons.png b/packages/neon/neon_dashboard/test/goldens/widget_with_multiple_buttons.png
diff --git a/packages/neon/neon_dashboard/test/goldens/widget_without_buttons.png b/packages/neon/neon_dashboard/test/goldens/widget_without_buttons.png
diff --git a/packages/neon/neon_dashboard/test/goldens/widget_without_items.png b/packages/neon/neon_dashboard/test/goldens/widget_without_items.png
diff --git a/packages/neon/neon_dashboard/test/widget_test.dart b/packages/neon/neon_dashboard/test/widget_test.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';
-import 'package:neon_dashboard/l10n/localizations.dart' show DashboardLocalizations;
 import 'package:neon_dashboard/l10n/localizations.dart';
 import 'package:neon_dashboard/src/pages/main.dart';
 import 'package:neon_dashboard/src/widgets/widget.dart';
@@ -16,15 +15,12 @@ import 'package:neon_framework/widgets.dart';
 import 'package:nextcloud/dashboard.dart' as dashboard;
 import 'package:rxdart/rxdart.dart';
 
-Widget wrapWidget(AccountsBloc accountsBloc, Widget child) => MaterialApp(
+Widget wrapWidget(AccountsBloc accountsBloc, Widget child) => TestApp(
       localizationsDelegates: DashboardLocalizations.localizationsDelegates,
       supportedLocales: DashboardLocalizations.supportedLocales,
-      home: Scaffold(
-        backgroundColor: Colors.transparent,
-        body: NeonProvider<AccountsBloc>.value(
-          value: accountsBloc,
-          child: child,
-        ),
+      child: NeonProvider<AccountsBloc>.value(
+        value: accountsBloc,
+        child: child,
       ),
     );
 

diff --git a/packages/neon/neon_talk/test/goldens/unread_indicator_unread_mention.png b/packages/neon/neon_talk/test/goldens/unread_indicator_unread_mention.png
diff --git a/packages/neon/neon_talk/test/goldens/unread_indicator_unread_mention_direct.png b/packages/neon/neon_talk/test/goldens/unread_indicator_unread_mention_direct.png
diff --git a/packages/neon/neon_talk/test/goldens/unread_indicator_unread_messages.png b/packages/neon/neon_talk/test/goldens/unread_indicator_unread_messages.png
diff --git a/...es/neon/neon_talk/test/goldens/unread_indicator_unread_single_user_messages.png b/...es/neon/neon_talk/test/goldens/unread_indicator_unread_single_user_messages.png
diff --git a/packages/neon/neon_talk/test/message_preview_test.dart b/packages/neon/neon_talk/test/message_preview_test.dart
@@ -1,15 +1,17 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';
+import 'package:neon_framework/testing.dart';
 import 'package:neon_talk/l10n/localizations.dart';
 import 'package:neon_talk/src/widgets/message_preview.dart';
 import 'package:nextcloud/spreed.dart' as spreed;
 
 class MockChatMessage extends Mock implements spreed.ChatMessage {}
 
-Widget wrapWidget(Widget child) => MaterialApp(
+Widget wrapWidget(Widget child) => TestApp(
       localizationsDelegates: TalkLocalizations.localizationsDelegates,
-      home: Material(
+      supportedLocales: TalkLocalizations.supportedLocales,
+      child: Material(
         child: child,
       ),
     );

diff --git a/packages/neon/neon_talk/test/room_avatar_test.dart b/packages/neon/neon_talk/test/room_avatar_test.dart
@@ -14,8 +14,8 @@ import 'package:rxdart/subjects.dart';
 
 class MockRoom extends Mock implements spreed.Room {}
 
-Widget wrapWidget(AccountsBloc accountsBloc, Widget child) => MaterialApp(
-      home: NeonProvider<AccountsBloc>.value(
+Widget wrapWidget(AccountsBloc accountsBloc, Widget child) => TestApp(
+      child: NeonProvider<AccountsBloc>.value(
         value: accountsBloc,
         child: child,
       ),

diff --git a/packages/neon/neon_talk/test/unread_indicator_test.dart b/packages/neon/neon_talk/test/unread_indicator_test.dart
@@ -1,17 +1,11 @@
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';
+import 'package:neon_framework/testing.dart';
 import 'package:neon_talk/src/widgets/unread_indicator.dart';
 import 'package:nextcloud/spreed.dart' as spreed;
 
 class MockRoom extends Mock implements spreed.Room {}
 
-Widget wrapWidget(Widget child) => MaterialApp(
-      home: Material(
-        child: child,
-      ),
-    );
-
 void main() {
   testWidgets('Unread messages', (tester) async {
     final room = MockRoom();
@@ -21,8 +15,8 @@ void main() {
     when(() => room.type).thenReturn(spreed.RoomType.group.value);
 
     await tester.pumpWidget(
-      wrapWidget(
-        TalkUnreadIndicator(
+      TestApp(
+        child: TalkUnreadIndicator(
           room: room,
         ),
       ),
@@ -41,8 +35,8 @@ void main() {
     when(() => room.type).thenReturn(spreed.RoomType.oneToOne.value);
 
     await tester.pumpWidget(
-      wrapWidget(
-        TalkUnreadIndicator(
+      TestApp(
+        child: TalkUnreadIndicator(
           room: room,
         ),
       ),
@@ -61,8 +55,8 @@ void main() {
     when(() => room.type).thenReturn(spreed.RoomType.group.value);
 
     await tester.pumpWidget(
-      wrapWidget(
-        TalkUnreadIndicator(
+      TestApp(
+        child: TalkUnreadIndicator(
           room: room,
         ),
       ),
@@ -80,8 +74,8 @@ void main() {
     when(() => room.unreadMentionDirect).thenReturn(true);
 
     await tester.pumpWidget(
-      wrapWidget(
-        TalkUnreadIndicator(
+      TestApp(
+        child: TalkUnreadIndicator(
           room: room,
         ),
       ),

diff --git a/packages/neon_framework/test/drawer_test.dart b/packages/neon_framework/test/drawer_test.dart
@@ -4,7 +4,6 @@ import 'package:built_collection/built_collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';
-import 'package:neon_framework/l10n/localizations.dart';
 import 'package:neon_framework/src/bloc/result.dart';
 import 'package:neon_framework/src/blocs/accounts.dart';
 import 'package:neon_framework/src/models/app_implementation.dart';
@@ -53,15 +52,10 @@ void main() {
     when(() => accountsBloc.activeCapabilitiesBloc).thenReturn(capabilitiesBloc);
 
     await tester.pumpWidget(
-      MaterialApp(
-        localizationsDelegates: NeonLocalizations.localizationsDelegates,
-        supportedLocales: NeonLocalizations.supportedLocales,
-        home: Scaffold(
-          backgroundColor: Colors.transparent,
-          body: NeonProvider<AccountsBloc>.value(
-            value: accountsBloc,
-            child: const NeonDrawer(),
-          ),
+      TestApp(
+        child: NeonProvider<AccountsBloc>.value(
+          value: accountsBloc,
+          child: const NeonDrawer(),
         ),
       ),
     );

diff --git a/packages/neon_framework/test/image_test.dart b/packages/neon_framework/test/image_test.dart
@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';
-import 'package:neon_framework/l10n/localizations.dart';
 import 'package:neon_framework/src/bloc/result.dart';
 import 'package:neon_framework/src/utils/request_manager.dart';
 import 'package:neon_framework/src/widgets/error.dart';
@@ -39,10 +38,8 @@ void main() {
     final callback = MockCallbackFunction<void>();
 
     await tester.pumpWidget(
-      MaterialApp(
-        localizationsDelegates: NeonLocalizations.localizationsDelegates,
-        supportedLocales: NeonLocalizations.supportedLocales,
-        home: NeonImage(
+      TestApp(
+        child: NeonImage(
           image: image,
           onRetry: callback.call,
         ),
@@ -109,10 +106,8 @@ void main() {
     });
 
     await tester.pumpWidget(
-      MaterialApp(
-        localizationsDelegates: NeonLocalizations.localizationsDelegates,
-        supportedLocales: NeonLocalizations.supportedLocales,
-        home: NeonApiImage.withAccount(
+      TestApp(
+        child: NeonApiImage.withAccount(
           getImage: getImage.call,
           cacheKey: 'key',
           etag: null,
@@ -155,10 +150,8 @@ void main() {
 
     final uri = Uri.parse('https://example.com');
     await tester.pumpWidget(
-      MaterialApp(
-        localizationsDelegates: NeonLocalizations.localizationsDelegates,
-        supportedLocales: NeonLocalizations.supportedLocales,
-        home: NeonUriImage.withAccount(
+      TestApp(
+        child: NeonUriImage.withAccount(
           uri: uri,
           account: mockAccount,
         ),

diff --git a/packages/neon_framework/test/user_avatar_test.dart b/packages/neon_framework/test/user_avatar_test.dart
@@ -3,10 +3,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:neon_framework/blocs.dart';
-import 'package:neon_framework/l10n/localizations.dart';
-import 'package:neon_framework/src/testing/mocks.dart';
 import 'package:neon_framework/src/utils/provider.dart';
 import 'package:neon_framework/src/widgets/user_avatar.dart';
+import 'package:neon_framework/testing.dart';
 import 'package:neon_framework/widgets.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:nextcloud/user_status.dart' as user_status;
@@ -48,9 +47,8 @@ void main() {
       when(() => accountsBloc.getUserStatusBlocFor(account)).thenReturn(userStatusBloc);
 
       await tester.pumpWidget(
-        MaterialApp(
-          localizationsDelegates: NeonLocalizations.localizationsDelegates,
-          home: NeonProvider<AccountsBloc>.value(
+        TestApp(
+          child: NeonProvider<AccountsBloc>.value(
             value: accountsBloc,
             child: NeonUserAvatar(
               showStatus: withStatus,
@@ -75,8 +73,8 @@ void main() {
     ]) {
       testWidgets('${status.value} ${icon != null ? 'with' : 'without'} emoji', (tester) async {
         await tester.pumpWidget(
-          MaterialApp(
-            home: NeonUserStatusIndicator(
+          TestApp(
+            child: NeonUserStatusIndicator(
               result: Result<user_status.$PublicInterface>(
                 user_status.Public(
                   (b) => b