Dart doc

CHANGELOG.md

@@ -1,4 +1,4 @@
-## [1.2.5] - 26 May 2020
+## [1.2.5+1] - 26 May 2020
 * Fix Modular.link bug
 * Smooth Animation Navigator: 56% faster navigation animations
 

lib/src/modular_base.dart

@@ -19,7 +19,6 @@ class Modular {
   static const String initialRoute = '/';
   static bool debugMode = !kReleaseMode;
   static bool isCupertino = false;
-
   static Map<String, ChildModule> _injectMap = {};
   static ChildModule _initialModule;
   static GlobalKey<NavigatorState> _navigatorKey;
@@ -35,9 +34,10 @@ class Modular {
   /// ```
   /// Modular.link;
   /// ```
-  static RouteLink get link {
-    assert(
-        _navigatorKey != null, '''Add Modular.navigatorKey in your MaterialApp;
+  static IModularNavigator get link {
+    if (navigatorDelegate == null)
+      assert(_navigatorKey != null,
+          '''Add Modular.navigatorKey in your MaterialApp;
 
       return MaterialApp(
         navigatorKey: Modular.navigatorKey,
@@ -54,8 +54,9 @@ class Modular {
   /// Modular.to;
   /// ```
   static IModularNavigator get to {
-    assert(
-        _navigatorKey != null, '''Add Modular.navigatorKey in your MaterialApp;
+    if (navigatorDelegate == null)
+      assert(_navigatorKey != null,
+          '''Add Modular.navigatorKey in your MaterialApp;
 
       return MaterialApp(
         navigatorKey: Modular.navigatorKey,

pubspec.lock

@@ -67,6 +67,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.8"
+  mockito:
+    dependency: "direct dev"
+    description:
+      name: mockito
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.1.1"
   path:
     dependency: transitive
     description:

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_modular
 description: Smart project structure with dependency injection and route management
-version: 1.2.5
+version: 1.2.5+1
 homepage: https://github.com/Flutterando/modular
 
 environment:
@@ -11,6 +11,7 @@ dependencies:
     sdk: flutter
 
 dev_dependencies:
+  mockito: ^4.1.1
   flutter_test:
     sdk: flutter
 

test/routers/route_link_test.dart

@@ -0,0 +1,25 @@
+import 'package:flutter_modular/flutter_modular.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/mockito.dart';
+
+class NavigatorMock extends Mock implements RouteLink {}
+
+void main() {
+  RouteLink link;
+
+  setUpAll(() {
+    link = NavigatorMock();
+  });
+
+  group('Navigation', () {
+    test('canPop', () {
+      when(link.canPop()).thenReturn(true);
+      expect(link.canPop(), true);
+    });
+
+    test('maybePop', () {
+      when(link.maybePop()).thenAnswer((_) => Future.value(true));
+      expect(link.maybePop(), completion(true));
+    });
+  });
+}

test/transition/transitions_test.dart

@@ -0,0 +1,51 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_modular/src/transitions/transitions.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+main() {
+  test('fadeInTransition', () {
+    var r = fadeInTransition((context, args) => Container(), null, null);
+    expect(r, isA<PageRouteBuilder>());
+  });
+  test('noTransition', () {
+    var r = noTransition((context, args) => Container(), null, null);
+    expect(r, isA<PageRouteBuilder>());
+  });
+  test('rightToLeft', () {
+    var r = rightToLeft((context, args) => Container(), null, null);
+    expect(r, isA<PageRouteBuilder>());
+  });
+  test('leftToRight', () {
+    var r = leftToRight((context, args) => Container(), null, null);
+    expect(r, isA<PageRouteBuilder>());
+  });
+  test('upToDown', () {
+    var r = upToDown((context, args) => Container(), null, null);
+    expect(r, isA<PageRouteBuilder>());
+  });
+  test('downToUp', () {
+    var r = downToUp((context, args) => Container(), null, null);
+    expect(r, isA<PageRouteBuilder>());
+  });
+  test('scale', () {
+    var r = scale((context, args) => Container(), null, null);
+    expect(r, isA<PageRouteBuilder>());
+  });
+
+  test('rotate', () {
+    var r = rotate((context, args) => Container(), null, null);
+    expect(r, isA<PageRouteBuilder>());
+  });
+  test('size', () {
+    var r = size((context, args) => Container(), null, null);
+    expect(r, isA<PageRouteBuilder>());
+  });
+  test('rightToLeftWithFade', () {
+    var r = rightToLeftWithFade((context, args) => Container(), null, null);
+    expect(r, isA<PageRouteBuilder>());
+  });
+  test('leftToRightWithFade', () {
+    var r = leftToRightWithFade((context, args) => Container(), null, null);
+    expect(r, isA<PageRouteBuilder>());
+  });
+}