fix(chat): initialize startDate to current date when personal diet is not enabled and streamline widget layout for improved readability

This commit is contained in:
mso7nueh
2025-12-12 10:38:53 +03:00
parent 2408443a26
commit 391efeb8dd
8 changed files with 737 additions and 52 deletions

View File

@@ -0,0 +1,132 @@
import 'package:eatvio_app/core/app_config.dart';
import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/profile/models/weight_model.dart';
import 'package:eatvio_app/features/profile/presentation/widgets/imt_chart_widget.dart';
import 'package:flutter/material.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:intl/date_symbol_data_local.dart';
void main() {
group('ImtChartWidget', () {
setUp(() async {
await sl.reset();
await initializeDateFormatting('ru', null);
dotenv.loadFromString(envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
sl.registerLazySingleton<AppConfig>(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost'));
});
Widget createTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
home: Portal(
child: Scaffold(body: SingleChildScrollView(child: child)),
),
);
}
testWidgets('should display chart with empty weight points', (WidgetTester tester) async {
// Arrange
const widget = ImtChartWidget(weightPoints: []);
// Act
await tester.pumpWidget(createTestWidget(widget));
await tester.pump();
await tester.pump(const Duration(seconds: 1));
// Assert
expect(find.byType(ImtChartWidget), findsOneWidget);
});
testWidgets('should display chart with single weight point', (WidgetTester tester) async {
// Arrange
final weightPoints = [
WeightModel(
id: 1,
userId: 1,
weight: 70,
createdAt: DateTime.now(),
updatedAt: DateTime.now(),
bmi: 23.5,
),
];
final widget = ImtChartWidget(weightPoints: weightPoints);
// Act
await tester.pumpWidget(createTestWidget(widget));
await tester.pump();
await tester.pump(const Duration(seconds: 1));
// Assert
expect(find.byType(ImtChartWidget), findsOneWidget);
});
testWidgets('should display chart with multiple weight points and show increase arrow', (WidgetTester tester) async {
// Arrange
final now = DateTime.now();
final weightPoints = [
WeightModel(
id: 1,
userId: 1,
weight: 70,
createdAt: now.subtract(const Duration(days: 7)),
updatedAt: now.subtract(const Duration(days: 7)),
bmi: 23.0,
),
WeightModel(
id: 2,
userId: 1,
weight: 72,
createdAt: now,
updatedAt: now,
bmi: 24.0,
),
];
final widget = ImtChartWidget(weightPoints: weightPoints);
// Act
await tester.pumpWidget(createTestWidget(widget));
await tester.pump();
await tester.pump(const Duration(seconds: 1));
// Assert
expect(find.byType(ImtChartWidget), findsOneWidget);
});
testWidgets('should display chart with multiple weight points and show decrease arrow', (WidgetTester tester) async {
// Arrange
final now = DateTime.now();
final weightPoints = [
WeightModel(
id: 1,
userId: 1,
weight: 72,
createdAt: now.subtract(const Duration(days: 7)),
updatedAt: now.subtract(const Duration(days: 7)),
bmi: 24.0,
),
WeightModel(
id: 2,
userId: 1,
weight: 70,
createdAt: now,
updatedAt: now,
bmi: 23.0,
),
];
final widget = ImtChartWidget(weightPoints: weightPoints);
// Act
await tester.pumpWidget(createTestWidget(widget));
await tester.pump();
await tester.pump(const Duration(seconds: 1));
// Assert
expect(find.byType(ImtChartWidget), findsOneWidget);
});
});
}

View File

