diff --git a/integration_test/base/base_scenario.dart b/integration_test/base/base_scenario.dart index 7422522c1..8376d8df5 100644 --- a/integration_test/base/base_scenario.dart +++ b/integration_test/base/base_scenario.dart @@ -13,7 +13,7 @@ abstract class BaseScenario { expect(patrolFinder, findsWidgets); } - Future expectViewInVisible(PatrolFinder patrolFinder) async { + Future expectViewInvisible(PatrolFinder patrolFinder) async { expect(patrolFinder, findsNothing); } } \ No newline at end of file diff --git a/integration_test/scenarios/app_grid_scenario.dart b/integration_test/scenarios/app_grid_scenario.dart index 2dd6f65b8..bdb5b9e53 100644 --- a/integration_test/scenarios/app_grid_scenario.dart +++ b/integration_test/scenarios/app_grid_scenario.dart @@ -84,5 +84,5 @@ class AppGridScenario extends BaseScenario { } } - Future _expectMailboxViewInVisible() => expectViewInVisible($(MailboxView)); + Future _expectMailboxViewInVisible() => expectViewInvisible($(MailboxView)); } \ No newline at end of file diff --git a/lib/features/mailbox_dashboard/data/datasource/app_grid_datasource.dart b/lib/features/mailbox_dashboard/data/datasource/app_grid_datasource.dart index 2921ff2cf..504884185 100644 --- a/lib/features/mailbox_dashboard/data/datasource/app_grid_datasource.dart +++ b/lib/features/mailbox_dashboard/data/datasource/app_grid_datasource.dart @@ -3,7 +3,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/domain/app_dashboard/li import 'package:tmail_ui_user/features/mailbox_dashboard/domain/linagora_ecosystem/linagora_ecosystem.dart'; abstract class AppGridDatasource { - Future getLinagoraApplications(String path); + Future getLinagoraApplicationsFromEnvironment(String path); Future getLinagoraEcosystem(String baseUrl); } \ No newline at end of file diff --git a/lib/features/mailbox_dashboard/data/datasource_impl/app_grid_datasource_impl.dart b/lib/features/mailbox_dashboard/data/datasource_impl/app_grid_datasource_impl.dart index aa6343584..6901b669d 100644 --- a/lib/features/mailbox_dashboard/data/datasource_impl/app_grid_datasource_impl.dart +++ b/lib/features/mailbox_dashboard/data/datasource_impl/app_grid_datasource_impl.dart @@ -13,7 +13,7 @@ class AppGridDatasourceImpl extends AppGridDatasource { AppGridDatasourceImpl(this._linagoraEcosystemApi, this._exceptionThrower); @override - Future getLinagoraApplications(String path) { + Future getLinagoraApplicationsFromEnvironment(String path) { throw UnimplementedError(); } diff --git a/lib/features/mailbox_dashboard/data/datasource_impl/local_app_grid_datasource_impl.dart b/lib/features/mailbox_dashboard/data/datasource_impl/local_app_grid_datasource_impl.dart index 34f4c0bb6..bb5fd8908 100644 --- a/lib/features/mailbox_dashboard/data/datasource_impl/local_app_grid_datasource_impl.dart +++ b/lib/features/mailbox_dashboard/data/datasource_impl/local_app_grid_datasource_impl.dart @@ -14,7 +14,7 @@ class LocalAppGridDatasourceImpl extends AppGridDatasource { LocalAppGridDatasourceImpl(this._appConfigLoader, this._exceptionThrower); @override - Future getLinagoraApplications(String path) { + Future getLinagoraApplicationsFromEnvironment(String path) { return Future.sync(() async { return await _appConfigLoader.load( path, diff --git a/lib/features/mailbox_dashboard/data/repository/app_grid_repository_impl.dart b/lib/features/mailbox_dashboard/data/repository/app_grid_repository_impl.dart index d851007f7..a28658f2b 100644 --- a/lib/features/mailbox_dashboard/data/repository/app_grid_repository_impl.dart +++ b/lib/features/mailbox_dashboard/data/repository/app_grid_repository_impl.dart @@ -12,8 +12,8 @@ class AppGridRepositoryImpl extends AppGridRepository { AppGridRepositoryImpl(this._mapDataSource); @override - Future getLinagoraApplications(String path) { - return _mapDataSource[DataSourceType.local]!.getLinagoraApplications(path); + Future getLinagoraApplicationsFromEnvironment(String path) { + return _mapDataSource[DataSourceType.local]!.getLinagoraApplicationsFromEnvironment(path); } @override diff --git a/lib/features/mailbox_dashboard/domain/repository/app_grid_repository.dart b/lib/features/mailbox_dashboard/domain/repository/app_grid_repository.dart index d9dec79fc..24e41e5a7 100644 --- a/lib/features/mailbox_dashboard/domain/repository/app_grid_repository.dart +++ b/lib/features/mailbox_dashboard/domain/repository/app_grid_repository.dart @@ -3,7 +3,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/domain/app_dashboard/li import 'package:tmail_ui_user/features/mailbox_dashboard/domain/linagora_ecosystem/linagora_ecosystem.dart'; abstract class AppGridRepository { - Future getLinagoraApplications(String path); + Future getLinagoraApplicationsFromEnvironment(String path); Future getLinagoraEcosystem(String baseUrl); } \ No newline at end of file diff --git a/lib/features/mailbox_dashboard/domain/usecases/get_app_dashboard_configuration_interactor.dart b/lib/features/mailbox_dashboard/domain/usecases/get_app_dashboard_configuration_interactor.dart index 81e4d0702..c391edbff 100644 --- a/lib/features/mailbox_dashboard/domain/usecases/get_app_dashboard_configuration_interactor.dart +++ b/lib/features/mailbox_dashboard/domain/usecases/get_app_dashboard_configuration_interactor.dart @@ -13,7 +13,7 @@ class GetAppDashboardConfigurationInteractor { Stream> execute(String path) async* { try { yield Right(LoadingAppDashboardConfiguration()); - final linagoraApps = await _appGridRepository.getLinagoraApplications(path); + final linagoraApps = await _appGridRepository.getLinagoraApplicationsFromEnvironment(path); yield Right(GetAppDashboardConfigurationSuccess(linagoraApps.apps)); } catch (e) { logError('GetAppDashboardConfigurationInteractor::execute(): $e'); diff --git a/test/features/login/data/extensions/service_path_extension_test.dart b/test/features/login/data/extensions/service_path_extension_test.dart index 5c7a25f8d..4de2858ad 100644 --- a/test/features/login/data/extensions/service_path_extension_test.dart +++ b/test/features/login/data/extensions/service_path_extension_test.dart @@ -52,5 +52,17 @@ void main() { final result = servicePath.usingBaseUrl(''); expect(result.path, '/'); }); + + test('Should correctly handle baseUrl with port', () { + final servicePath = ServicePath('/api/v1/resource'); + final result = servicePath.usingBaseUrl('https://example.com:8080'); + expect(result.path, 'https://example.com:8080/api/v1/resource'); + }); + + test('Should correctly handle baseUrl with port and trailing slash', () { + final servicePath = ServicePath('/api/v1/resource'); + final result = servicePath.usingBaseUrl('https://example.com:8080/'); + expect(result.path, 'https://example.com:8080/api/v1/resource'); + }); }); } diff --git a/test/features/search/verify_before_time_in_search_email_filter_test.dart b/test/features/search/verify_before_time_in_search_email_filter_test.dart index aa03e747c..d5d17ba19 100644 --- a/test/features/search/verify_before_time_in_search_email_filter_test.dart +++ b/test/features/search/verify_before_time_in_search_email_filter_test.dart @@ -125,7 +125,7 @@ const fallbackGenerators = { MockSpec(), MockSpec(), MockSpec(fallbackGenerators: fallbackGenerators), - MockSpec(), + MockSpec(fallbackGenerators: fallbackGenerators), MockSpec(fallbackGenerators: fallbackGenerators), MockSpec(fallbackGenerators: fallbackGenerators), MockSpec(),