Merge pull request #762 from yashas-hm/yhm/issue-732

golden_toolkit to flutter_test Migration: #732

Author: rolandgeider

ios/Podfile.lock

@@ -117,6 +117,6 @@ SPEC CHECKSUMS:
   url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
   video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
 
-PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048
+PODFILE CHECKSUM: 775997f741c536251164e3eacf6e34abf2eb7a17
 
 COCOAPODS: 1.16.2

lib/widgets/nutrition/meal.dart

@@ -301,40 +301,27 @@ class MealHeader extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final subtitleTime = _meal.time != null ? '${_meal.time!.format(context)} / ' : '';
+    final subtitleCalories = _meal.isRealMeal
+        ? getKcalConsumedVsPlanned(_meal, context)
+        : getKcalConsumed(_meal, context);
+    final subtitle = '$subtitleTime $subtitleCalories';
+
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         ListTile(
           contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-          title: Row(children: [
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(
-                    _meal.name,
-                    style: Theme.of(context).textTheme.titleLarge,
-                  ),
-                  Row(
-                    children: [
-                      if (_meal.time != null)
-                        Text(
-                          _meal.time!.format(context),
-                          style: Theme.of(context).textTheme.titleSmall,
-                        ),
-                      if (_meal.time != null) const SizedBox(width: 12),
-                      Text(
-                        _meal.isRealMeal
-                            ? getKcalConsumedVsPlanned(_meal, context)
-                            : getKcalConsumed(_meal, context),
-                        style: Theme.of(context).textTheme.titleSmall,
-                      ),
-                    ],
-                  ),
-                ],
-              ),
-            ),
-          ]),
+          title: Text(
+            _meal.name,
+            style: Theme.of(context).textTheme.titleLarge,
+            overflow: TextOverflow.ellipsis,
+          ),
+          subtitle: Text(
+            subtitle,
+            style: Theme.of(context).textTheme.titleSmall,
+            overflow: TextOverflow.ellipsis,
+          ),
           trailing: Row(
             mainAxisSize: MainAxisSize.min,
             children: [

pubspec.lock

@@ -599,14 +599,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.3"
-  golden_toolkit:
-    dependency: "direct dev"
-    description:
-      name: golden_toolkit
-      sha256: "8f74adab33154fe7b731395782797021f97d2edc52f7bfb85ff4f1b5c4a215f0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.15.0"
   graphs:
     dependency: transitive
     description:

pubspec.yaml

@@ -83,7 +83,6 @@ dev_dependencies:
   drift_dev: ^2.26.0
   flutter_lints: ^5.0.0
   freezed: ^3.0.4
-  golden_toolkit: ^0.15.0
   json_serializable: ^6.9.4
   mockito: ^5.4.4
   network_image_mock: ^2.1.1

test/nutrition/goldens/nutritional_plan_1_default_view.png

@@ -21,7 +21,6 @@ import 'dart:io';
 import 'package:drift/native.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:golden_toolkit/golden_toolkit.dart';
 import 'package:http/http.dart' as http;
 import 'package:mockito/annotations.dart';
 import 'package:provider/provider.dart';
@@ -67,6 +66,7 @@ void main() {
         ),
       ],
       child: MaterialApp(
+        key: GlobalKey(),
         locale: Locale(locale),
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
@@ -84,23 +84,22 @@ void main() {
     );
   }
 
-  testGoldens(
+  testWidgets(
     'Test the widgets on the nutritional plan screen',
     (tester) async {
-      await loadAppFonts();
-      final globalKey = GlobalKey();
-      await tester.pumpWidgetBuilder(
-        Material(key: globalKey),
-        wrapper: materialAppWrapper(
-          localizations: [AppLocalizations.delegate],
-        ),
-        surfaceSize: const Size(500, 1000),
-      );
+      tester.view.physicalSize = const Size(500, 1000);
+      tester.view.devicePixelRatio = 1.0; // Ensure correct pixel ratio
+
       await tester.pumpWidget(createNutritionalPlan());
       await tester.tap(find.byType(TextButton));
       await tester.pumpAndSettle();
 
-      await screenMatchesGolden(tester, 'nutritional_plan_1_default_view', skip: !Platform.isLinux);
+      if (Platform.isLinux) {
+        await expectLater(
+          find.byType(NutritionalPlanScreen),
+          matchesGoldenFile('goldens/nutritional_plan_1_default_view.png'),
+        );
+      }
 
       // Default view shows plan description, info button, and no ingredients
       expect(find.text('Less fat, more protein'), findsOneWidget);
@@ -113,11 +112,13 @@ void main() {
       var infoOutlineButtons = find.byIcon(Icons.info_outline);
       await tester.tap(infoOutlineButtons.first); // 2nd button shows up also, but is off-screen
       await tester.pumpAndSettle();
-      await screenMatchesGolden(
-        tester,
-        'nutritional_plan_2_one_meal_with_ingredients',
-        skip: !Platform.isLinux,
-      );
+
+      if (Platform.isLinux) {
+        await expectLater(
+          find.byType(NutritionalPlanScreen),
+          matchesGoldenFile('goldens/nutritional_plan_2_one_meal_with_ingredients.png'),
+        );
+      }
 
       // Ingredients show up now
       expect(find.text('100g Water'), findsOneWidget);
@@ -136,19 +137,27 @@ void main() {
 
       await tester.tap(infoOutlineButtons.first);
       await tester.pumpAndSettle();
-      await screenMatchesGolden(
-        tester,
-        'nutritional_plan_3_both_meals_with_ingredients',
-        skip: !Platform.isLinux,
-      );
+
+      if (Platform.isLinux) {
+        await expectLater(
+          find.byType(MaterialApp),
+          matchesGoldenFile('goldens/nutritional_plan_3_both_meals_with_ingredients.png'),
+        );
+      }
+
       expect(find.byIcon(Icons.info_outline), findsOneWidget);
       expect(find.byIcon(Icons.info), findsNWidgets(2));
 
       await tester.scrollUntilVisible(find.text('300g Broccoli cake'), 30);
       expect(find.text('300g Broccoli cake'), findsOneWidget);
 
       expect(find.byType(Card), findsNWidgets(3));
+
+      // Restore the original window size.
+      tester.view.resetPhysicalSize();
+      tester.view.resetDevicePixelRatio();
     },
+    tags: ['golden'],
   );
 
   testWidgets('Tests the localization of times - EN', (WidgetTester tester) async {