fix: review fixes

This commit is contained in:
misha
2026-11-19 11:00:41 +03:00
parent ce073b5a95
commit 29ee8ae5a8
13 changed files with 466 additions and 47 deletions

View File

@@ -1,3 +1,5 @@
import 'dart:async';
import 'package:dio/dio.dart';
import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
import 'package:eatvio_app/features/consultations/models/consultation_model.dart';
@@ -1424,6 +1426,27 @@ void main() {
name: 'Овсянка',
portion: Portion.grams,
quantity: 150,
productNutritionalValueId: 42,
dailyNutrition: DailyNutrition(
energy: 195,
proteins: 7,
fats: 4,
carbohydrates: 32,
),
),
},
2: {
1: DailySchedule(
name: 'Гречка',
portion: Portion.pcs,
quantity: 2,
productNutritionalValueId: 7,
dailyNutrition: DailyNutrition(
energy: 220,
proteins: 8,
fats: 3,
carbohydrates: 40,
),
),
},
},
@@ -1448,8 +1471,267 @@ void main() {
expect(result, true);
expect(diaryCubit!.state, isA<DiaryStateLoadedTomorrowWithDiet>());
final loaded = diaryCubit!.state as DiaryStateLoadedTomorrowWithDiet;
expect(loaded.diary.meals.first.portions.single.productName, 'Овсянка');
expect(loaded.diary.meals, hasLength(5));
final oatmeal = loaded.diary.meals[0];
expect(oatmeal.typeNumber, 1);
expect(oatmeal.portions.single.productName, 'Овсянка');
expect(oatmeal.portions.single.productNutritionalValueId, 42);
expect(
oatmeal.portions.single.productCaloriesInfo?.calories,
closeTo(195 * 100 / 150, 0.001),
);
final buckwheat = loaded.diary.meals[1];
expect(buckwheat.typeNumber, 2);
expect(buckwheat.portions.single.productName, 'Гречка');
expect(buckwheat.portions.single.productNutritionalValueId, 7);
expect(buckwheat.portions.single.productCaloriesInfo?.energyOnPortion, 220);
},
);
test('fetchDiaryV2 - пустая диета не оставляет экран в загрузке', () async {
diaryCubit = DiaryCubit(
diaryRepository: mockDiaryRepository,
glossaryRepository: mockGlossaryRepository,
profileRepository: mockProfileRepository,
dietRepository: mockDietRepository,
chatRepository: mockChatRepository,
settingsRepository: mockSettingsRepository,
);
when(
mockDiaryRepository.createDiaryDay(day: anyNamed('day')),
).thenAnswer((_) async {});
when(
mockDiaryRepository.getDiaryDayV2(day: anyNamed('day')),
).thenAnswer((_) async => testDiaryDay);
when(
mockDiaryRepository.getNutritionData(any),
).thenAnswer((_) async => testNutrition);
when(mockSettingsRepository.getProfileSettings()).thenAnswer(
(_) async => const ProfileSettingsModel(
isMoodFillable: true,
isBedtimeFillable: true,
isPublicProfile: true,
newUpdatesNotifications: null,
diaryReminderNotifications: null,
),
);
expect(await diaryCubit!.setSelectedDay(DateTime(2024, 1, 15)), true);
await Future<void>.delayed(const Duration(milliseconds: 50));
expect(diaryCubit!.state, isA<DiaryStateLoaded>());
when(mockDiaryRepository.getDiaryDayV2(day: anyNamed('day'))).thenAnswer(
(_) async => const DiaryDayModel(
id: null,
date: '2024-01-20',
closed: 0,
comment: '',
typeOfDiary: TypeOfDiaryModel(
hasChosenDiet: true,
hasChosenPlan: false,
diaryState: null,
),
meals: [],
chosenPlanId: null,
dayOfChosenDiet: null,
diet: null,
),
);
final result = await diaryCubit!.setSelectedDay(DateTime(2024, 1, 20));
expect(result, false);
expect(diaryCubit!.state, isA<DiaryStateLoaded>());
expect(diaryCubit!.selectedDay, DateTime(2024, 1, 15));
});
test('setSelectedDay - ошибка диеты оставляет выбранный день для повтора', () async {
diaryCubit = DiaryCubit(
diaryRepository: mockDiaryRepository,
glossaryRepository: mockGlossaryRepository,
profileRepository: mockProfileRepository,
dietRepository: mockDietRepository,
chatRepository: mockChatRepository,
settingsRepository: mockSettingsRepository,
);
const preview = DiaryDayModel(
id: null,
date: '2024-01-20',
closed: 0,
comment: '',
typeOfDiary: TypeOfDiaryModel(
hasChosenDiet: true,
hasChosenPlan: false,
diaryState: DiaryStateEnum.init,
),
meals: [],
chosenPlanId: null,
dayOfChosenDiet: 2,
diet: DiaryDietModel(id: 1, duration: 7, name: 'Test Diet'),
);
when(
mockDiaryRepository.createDiaryDay(day: anyNamed('day')),
).thenAnswer((_) async {});
when(
mockDiaryRepository.getDiaryDayV2(day: anyNamed('day')),
).thenAnswer((_) async => preview);
when(mockDietRepository.getDiet(1)).thenThrow(Exception('network'));
final day = DateTime(2024, 1, 20);
final result = await diaryCubit!.setSelectedDay(day);
expect(result, false);
expect(diaryCubit!.state, isA<DiaryStateError>());
expect(diaryCubit!.selectedDay, day);
when(mockDietRepository.getDiet(1)).thenAnswer(
(_) async => const Diet(
id: 1,
slug: 'test-diet',
name: 'Test Diet',
image: '',
duration: 7,
state: DietState.active,
type: DietType(),
details: '',
dailySchedule: {
2: {
1: {
1: DailySchedule(
name: 'Овсянка',
portion: Portion.grams,
quantity: 100,
),
},
},
},
author: Author(
authorSlug: 'test',
authorName: 'Test',
authorProfileIcon: '',
authorIsMe: false,
),
totalLikes: 0,
totalViews: 0,
totalComments: 0,
wasLikedByMe: false,
isFavorite: false,
dailyNutrition: [],
),
);
final retry = await diaryCubit!.fetchDiaryV2(needLoading: true);
expect(retry, true);
final loaded = diaryCubit!.state as DiaryStateLoadedTomorrowWithDiet;
expect(loaded.diary.meals.first.portions.single.productName, 'Овсянка');
expect(diaryCubit!.selectedDay, day);
});
test('setSelectedDay - поздний ответ не затирает более новый день', () async {
diaryCubit = DiaryCubit(
diaryRepository: mockDiaryRepository,
glossaryRepository: mockGlossaryRepository,
profileRepository: mockProfileRepository,
dietRepository: mockDietRepository,
chatRepository: mockChatRepository,
settingsRepository: mockSettingsRepository,
);
DiaryDayModel preview(String date, int dietId) {
return DiaryDayModel(
id: null,
date: date,
closed: 0,
comment: '',
typeOfDiary: const TypeOfDiaryModel(
hasChosenDiet: true,
hasChosenPlan: false,
diaryState: DiaryStateEnum.init,
),
meals: [],
chosenPlanId: null,
dayOfChosenDiet: 1,
diet: DiaryDietModel(id: dietId, duration: 7, name: 'Diet $dietId'),
);
}
Diet diet(int id, String product) {
return Diet(
id: id,
slug: 'diet-$id',
name: 'Diet $id',
image: '',
duration: 7,
state: DietState.active,
type: const DietType(),
details: '',
dailySchedule: {
1: {
1: {
1: DailySchedule(
name: product,
portion: Portion.grams,
quantity: 100,
),
},
},
},
author: const Author(
authorSlug: 'test',
authorName: 'Test',
authorProfileIcon: '',
authorIsMe: false,
),
totalLikes: 0,
totalViews: 0,
totalComments: 0,
wasLikedByMe: false,
isFavorite: false,
dailyNutrition: [],
);
}
when(
mockDiaryRepository.createDiaryDay(day: anyNamed('day')),
).thenAnswer((_) async {});
when(mockDiaryRepository.getDiaryDayV2(day: anyNamed('day'))).thenAnswer((
invocation,
) async {
final day = invocation.namedArguments[const Symbol('day')] as String;
if (day.startsWith('2024-01-20')) {
return preview('2024-01-20', 1);
}
return preview('2024-01-21', 2);
});
final firstDiet = Completer<Diet>();
final secondDiet = Completer<Diet>();
var dietCalls = 0;
when(mockDietRepository.getDiet(any)).thenAnswer((invocation) {
dietCalls++;
final id = invocation.positionalArguments.first as int;
return (id == 1 ? firstDiet : secondDiet).future;
});
Future<void> waitForDietCalls(int count) async {
for (var i = 0; i < 50 && dietCalls < count; i++) {
await Future<void>.delayed(Duration.zero);
}
expect(dietCalls, greaterThanOrEqualTo(count));
}
final firstSelection = diaryCubit!.setSelectedDay(DateTime(2024, 1, 20));
await waitForDietCalls(1);
final secondSelection = diaryCubit!.setSelectedDay(DateTime(2024, 1, 21));
await waitForDietCalls(2);
secondDiet.complete(diet(2, 'Новый'));
await secondSelection;
firstDiet.complete(diet(1, 'Старый'));
await firstSelection;
final loaded = diaryCubit!.state as DiaryStateLoadedTomorrowWithDiet;
expect(loaded.diary.meals.first.portions.single.productName, 'Новый');
expect(diaryCubit!.selectedDay, DateTime(2024, 1, 21));
});
});
}

