Move to mocktail (mobxjs#694)

* tests are failing with mockito * Replacing `mockito` with `mocktail` * fixing analyzer issues * moving to `mocktail` from `mockito`
magelo-labs · Jun 7, 2022 · 294e988 · 294e988
1 parent ae71fe6
commit 294e988
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/flutter_mobx/test/flutter_mobx_test.dart b/flutter_mobx/test/flutter_mobx_test.dart
@@ -178,7 +178,6 @@ void main() {
     );
   });
 
-<<<<<<< HEAD
   testWidgets('debugFindConstructingStackFrame has friendly output',
       (tester) async {
     final observer = Observer(builder: (_) => Container());
@@ -190,9 +189,6 @@ void main() {
 
   testWidgets('Observer should log when there are no observables in builder',
       (tester) async {
-=======
-  testWidgets('Observer should log when there are no observables in builder', (tester) async {
->>>>>>> 22f0976 (Implement onInvalidate callback for stateful widget)
     final observer = LoggingObserver(
       builder: (_) => const Placeholder(),
     );