Merge branch 'master' into feature/measurements

# Conflicts:
#	pubspec.lock

test/nutritional_diary_test.dart

@@ -0,0 +1,59 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) 2020, 2021 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/widgets/nutrition/charts.dart';
+import 'package:wger/widgets/nutrition/nutritional_diary_detail.dart';
+
+import '../test_data/nutritional_plans.dart';
+
+void main() {
+  Widget getWidget({locale = 'en'}) {
+    return MaterialApp(
+      locale: Locale(locale),
+      localizationsDelegates: AppLocalizations.localizationsDelegates,
+      supportedLocales: AppLocalizations.supportedLocales,
+      home: SingleChildScrollView(
+        child: Card(
+          child: NutritionalDiaryDetailWidget(getNutritionalPlan(), DateTime(2021, 6, 1)),
+        ),
+      ),
+    );
+  }
+
+  testWidgets('Test the detail view for the nutritional plan', (WidgetTester tester) async {
+    await tester.pumpWidget(getWidget());
+
+    expect(find.byType(NutritionalPlanPieChartWidget), findsOneWidget);
+    expect(find.byType(Table), findsOneWidget);
+
+    expect(find.text('519kcal'), findsOneWidget, reason: 'find total energy');
+    expect(find.text('6g'), findsOneWidget, reason: 'find grams of protein');
+    expect(find.text('18g'), findsOneWidget, reason: 'find grams of carbs');
+    expect(find.text('4g'), findsOneWidget, reason: 'find grams of sugar');
+    expect(find.text('29g'), findsOneWidget, reason: 'find grams of fat');
+    expect(find.text('14g'), findsOneWidget, reason: 'find grams of saturated fat');
+    expect(find.text('50g'), findsOneWidget, reason: 'find grams of fibre');
+
+    expect(find.text('100g Water'), findsOneWidget, reason: 'Name of ingredient');
+    expect(find.text('75g Burger soup'), findsOneWidget, reason: 'Name of ingredient');
+    expect(find.byIcon(Icons.delete_outline), findsNWidgets(2));
+  });
+}

test/nutritional_plan_model_test.dart

@@ -25,14 +25,14 @@ void main() {
   group('model tests', () {
     test('Test the nutritionalValues method for nutritional plans', () {
       final plan = getNutritionalPlan();
-      final values = NutritionalValues.values(4118.75, 28.75, 347.5, 9.5, 41.0, 31.75, 41.5, 30.0);
+      final values = NutritionalValues.values(4118.75, 32.75, 347.5, 9.5, 59.0, 37.75, 52.5, 30.5);
       expect(plan.nutritionalValues, values);
     });
 
     test('Test the nutritionalValues method for meals', () {
       final plan = getNutritionalPlan();
       final meal = plan.meals.first;
-      final values = NutritionalValues.values(518.75, 1.75, 17.5, 3.5, 11.0, 7.75, 38.5, 0.0);
+      final values = NutritionalValues.values(518.75, 5.75, 17.5, 3.5, 29.0, 13.75, 49.5, 0.5);
       expect(meal.nutritionalValues, values);
     });
   });

test/nutritional_plan_screen_test.dart

@@ -20,6 +20,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:provider/provider.dart';
+import 'package:wger/providers/body_weight.dart';
 import 'package:wger/providers/nutrition.dart';
 import 'package:wger/screens/nutritional_plan_screen.dart';
 import 'package:wger/widgets/nutrition/charts.dart';
@@ -35,8 +36,15 @@ void main() {
 
     final plan = getNutritionalPlan();
 
-    return ChangeNotifierProvider<NutritionPlansProvider>(
-      create: (context) => NutritionPlansProvider(testAuthProvider, [], client),
+    return MultiProvider(
+      providers: [
+        ChangeNotifierProvider<NutritionPlansProvider>(
+          create: (context) => NutritionPlansProvider(testAuthProvider, [], client),
+        ),
+        ChangeNotifierProvider<BodyWeightProvider>(
+          create: (context) => BodyWeightProvider(testAuthProvider, [], client),
+        ),
+      ],
       child: MaterialApp(
         locale: Locale(locale),
         localizationsDelegates: AppLocalizations.localizationsDelegates,