Merge remote-tracking branch 'upstream/main'

This commit is contained in:
misha
2026-01-28 11:52:38 +03:00
34 changed files with 270 additions and 103 deletions

View File

@@ -220,7 +220,7 @@ void main() {
testWidgets('should display FinishDayButtonWidget', (WidgetTester tester) async {
// Arrange
final widget = FinishDayButtonWidget(onPressed: () async {});
final widget = FinishDayButtonWidget(onPressed: () async {}, hasProducts: true);
// Act
await tester.pumpWidget(createTestWidget(widget));
@@ -234,7 +234,7 @@ void main() {
// Arrange
diaryCubit.emit(DiaryState.loaded(diary: testDiaryEntity, nutrition: testNutrition, selectedDay: DateTime(2024, 1, 15), selectedMeal: 1));
final widget = FinishDayButtonWidget(onPressed: () async {});
final widget = FinishDayButtonWidget(onPressed: () async {}, hasProducts: true);
await tester.pumpWidget(createTestWidget(widget));
await tester.pumpAndSettle();
@@ -244,7 +244,8 @@ void main() {
await tester.pump();
// Assert
expect(find.text('Закончить день'), findsOneWidget);
// Теперь на экране 2 текста "Закончить день": один на кнопке, другой в заголовке bottom sheet
expect(find.text('Закончить день'), findsNWidgets(2));
});
testWidgets('should display MealWidget with mood rating when showMood is true', (WidgetTester tester) async {

View File

@@ -13,7 +13,7 @@ void main() {
}
testWidgets('renders finish day button widget', (tester) async {
await tester.pumpWidget(wrap(FinishDayButtonWidget(onPressed: () async {})));
await tester.pumpWidget(wrap(FinishDayButtonWidget(onPressed: () async {}, hasProducts: true)));
await tester.pump();
expect(find.byType(FinishDayButtonWidget), findsOneWidget);

View File

@@ -33,7 +33,7 @@ void main() {
expect(find.text('Сохранить'), findsOneWidget);
});
testWidgets('alert -> refuse triggers sendProductToModeration and success', (tester) async {
testWidgets('alert -> refuse triggers sendProductToModeration and closes modal', (tester) async {
final cubit = MockDiaryCubit();
when(
cubit.sendProductToModeration(
@@ -65,9 +65,11 @@ void main() {
await tester.pump();
await tester.tap(find.text('Отказаться'));
await tester.pump();
await tester.pumpAndSettle(); // Wait for navigation animation
expect(find.textContaining('Продукт успешно отправлен'), findsOneWidget);
expect(find.textContaining('Продукт успешно отправлен'), findsNothing);
expect(find.byType(GlossaryModerationRequestModalWidget), findsNothing);
verify(
cubit.sendProductToModeration(
name: anyNamed('name'),