Skip to content

fix: change redirect route arguments #854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacobaraujo7 merged 1 commit into from
Jul 30, 2023
Merged

fix: change redirect route arguments #854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions flutter_modular/lib/src/presenter/navigation/modular_route_information_parser.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,16 +120,17 @@ class ModularRouteInformationParser
}

FutureOr<ParallelRoute> _routeSuccess(ModularRoute? route) async {
final arguments = getArguments().getOrElse((l) => ModularArguments.empty());
final modularArguments =
getArguments().getOrElse((l) => ModularArguments.empty());
for (var middleware in route!.middlewares) {
route = await middleware.pos(route!, arguments);
route = await middleware.pos(route!, modularArguments);
if (route == null) {
break;
}
}

if (route is RedirectRoute) {
route = await selectRoute(route.to, arguments: arguments);
route = await selectRoute(route.to, arguments: modularArguments.data);
}

if (route != null) {
Expand Down
8 changes: 4 additions & 4 deletions flutter_modular/test/src/presenter/navigation/modular_route_information_parser_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ void main() {

test('selectRoute with RedirectRoute', () async {
final redirect = RedirectRoute('/oo', to: '/test');
final args = ModularArguments.empty();
final modularArgument = ModularArguments.empty();

final routeMock = ParallelRouteMock();
when(() => routeMock.uri).thenReturn(Uri.parse('/test'));
Expand All @@ -130,11 +130,12 @@ void main() {

when(() => getRoute.call(const RouteParmsDTO(url: '/oo')))
.thenAnswer((_) async => right(redirect));
when(() => getRoute.call(RouteParmsDTO(url: '/test', arguments: args)))
when(() => getRoute
.call(RouteParmsDTO(url: '/test', arguments: modularArgument.data)))
.thenAnswer((_) async => right(routeMock));
when(() => getRoute.call(const RouteParmsDTO(url: '/')))
.thenAnswer((_) async => right(routeParent));
when(() => getArguments.call()).thenReturn(right(args));
when(() => getArguments.call()).thenReturn(right(modularArgument));

when(() => setArguments.call(any())).thenReturn(right(unit));

Expand All @@ -143,7 +144,6 @@ void main() {
expect(book.chapters().first.name, '/');
expect(book.chapters('/').first.name, '/test');
});

test('selectRoute with resolver route withless /', () async {
final args = ModularArguments.empty();

Expand Down