From 6b89de1e9f0250ac8ff0b25aebce5fe36f8e1f07 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Fri, 23 Aug 2019 07:41:23 +0300
Subject: [PATCH] Tests

---
 test_driver/utils/common_actions.dart | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/test_driver/utils/common_actions.dart b/test_driver/utils/common_actions.dart
index 26d4e55fb..e0ef7b764 100644
--- a/test_driver/utils/common_actions.dart
+++ b/test_driver/utils/common_actions.dart
@@ -23,6 +23,8 @@ Future<bool> isTablet(FlutterDriver driver) async {
   return min(width, height) > 600;
 }
 
+Future<bool> isMobile(FlutterDriver driver) async => !await isTablet(driver);
+
 Future<void> login(FlutterDriver driver,
     {bool selfHosted = true,
     bool retype = false,
@@ -46,14 +48,17 @@ Future<void> login(FlutterDriver driver,
 
   await driver.tap(find.text(localization.login.toUpperCase()));
 
-  await driver.waitFor(
-    find.byTooltip(Keys.openAppDrawer),
-    timeout: new Duration(seconds: 60),
-  );
+  if (loginEmail.isNotEmpty) {
+    await driver.waitFor(find.byTooltip(localization.dashboard),
+        timeout: new Duration(seconds: 60));
+  }
 }
 
 Future<void> logout(FlutterDriver driver, TestLocalization localization) async {
-  await driver.tap(find.byTooltip(Keys.openAppDrawer));
+  if (await isMobile(driver)) {
+    await driver.tap(find.byTooltip(Keys.openAppDrawer));
+  }
+
   //await driver.scrollUntilVisible(find.byType('Drawer'), find.byValueKey(SettingsKeys.drawer));
   await driver.tap(find.byTooltip(localization.settings));
 
@@ -69,7 +74,10 @@ Future<void> logout(FlutterDriver driver, TestLocalization localization) async {
 }
 
 Future<void> viewSection({FlutterDriver driver, String name}) async {
-  await driver.tap(find.byTooltip(Keys.openAppDrawer));
+  if (await isMobile(driver)) {
+    await driver.tap(find.byTooltip(Keys.openAppDrawer));
+  }
+
   await driver.tap(find.byTooltip(name));
 }