@@ -0,0 +1,133 @@
import 'package:eatvio_app/core/app_config.dart';
import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/features/registration/presentation/pages/phone_screen.dart';
import 'package:eatvio_app/features/registration/repositories/registration_repository.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
import 'package:eatvio_app/core/prefs.dart';
import 'phone_screen_test.mocks.dart';
@GenerateMocks([RegistrationRepository, Prefs])
void main() {
group('PhoneScreen', () {
setUp(() async {
await sl.reset();
dotenv.loadFromString(envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
sl.registerLazySingleton<AppConfig>(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost'));
});
Widget createTestWidget(Widget child, RegistrationCubit cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
home: BlocProvider<RegistrationCubit>(
create: (_) => cubit,
child: Scaffold(body: child),
),
);
}
testWidgets('should display phone screen with empty phone', (WidgetTester tester) async {
// Arrange
final mockRepository = MockRegistrationRepository();
final cubit = RegistrationCubit(
registrationRepository: mockRepository,
prefs: MockPrefs(),
);
final sheet = UserRegistrationSheet(
firstName: 'John',
lastName: 'Doe',
email: 'test@example.com',
password: 'password',
passwordConfirmation: 'password',
birthdate: '1990-01-01',
gender: 'male',
location: 'Moscow',
responseBody: '{}',
lang: 'ru',
weight: 70,
height: 175,
phone: '',
chestCircumference: 90,
waistCircumference: 80,
hipCircumference: 95,
bloodPressureUp: 120,
bloodPressureDown: 80,
hasHypo: 0,
hasHyper: 0,
aboutAllergy: '',
aboutTakingPils: '',
aboutSportHobbies: '',
favoriteFoods: '',
unfavoriteFoods: '',
additionalInfo: '',
);
final widget = PhoneScreen(sheet: sheet);
// Act
await tester.pumpWidget(createTestWidget(widget, cubit));
await tester.pump();
// Assert
expect(find.byType(PhoneScreen), findsOneWidget);
expect(find.text('Номер телефона'), findsOneWidget);
});
testWidgets('should display phone screen with pre-filled phone', (WidgetTester tester) async {
// Arrange
final mockRepository = MockRegistrationRepository();
final cubit = RegistrationCubit(
registrationRepository: mockRepository,
prefs: MockPrefs(),
);
final sheet = UserRegistrationSheet(
firstName: 'John',
lastName: 'Doe',
email: 'test@example.com',
password: 'password',
passwordConfirmation: 'password',
birthdate: '1990-01-01',
gender: 'male',
location: 'Moscow',
responseBody: '{}',
lang: 'ru',
weight: 70,
height: 175,
phone: '+7 (999) 123 45 67',
chestCircumference: 90,
waistCircumference: 80,
hipCircumference: 95,
bloodPressureUp: 120,
bloodPressureDown: 80,
hasHypo: 0,
hasHyper: 0,
aboutAllergy: '',
aboutTakingPils: '',
aboutSportHobbies: '',
favoriteFoods: '',
unfavoriteFoods: '',
additionalInfo: '',
);
final widget = PhoneScreen(sheet: sheet);
// Act
await tester.pumpWidget(createTestWidget(widget, cubit));
await tester.pump();
// Assert
expect(find.byType(PhoneScreen), findsOneWidget);
expect(find.text('+7 (999) 123 45 67'), findsOneWidget);
cubit.close();
});
});
}

View File

@@ -0,0 +1,113 @@
import 'package:eatvio_app/core/app_config.dart';
import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_cubit.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_state.dart';
import 'package:eatvio_app/features/registration/presentation/widgets/change_email_dialog.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
import 'change_email_dialog_test.mocks.dart';
@GenerateNiceMocks([MockSpec<VerifyEmailCubit>()])
void main() {
group('ChangeEmailDialog', () {
setUp(() async {
await sl.reset();
dotenv.loadFromString(envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
sl.registerLazySingleton<AppConfig>(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost'));
});
Widget createTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
home: Scaffold(
body: Builder(
builder: (context) => Column(
children: [
ElevatedButton(
onPressed: () {
showDialog(
context: context,
builder: (_) => child,
);
},
child: const Text('Show Dialog'),
),
],
),
),
),
);
}
testWidgets('should display dialog with current email pre-filled', (WidgetTester tester) async {
// Arrange
final mockCubit = MockVerifyEmailCubit();
when(mockCubit.state).thenReturn(const VerifyEmailState());
const currentEmail = 'test@example.com';
final widget = ChangeEmailDialog(
currentEmail: currentEmail,
verifyEmailCubit: mockCubit,
);
// Act
await tester.pumpWidget(createTestWidget(widget));
await tester.tap(find.text('Show Dialog'));
await tester.pumpAndSettle();
// Assert
expect(find.text('Сменить email'), findsOneWidget);
expect(find.text(currentEmail), findsOneWidget);
});
testWidgets('should show error for empty email', (WidgetTester tester) async {
// Arrange
final mockCubit = MockVerifyEmailCubit();
when(mockCubit.state).thenReturn(const VerifyEmailState());
const currentEmail = 'test@example.com';
final widget = ChangeEmailDialog(
currentEmail: currentEmail,
verifyEmailCubit: mockCubit,
);
// Act
await tester.pumpWidget(createTestWidget(widget));
await tester.tap(find.text('Show Dialog'));
await tester.pumpAndSettle();
final textField = find.byType(TextField);
await tester.enterText(textField, '');
await tester.pumpAndSettle();
// Assert
expect(find.text('Введите email'), findsOneWidget);
});
testWidgets('should close dialog when Отмена button is tapped', (WidgetTester tester) async {
// Arrange
final mockCubit = MockVerifyEmailCubit();
when(mockCubit.state).thenReturn(const VerifyEmailState());
const currentEmail = 'test@example.com';
final widget = ChangeEmailDialog(
currentEmail: currentEmail,
verifyEmailCubit: mockCubit,
);
// Act
await tester.pumpWidget(createTestWidget(widget));
await tester.tap(find.text('Show Dialog'));
await tester.pumpAndSettle();
await tester.tap(find.text('Отмена'));
await tester.pumpAndSettle();
// Assert
expect(find.text('Сменить email'), findsNothing);
});
});
}

View File

@@ -0,0 +1,87 @@
import 'package:eatvio_app/core/app_config.dart';
import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_cubit.dart';
import 'package:eatvio_app/features/registration/presentation/widgets/code_not_received_dialog.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
import 'code_not_received_dialog_test.mocks.dart';
@GenerateNiceMocks([MockSpec<VerifyEmailCubit>()])
void main() {
group('CodeNotReceivedDialog', () {
setUp(() async {
await sl.reset();
dotenv.loadFromString(envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
sl.registerLazySingleton<AppConfig>(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost'));
});
Widget createTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
home: Scaffold(
body: Builder(
builder: (context) => Column(
children: [
ElevatedButton(
onPressed: () {
showDialog(
context: context,
builder: (_) => child,
);
},
child: const Text('Show Dialog'),
),
],
),
),
),
);
}
testWidgets('should display dialog with correct text', (WidgetTester tester) async {
// Arrange
final mockCubit = MockVerifyEmailCubit();
const currentEmail = 'test@example.com';
final widget = CodeNotReceivedDialog(
currentEmail: currentEmail,
verifyEmailCubit: mockCubit,
);
// Act
await tester.pumpWidget(createTestWidget(widget));
await tester.tap(find.text('Show Dialog'));
await tester.pumpAndSettle();
// Assert
expect(find.text('Почему может не приходить код?'), findsOneWidget);
expect(find.text('Понятно'), findsOneWidget);
});
testWidgets('should close dialog when Понятно button is tapped', (WidgetTester tester) async {
// Arrange
final mockCubit = MockVerifyEmailCubit();
const currentEmail = 'test@example.com';
final widget = CodeNotReceivedDialog(
currentEmail: currentEmail,
verifyEmailCubit: mockCubit,
);
// Act
await tester.pumpWidget(createTestWidget(widget));
await tester.tap(find.text('Show Dialog'));
await tester.pumpAndSettle();
await tester.tap(find.text('Понятно'));
await tester.pumpAndSettle();
// Assert
expect(find.text('Почему может не приходить код?'), findsNothing);
});
});
}

View File

@@ -0,0 +1,83 @@
import 'package:eatvio_app/core/app_config.dart';
import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dart';
import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
import 'package:eatvio_app/features/registration_v2/presentation/widgets/password_field.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
import 'password_field_test.mocks.dart';
@GenerateNiceMocks([MockSpec<RegistrationCubitV2>()])
void main() {
group('PasswordField', () {
setUp(() async {
await sl.reset();
dotenv.loadFromString(envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
sl.registerLazySingleton<AppConfig>(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost'));
});
Widget createTestWidget(Widget child, RegistrationCubitV2 cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
localizationsDelegates: const [
S.delegate,
GlobalMaterialLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
GlobalCupertinoLocalizations.delegate,
],
supportedLocales: const [Locale('ru')],
home: Portal(
child: BlocProvider<RegistrationCubitV2>(
create: (_) => cubit,
child: Scaffold(body: child),
),
),
);
}
testWidgets('should display password field with password from state', (WidgetTester tester) async {
// Arrange
final mockCubit = MockRegistrationCubitV2();
const testPassword = 'testPassword123';
when(mockCubit.state).thenReturn(
RegistrationStateV2(password: testPassword),
);
final widget = PasswordField(cubit: mockCubit);
// Act
await tester.pumpWidget(createTestWidget(widget, mockCubit));
await tester.pump();
// Assert
expect(find.byType(PasswordField), findsOneWidget);
expect(find.text(testPassword), findsOneWidget);
});
testWidgets('should show copy icon initially', (WidgetTester tester) async {
// Arrange
final mockCubit = MockRegistrationCubitV2();
when(mockCubit.state).thenReturn(
RegistrationStateV2(password: 'test'),
);
final widget = PasswordField(cubit: mockCubit);
// Act
await tester.pumpWidget(createTestWidget(widget, mockCubit));
await tester.pump();
// Assert
expect(find.byType(PasswordField), findsOneWidget);
});
});
}

View File

@@ -0,0 +1,118 @@
import 'package:eatvio_app/core/app_config.dart';
import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dart';
import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
import 'package:eatvio_app/features/registration_v2/presentation/widgets/show_successful_registration_bottom_sheet.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
import 'show_successful_registration_bottom_sheet_test.mocks.dart';
@GenerateNiceMocks([MockSpec<RegistrationCubitV2>()])
void main() {
group('ShowSuccessfulRegistrationBottomSheet', () {
setUp(() async {
await sl.reset();
dotenv.loadFromString(envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
sl.registerLazySingleton<AppConfig>(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost'));
});
Widget createTestWidget(Widget child, RegistrationCubitV2 cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
localizationsDelegates: const [
S.delegate,
GlobalMaterialLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
GlobalCupertinoLocalizations.delegate,
],
supportedLocales: const [Locale('ru')],
home: Portal(
child: BlocProvider<RegistrationCubitV2>(
create: (_) => cubit,
child: Scaffold(
body: Builder(
builder: (context) => ElevatedButton(
onPressed: () {
showRegistrationBottomSheet(context, cubit, true);
},
child: const Text('Show Bottom Sheet'),
),
),
),
),
),
);
}
testWidgets('should display success bottom sheet when isSuccess is true', (WidgetTester tester) async {
// Arrange
final mockCubit = MockRegistrationCubitV2();
when(mockCubit.state).thenReturn(
RegistrationStateV2(password: 'testPassword'),
);
// Act
await tester.pumpWidget(createTestWidget(const SizedBox(), mockCubit));
await tester.tap(find.text('Show Bottom Sheet'));
await tester.pumpAndSettle();
// Assert
expect(find.byType(RegistrationBottomSheet), findsOneWidget);
});
testWidgets('should display error bottom sheet when isSuccess is false', (WidgetTester tester) async {
// Arrange
final mockCubit = MockRegistrationCubitV2();
when(mockCubit.state).thenReturn(
RegistrationStateV2(),
);
Widget createTestWidgetError(Widget child, RegistrationCubitV2 cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
localizationsDelegates: const [
S.delegate,
GlobalMaterialLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
GlobalCupertinoLocalizations.delegate,
],
supportedLocales: const [Locale('ru')],
home: Portal(
child: BlocProvider<RegistrationCubitV2>(
create: (_) => cubit,
child: Scaffold(
body: Builder(
builder: (context) => ElevatedButton(
onPressed: () {
showRegistrationBottomSheet(context, cubit, false);
},
child: const Text('Show Bottom Sheet'),
),
),
),
),
),
);
}
// Act
await tester.pumpWidget(createTestWidgetError(const SizedBox(), mockCubit));
await tester.tap(find.text('Show Bottom Sheet'));
await tester.pumpAndSettle();
// Assert
expect(find.byType(RegistrationBottomSheet), findsOneWidget);
});
});
}