Merge pull request #11 from vuongxuongminh/fix/chain-redirector-not-w…

…ait-future

fix: bug chain redirector not wait future.

CHANGELOG.md

@@ -1,3 +1,8 @@
+4.1.1
+-----
+
++ Fix bug chain redirector not wait future.
+
 4.1.0
 -----
 

lib/src/redirector.dart

@@ -42,14 +42,14 @@ class ChainRedirector implements Redirector {
     Screen screen,
     BuildContext context,
     GoRouterState state,
-  ) {
+  ) async {
     for (final redirector in _redirectors) {
       if (redirector is RestrictRedirector &&
           !redirector.shouldRedirect(screen)) {
         continue;
       }
 
-      final path = redirector.redirect(screen, context, state);
+      final path = await redirector.redirect(screen, context, state);
 
       if (path != null) {
         return path;

pubspec.yaml

@@ -1,6 +1,6 @@
 name: go_router_plus
 description: Building blocks screens, access control and refresh notifiers base on Go Router.
-version: 4.1.0
+version: 4.1.1
 repository: https://github.com/vuongxuongminh/go_router_plus
 
 environment:

test/src/go_router_plus_test.dart

@@ -25,6 +25,8 @@ void main() {
       ),
     );
 
+    await tester.pumpAndSettle();
+
     expect(find.text('F'), findsOneWidget);
   });
 
@@ -48,6 +50,8 @@ void main() {
       ),
     );
 
+    await tester.pumpAndSettle();
+
     final t = find.text('F');
 
     await tester.tap(t);
@@ -100,6 +104,8 @@ void main() {
         ),
       );
 
+      await tester.pumpAndSettle();
+
       final t = find.text('F');
 
       await tester.tap(t);
@@ -132,6 +138,8 @@ void main() {
       ),
     );
 
+    await tester.pumpAndSettle();
+
     expect(find.text('Shell screen'), findsOneWidget);
 
     final t = find.text('F');

test/src/redirectors.dart

@@ -5,7 +5,11 @@ import 'screens.dart';
 
 class RedirectorA implements RestrictRedirector {
   @override
-  String? redirect(Screen screen, BuildContext context, GoRouterState state) {
+  String? redirect(
+    Screen screen,
+    BuildContext context,
+    GoRouterState state,
+  ) {
     return '/b';
   }
 
@@ -17,7 +21,22 @@ class RedirectorA implements RestrictRedirector {
 
 class RedirectorB implements Redirector {
   @override
-  String? redirect(Screen screen, BuildContext context, GoRouterState state) {
+  String? redirect(
+    Screen screen,
+    BuildContext context,
+    GoRouterState state,
+  ) {
     return '/b';
   }
 }
+
+class RedirectorC implements Redirector {
+  @override
+  Future<String?> redirect(
+    Screen screen,
+    BuildContext context,
+    GoRouterState state,
+  ) async {
+    return null;
+  }
+}

test/src/redirectors_test.dart

@@ -9,67 +9,76 @@ import 'screens.dart';
 
 @GenerateMocks([GoRouterState, BuildContext])
 void main() {
-  test('test non restrict screen, chain redirector should not redirect', () {
-    final redirector = ChainRedirector([
-      RedirectorA(),
-    ]);
+  test(
+    'test non restrict screen, chain redirector should not redirect',
+    () async {
+      final redirector = ChainRedirector([
+        RedirectorA(),
+      ]);
 
-    expect(
-      redirector.redirect(
-        ScreenB(),
-        MockBuildContext(),
-        MockGoRouterState(),
-      ),
-      null,
-    );
-  });
+      expect(
+        await redirector.redirect(
+          ScreenB(),
+          MockBuildContext(),
+          MockGoRouterState(),
+        ),
+        null,
+      );
+    },
+  );
 
-  test('test restrict screen, chain redirector should redirect', () {
-    final redirector = ChainRedirector([
-      RedirectorA(),
-    ]);
+  test(
+    'test restrict screen, chain redirector should redirect',
+    () async {
+      final redirector = ChainRedirector([
+        RedirectorA(),
+      ]);
 
-    expect(
-      redirector.redirect(
-        ScreenA(),
-        MockBuildContext(),
-        MockGoRouterState(),
-      ),
-      '/b',
-    );
-  });
+      expect(
+        await redirector.redirect(
+          ScreenA(),
+          MockBuildContext(),
+          MockGoRouterState(),
+        ),
+        '/b',
+      );
+    },
+  );
 
-  test('test chain redirector always redirect', () {
-    final redirector = ChainRedirector([
-      RedirectorA(),
-      RedirectorB(),
-    ]);
+  test(
+    'test chain redirector always redirect',
+    () async {
+      final redirector = ChainRedirector([
+        RedirectorC(),
+        RedirectorB(),
+      ]);
 
-    expect(
-      redirector.redirect(
-        ScreenA(),
-        MockBuildContext(),
-        MockGoRouterState(),
-      ),
-      '/b',
-    );
-    expect(
-      redirector.redirect(
-        ScreenB(),
-        MockBuildContext(),
-        MockGoRouterState(),
-      ),
-      '/b',
-    );
-    expect(
-      redirector.redirect(
-        ScreenC(),
-        MockBuildContext(),
-        MockGoRouterState(),
-      ),
-      '/b',
-    );
-  });
+      expect(
+        await redirector.redirect(
+          ScreenA(),
+          MockBuildContext(),
+          MockGoRouterState(),
+        ),
+        '/b',
+      );
+      expect(
+        await redirector.redirect(
+          ScreenB(),
+          MockBuildContext(),
+          MockGoRouterState(),
+        ),
+        '/b',
+      );
+      expect(
+        await redirector.redirect(
+          ScreenC(),
+          MockBuildContext(),
+          MockGoRouterState(),
+        ),
+        '/b',
+      );
+    },
+  );
 
   test('test screen rediretor should redirect', () {
     final redirector = ScreenRedirector();