View File

@@ -17,7 +17,10 @@ class _MockRecordingsRepository extends Mock implements VideoCallRecordingsRepos
void main() {
late _MockRecordingsRepository repository;
VideoCallRecordingsPagination page(List<VideoCallRecordingModel> data) {
VideoCallRecordingsPagination page(
List<VideoCallRecordingModel> data, {
int lastPage = 1,
}) {
return VideoCallRecordingsPagination(
data: data,
links: const Links(
@@ -29,7 +32,7 @@ void main() {
meta: Meta(
currentPage: 1,
from: data.isEmpty ? null : 1,
lastPage: 1,
lastPage: lastPage,
links: const [],
perPage: 20,
to: data.isEmpty ? null : data.length,
@@ -92,6 +95,51 @@ void main() {
});
});
testWidgets('pull on a short list does not request the next page', (tester) async {
await mockNetworkImagesFor(() async {
when(() => repository.getRecordings(page: 1, period: null)).thenAnswer(
(_) async => page([recording(1)], lastPage: 2),
);
when(() => repository.getRecordings(page: 2, period: null)).thenAnswer(
(_) async => page([recording(2)], lastPage: 2),
);
await tester.pumpWidget(wrap(const VideoCallRecordingsScreen()));
await tester.pumpAndSettle();
await tester.fling(find.byType(ListView), const Offset(0, 400), 1200);
await tester.pump();
await tester.pump(const Duration(seconds: 1));
await tester.pumpAndSettle();
verifyNever(() => repository.getRecordings(page: 2, period: null));
});
});
testWidgets('empty state text stays visible at a large text scale', (tester) async {
tester.view.physicalSize = const Size(320, 240);
tester.view.devicePixelRatio = 1;
addTearDown(tester.view.resetPhysicalSize);
addTearDown(tester.view.resetDevicePixelRatio);
when(() => repository.getRecordings(page: 1, period: null)).thenAnswer(
(_) async => page(const []),
);
await tester.pumpWidget(
wrap(
const MediaQuery(
data: MediaQueryData(textScaler: TextScaler.linear(3)),
child: VideoCallRecordingsScreen(),
),
),
);
await tester.pumpAndSettle();
expect(find.text('Пока нет видеоконсультаций'), findsOneWidget);
expect(tester.takeException(), isNull);
});
testWidgets('empty list can be pulled to refresh', (tester) async {
when(() => repository.getRecordings(page: 1, period: null)).thenAnswer(
(_) async => page(const []),

View File

@@ -14,6 +14,7 @@ class _MockDio extends Mock implements Dio {}
class _FakeDownloadsSaver extends Fake implements PublicDownloadsSaver {
String? lastSourcePath;
String? lastFileName;
String? lastSubfolder;
@override
Future<String> saveToDownloads({
@@ -24,7 +25,8 @@ class _FakeDownloadsSaver extends Fake implements PublicDownloadsSaver {
}) async {
lastSourcePath = sourcePath;
lastFileName = fileName;
return 'content://downloads/Itvio/$fileName';
lastSubfolder = subfolder;
return 'content://downloads/$subfolder/$fileName';
}
}
@@ -157,7 +159,8 @@ void main() {
);
expect(downloadsSaver.lastFileName, 'recording_1.mp4');
expect(saved, contains('Itvio'));
expect(downloadsSaver.lastSubfolder, 'Eatvio');
expect(saved, contains('Eatvio'));
expect(File(downloadsSaver.lastSourcePath!).existsSync(), isFalse);
});
}