From 06a84d39f9a7cf2a0c217c488f49cdd4f5f4d4de Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 3 May 2021 16:19:14 +0300
Subject: [PATCH] Tests

---
 lib/ui/app/app_bottom_bar.dart        | 6 +++---
 test_driver/all_it_test.dart          | 2 +-
 test_driver/utils/common_actions.dart | 9 +++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/ui/app/app_bottom_bar.dart b/lib/ui/app/app_bottom_bar.dart
index d456a97a0..30cf77565 100644
--- a/lib/ui/app/app_bottom_bar.dart
+++ b/lib/ui/app/app_bottom_bar.dart
@@ -139,9 +139,9 @@ class _AppBottomBarState extends State<AppBottomBar> {
                 Column(
                   children: EntityState.values.map<Widget>((state) {
                     return CheckboxListTile(
-                      key: Key(state.toString()),
-                      title: Text(
-                          AppLocalization.of(context).lookup(state.toString())),
+                      key: ValueKey('state_' +
+                          AppLocalization.of(context).lookup('$state')),
+                      title: Text(AppLocalization.of(context).lookup('$state')),
                       controlAffinity: ListTileControlAffinity.leading,
                       value: stateFilters.contains(state),
                       activeColor: Theme.of(context).accentColor,
diff --git a/test_driver/all_it_test.dart b/test_driver/all_it_test.dart
index d2940afab..38d3d84d6 100644
--- a/test_driver/all_it_test.dart
+++ b/test_driver/all_it_test.dart
@@ -7,7 +7,7 @@ import 'vendors_it_test.dart' as vendors;
 
 void main() {
   login.main();
-  //products.runTestSuite(batchMode: true);
+  products.runTestSuite(batchMode: true);
   //clients.runTestSuite(batchMode: true);
   //invoices.runTestSuite(batchMode: true);
   //quotes.runTestSuite(batchMode: true);
diff --git a/test_driver/utils/common_actions.dart b/test_driver/utils/common_actions.dart
index 7373427a0..6ec01c37e 100644
--- a/test_driver/utils/common_actions.dart
+++ b/test_driver/utils/common_actions.dart
@@ -161,15 +161,16 @@ Future<void> testArchiveAndDelete(
 
   print('Show archived/deleted records');
   await driver.tap(find.byTooltip(localization.filter));
-  await driver.tap(find.text(localization.archived));
-  await driver.tap(find.text(localization.deleted));
+  await driver.tap(find.byValueKey('state_' + localization.archived));
+  await driver.tap(find.byValueKey('state_' + localization.deleted));
   await driver.tap(find.byTooltip(localization.filter));
 
   print('Restore record');
   if (mobile)
     await driver.scrollUntilVisible(find.byType('ListView'), find.text(rowText),
         dyScroll: -300);
-  await driver.tap(find.text(rowText));
+
+  //await driver.tap(find.text(rowText));
   await selectAction(driver, localization.restore);
   await driver.waitFor(find.text(restoredMessage));
   await driver.waitForAbsent(find.byType('Snackbar'));
@@ -183,7 +184,7 @@ Future<void> testArchiveAndDelete(
   if (mobile)
     await driver.scrollUntilVisible(find.byType('ListView'), find.text(rowText),
         dyScroll: -300);
-  await driver.tap(find.text(rowText));
+  //await driver.tap(find.text(rowText));
   await selectAction(driver, localization.restore);
   await driver.waitFor(find.text(restoredMessage));
   await driver.waitForAbsent(find.byType('Snackbar'));