forked from immich-app/immich
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(mobile): fix text search (immich-app#14873)
* fix(mobile): fix text search * chore(mobile): add tests for SearchPage * fix(mobile): fix render overflow for small screens Needed for SearchPage test to not throw overflow error * chore(mobile): update import_rule_openapi * styling * preserve styling and skip a test --------- Co-authored-by: Alex <[email protected]>
- Loading branch information
1 parent
aed749e
commit d819c8c
Showing
9 changed files
with
215 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| description: This file stores settings for Dart & Flutter DevTools. | ||
| documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states | ||
| extensions: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| import 'package:mocktail/mocktail.dart'; | ||
| import 'package:openapi/api.dart'; | ||
|
|
||
| class MockSmartSearchDto extends Mock implements SmartSearchDto {} | ||
|
|
||
| class MockMetadataSearchDto extends Mock implements MetadataSearchDto {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,189 @@ | ||
| import 'package:flutter/material.dart'; | ||
| import 'package:flutter_test/flutter_test.dart'; | ||
| import 'package:hooks_riverpod/hooks_riverpod.dart'; | ||
| import 'package:immich_mobile/entities/store.entity.dart'; | ||
| import 'package:immich_mobile/pages/search/search.page.dart'; | ||
| import 'package:immich_mobile/providers/api.provider.dart'; | ||
| import 'package:immich_mobile/providers/db.provider.dart'; | ||
| import 'package:immich_mobile/providers/search/paginated_search.provider.dart'; | ||
| import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart'; | ||
| import 'package:isar/isar.dart'; | ||
| import 'package:mocktail/mocktail.dart'; | ||
| import 'package:openapi/api.dart'; | ||
|
|
||
| import '../../dto.mocks.dart'; | ||
| import '../../service.mocks.dart'; | ||
| import '../../test_utils.dart'; | ||
| import '../../widget_tester_extensions.dart'; | ||
|
|
||
| void main() { | ||
| late List<Override> overrides; | ||
| late Isar db; | ||
| late MockApiService mockApiService; | ||
| late MockSearchApi mockSearchApi; | ||
|
|
||
| setUpAll(() async { | ||
| TestUtils.init(); | ||
| db = await TestUtils.initIsar(); | ||
| Store.init(db); | ||
| mockApiService = MockApiService(); | ||
| mockSearchApi = MockSearchApi(); | ||
| when(() => mockApiService.searchApi).thenReturn(mockSearchApi); | ||
| registerFallbackValue(MockSmartSearchDto()); | ||
| registerFallbackValue(MockMetadataSearchDto()); | ||
| overrides = [ | ||
| paginatedSearchRenderListProvider | ||
| .overrideWithValue(AsyncValue.data(RenderList.empty())), | ||
| dbProvider.overrideWithValue(db), | ||
| apiServiceProvider.overrideWithValue(mockApiService), | ||
| ]; | ||
| }); | ||
|
|
||
| final emptyTextSearch = isA<MetadataSearchDto>() | ||
| .having((s) => s.originalFileName, 'originalFileName', null); | ||
|
|
||
| testWidgets('contextual search with/without text', (tester) async { | ||
| await tester.pumpConsumerWidget( | ||
| const SearchPage(), | ||
| overrides: overrides, | ||
| ); | ||
|
|
||
| await tester.pumpAndSettle(); | ||
|
|
||
| expect( | ||
| find.byIcon(Icons.abc_rounded), | ||
| findsOneWidget, | ||
| reason: 'Should have contextual search icon', | ||
| ); | ||
|
|
||
| final searchField = find.byKey(const Key('search_text_field')); | ||
| expect(searchField, findsOneWidget); | ||
|
|
||
| await tester.enterText(searchField, 'test'); | ||
| await tester.testTextInput.receiveAction(TextInputAction.search); | ||
|
|
||
| var captured = verify( | ||
| () => mockSearchApi.searchSmart(captureAny()), | ||
| ).captured; | ||
|
|
||
| expect( | ||
| captured.first, | ||
| isA<SmartSearchDto>().having((s) => s.query, 'query', 'test'), | ||
| ); | ||
|
|
||
| await tester.enterText(searchField, ''); | ||
| await tester.testTextInput.receiveAction(TextInputAction.search); | ||
|
|
||
| captured = verify(() => mockSearchApi.searchAssets(captureAny())).captured; | ||
| expect(captured.first, emptyTextSearch); | ||
| }); | ||
|
|
||
| testWidgets('not contextual search with/without text', (tester) async { | ||
| await tester.pumpConsumerWidget( | ||
| const SearchPage(), | ||
| overrides: overrides, | ||
| ); | ||
|
|
||
| await tester.pumpAndSettle(); | ||
|
|
||
| await tester.tap(find.byKey(const Key('contextual_search_button'))); | ||
|
|
||
| await tester.pumpAndSettle(); | ||
|
|
||
| expect( | ||
| find.byIcon(Icons.image_search_rounded), | ||
| findsOneWidget, | ||
| reason: 'Should not have contextual search icon', | ||
| ); | ||
|
|
||
| final searchField = find.byKey(const Key('search_text_field')); | ||
| expect(searchField, findsOneWidget); | ||
|
|
||
| await tester.enterText(searchField, 'test'); | ||
| await tester.testTextInput.receiveAction(TextInputAction.search); | ||
|
|
||
| var captured = verify( | ||
| () => mockSearchApi.searchAssets(captureAny()), | ||
| ).captured; | ||
|
|
||
| expect( | ||
| captured.first, | ||
| isA<MetadataSearchDto>() | ||
| .having((s) => s.originalFileName, 'originalFileName', 'test'), | ||
| ); | ||
|
|
||
| await tester.enterText(searchField, ''); | ||
| await tester.testTextInput.receiveAction(TextInputAction.search); | ||
|
|
||
| captured = verify(() => mockSearchApi.searchAssets(captureAny())).captured; | ||
| expect(captured.first, emptyTextSearch); | ||
| }); | ||
|
|
||
| // COME BACK LATER | ||
| // testWidgets('contextual search with text combined with media type', | ||
| // (tester) async { | ||
| // await tester.pumpConsumerWidget( | ||
| // const SearchPage(), | ||
| // overrides: overrides, | ||
| // ); | ||
|
|
||
| // await tester.pumpAndSettle(); | ||
|
|
||
| // expect( | ||
| // find.byIcon(Icons.abc_rounded), | ||
| // findsOneWidget, | ||
| // reason: 'Should have contextual search icon', | ||
| // ); | ||
|
|
||
| // final searchField = find.byKey(const Key('search_text_field')); | ||
| // expect(searchField, findsOneWidget); | ||
|
|
||
| // await tester.enterText(searchField, 'test'); | ||
| // await tester.testTextInput.receiveAction(TextInputAction.search); | ||
|
|
||
| // var captured = verify( | ||
| // () => mockSearchApi.searchSmart(captureAny()), | ||
| // ).captured; | ||
|
|
||
| // expect( | ||
| // captured.first, | ||
| // isA<SmartSearchDto>().having((s) => s.query, 'query', 'test'), | ||
| // ); | ||
|
|
||
| // await tester.dragUntilVisible( | ||
| // find.byKey(const Key('media_type_chip')), | ||
| // find.byKey(const Key('search_filter_chip_list')), | ||
| // const Offset(-100, 0), | ||
| // ); | ||
| // await tester.pumpAndSettle(); | ||
|
|
||
| // await tester.tap(find.byKey(const Key('media_type_chip'))); | ||
| // await tester.pumpAndSettle(); | ||
|
|
||
| // await tester.tap(find.byKey(const Key('search_filter_media_type_image'))); | ||
| // await tester.pumpAndSettle(); | ||
|
|
||
| // await tester.tap(find.byKey(const Key('search_filter_apply'))); | ||
| // await tester.pumpAndSettle(); | ||
|
|
||
| // captured = verify(() => mockSearchApi.searchSmart(captureAny())).captured; | ||
|
|
||
| // expect( | ||
| // captured.first, | ||
| // isA<SmartSearchDto>() | ||
| // .having((s) => s.query, 'query', 'test') | ||
| // .having((s) => s.type, 'type', AssetTypeEnum.IMAGE), | ||
| // ); | ||
|
|
||
| // await tester.enterText(searchField, ''); | ||
| // await tester.testTextInput.receiveAction(TextInputAction.search); | ||
|
|
||
| // captured = verify(() => mockSearchApi.searchAssets(captureAny())).captured; | ||
| // expect( | ||
| // captured.first, | ||
| // isA<MetadataSearchDto>() | ||
| // .having((s) => s.originalFileName, 'originalFileName', null) | ||
| // .having((s) => s.type, 'type', AssetTypeEnum.IMAGE), | ||
| // ); | ||
| // }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters