From c820d0f561e0e93d76a3b4e88c77e8bcce8e5a2d Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 4 Mar 2019 16:27:49 +0200
Subject: [PATCH] Working on tests

---
 lib/ui/app/app_drawer.dart        | 24 +++++++-----------------
 test_driver/products_it_test.dart |  8 ++------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/lib/ui/app/app_drawer.dart b/lib/ui/app/app_drawer.dart
index 8ab54ac37..e5606c930 100644
--- a/lib/ui/app/app_drawer.dart
+++ b/lib/ui/app/app_drawer.dart
@@ -11,7 +11,6 @@ import 'package:invoiceninja_flutter/redux/product/product_actions.dart';
 import 'package:invoiceninja_flutter/ui/app/app_drawer_vm.dart';
 import 'package:invoiceninja_flutter/ui/settings/settings_screen.dart';
 import 'package:invoiceninja_flutter/utils/icons.dart';
-import 'package:invoiceninja_flutter/utils/keys.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:invoiceninja_flutter/utils/platforms.dart';
@@ -20,9 +19,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 
 // STARTER: import - do not remove comment
 import 'package:invoiceninja_flutter/redux/task/task_actions.dart';
-
 import 'package:invoiceninja_flutter/redux/project/project_actions.dart';
-
 import 'package:invoiceninja_flutter/redux/payment/payment_actions.dart';
 import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -107,13 +104,6 @@ class AppDrawer extends StatelessWidget {
               children: <Widget>[
                 Expanded(
                   child: Center(
-                      /*
-                      child: viewModel.selectedCompany.logoUrl != null &&
-                              viewModel.selectedCompany.logoUrl.isNotEmpty
-                          ? Image.network(viewModel.selectedCompany.logoUrl)
-                          : Image.asset('assets/images/logo.png',
-                              width: 100.0, height: 100.0)),
-                              */
                       child: viewModel.selectedCompany.logoUrl != null &&
                               viewModel.selectedCompany.logoUrl.isNotEmpty
                           ? CachedNetworkImage(
@@ -136,13 +126,13 @@ class AppDrawer extends StatelessWidget {
                                 !viewModel.isLoading
                             ? _multipleCompanies
                             : _singleCompany),
-                    Opacity(
-                      opacity: viewModel.isLoading ? 1.0 : 0.0,
-                      child: SizedBox(
-                          child: CircularProgressIndicator(),
-                          width: 20.0,
-                          height: 20.0),
-                    )
+                    SizedBox(
+                      child: viewModel.isLoading
+                          ? CircularProgressIndicator()
+                          : null,
+                      width: 20.0,
+                      height: 20.0,
+                    ),
                   ],
                 ),
               ],
diff --git a/test_driver/products_it_test.dart b/test_driver/products_it_test.dart
index 222b66746..640cecc29 100644
--- a/test_driver/products_it_test.dart
+++ b/test_driver/products_it_test.dart
@@ -65,7 +65,6 @@ void main() {
       await driver.enterText(loginSecret);
 
       await driver.tap(find.text(Constants.loginButton));
-      await driver.waitUntilNoTransientCallbacks(timeout: Duration(minutes: 1));
 
       await driver.waitFor(find.byType(AppKeys.dashboardScreen));
 
@@ -73,12 +72,9 @@ void main() {
       // https://github.com/flutter/flutter/issues/9002[Issue still open] - Using this solution to implement it
       await driver.tap(find.byTooltip(AppKeys.openAppDrawer));
 
-      //expect(await driver.getText(find.text('Products')), 'Products');
+      await driver.tap(find.byTooltip('Products'));
 
-      await driver.waitFor(find.text('Products'));
-      await driver.tap(find.text('Products'));
-
-      //await driver.waitFor(find.byType(AppKeys.productScreen));
+      await driver.waitFor(find.byType(AppKeys.productScreen));
     });
 
     /*