feat(my_diets): merge conflict fixes

This commit is contained in:
misha
2026-02-11 16:23:48 +03:00
parent 042cc0ea20
commit 5f30aaeb2a
15 changed files with 173 additions and 139 deletions

View File

@@ -326,7 +326,7 @@ void main() {
expect(find.byType(DietTypeChoiceWidget), findsOneWidget);
expect(find.byType(DietImagePickerWidget), findsOneWidget);
// Action buttons
expect(find.byType(CustomOutlinedButton), findsNWidgets(2));
expect(find.byType(CustomOutlinedButton), findsNWidgets(3));
});
});
}

View File

@@ -432,7 +432,7 @@ void main() {
await cubit.setInitialData(testDiet);
expect(cubit.dietId, 1);
expect(cubit.state.isDietBeingEdited, true);
expect(cubit.state.isDietBeingEdited, false);
expect(cubit.state.dietData.name, 'Test Diet');
expect(cubit.state.dietData.details, 'Test details');
expect(cubit.state.dietData.duration, 7);

View File

@@ -6,10 +6,16 @@ import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
import 'package:retrofit/dio.dart';
import 'package:retrofit/retrofit.dart';
import 'create_diet_repository_test.mocks.dart';
HttpResponse<dynamic> _okResponse() => HttpResponse(
null,
Response(requestOptions: RequestOptions(path: ''), statusCode: 200),
);
@GenerateNiceMocks([MockSpec<CreateDietService>()])
void main() {
group('CreateDietRepository', () {
@@ -152,7 +158,7 @@ void main() {
final testFile = File('${Directory.systemTemp.path}/test_file.jpg');
await testFile.writeAsString('test content');
when(mockService.updatePublished(diet: dietId, formData: anyNamed('formData'))).thenAnswer((_) async => Future<void>.value());
when(mockService.updatePublished(diet: dietId, formData: anyNamed('formData'))).thenAnswer((_) async => _okResponse());
await repository.updateDiet(dietId: dietId, state: DietState.active, name: 'Updated Diet', duration: 14, details: 'Updated details', image: testFile);
@@ -167,7 +173,7 @@ void main() {
test('updateDiet - обновляет черновик диеты (draft)', () async {
const dietId = 1;
when(mockService.updateDrafted(diet: dietId, formData: anyNamed('formData'))).thenAnswer((_) async => Future<void>.value());
when(mockService.updateDrafted(diet: dietId, formData: anyNamed('formData'))).thenAnswer((_) async => _okResponse());
await repository.updateDiet(dietId: dietId, state: DietState.draft, name: 'Updated Diet');
@@ -177,7 +183,7 @@ void main() {
test('updateDiet - обновляет персональную диету (personal)', () async {
const dietId = 1;
when(mockService.updatePersonal(diet: dietId, formData: anyNamed('formData'))).thenAnswer((_) async => Future<void>.value());
when(mockService.updatePersonal(diet: dietId, formData: anyNamed('formData'))).thenAnswer((_) async => _okResponse());
await repository.updateDiet(dietId: dietId, state: DietState.personal, name: 'Updated Diet');
@@ -242,7 +248,7 @@ void main() {
],
];
when(mockService.updatePublished(diet: dietId, formData: anyNamed('formData'))).thenAnswer((_) async => Future<void>.value());
when(mockService.updatePublished(diet: dietId, formData: anyNamed('formData'))).thenAnswer((_) async => _okResponse());
await repository.updateDiet(
dietId: dietId,
@@ -257,7 +263,7 @@ void main() {
test('updateDiet - обновляет диету без image', () async {
const dietId = 1;
when(mockService.updatePublished(diet: dietId, formData: anyNamed('formData'))).thenAnswer((_) async => Future<void>.value());
when(mockService.updatePublished(diet: dietId, formData: anyNamed('formData'))).thenAnswer((_) async => _okResponse());
await repository.updateDiet(
dietId: dietId,
@@ -273,7 +279,7 @@ void main() {
test('updateDiet - обновляет диету только с типами', () async {
const dietId = 1;
when(mockService.updatePublished(diet: dietId, formData: anyNamed('formData'))).thenAnswer((_) async => Future<void>.value());
when(mockService.updatePublished(diet: dietId, formData: anyNamed('formData'))).thenAnswer((_) async => _okResponse());
await repository.updateDiet(
dietId: dietId,
@@ -305,7 +311,7 @@ void main() {
],
];
when(mockService.updatePublished(diet: dietId, formData: anyNamed('formData'))).thenAnswer((_) async => Future<void>.value());
when(mockService.updatePublished(diet: dietId, formData: anyNamed('formData'))).thenAnswer((_) async => _okResponse());
await repository.updateDiet(
dietId: dietId,

View File

@@ -269,11 +269,11 @@ void main() {
when(mockCreateDietRepository.updateDiet(
dietId: 1,
state: DietState.active,
)).thenAnswer((_) async => {});
)).thenAnswer((_) async => 200);
final result = await myDietsCubit!.publishDiet(1);
expect(result, true);
expect(result, 200);
verify(mockCreateDietRepository.updateDiet(dietId: 1, state: DietState.active)).called(1);
});
@@ -290,7 +290,7 @@ void main() {
final result = await myDietsCubit!.publishDiet(1);
expect(result, false);
expect(result, 0);
});
test('unpublishDiet - снимает диету с публикации', () async {
@@ -302,7 +302,7 @@ void main() {
when(mockCreateDietRepository.updateDiet(
dietId: 1,
state: DietState.draft,
)).thenAnswer((_) async => {});
)).thenAnswer((_) async => 200);
final result = await myDietsCubit!.unpublishDiet(1);

View File

@@ -106,7 +106,7 @@ void main() {
// Assert
expect(find.byType(MyDietsTab), findsOneWidget);
expect(find.byType(AnimatedOptionButton), findsNWidgets(2));
expect(find.byType(AnimatedOptionButton), findsNWidgets(3));
});
testWidgets('should handle tab selection in MyDietsTab', (WidgetTester tester) async {
@@ -119,7 +119,7 @@ void main() {
// Act - Find and tap the second tab
final tabButtons = find.byType(AnimatedOptionButton);
expect(tabButtons, findsNWidgets(2));
expect(tabButtons, findsNWidgets(3));
// Tap the second tab (index 1)
await tester.tap(tabButtons.at(1));
@@ -221,7 +221,7 @@ void main() {
// Assert
expect(find.byType(MyDietsTab), findsOneWidget);
expect(find.byType(AnimatedOptionButton), findsNWidgets(2));
expect(find.byType(AnimatedOptionButton), findsNWidgets(3));
});
testWidgets('should handle MyDietsTab additionalOnTap callback', (WidgetTester tester) async {