From a102d307a1f8c1c146d7ad3e46193ea2477e9be0 Mon Sep 17 00:00:00 2001
From: Gianfranco Gasbarri <gifrgas@gmail.com>
Date: Sun, 24 May 2020 20:37:31 +0100
Subject: [PATCH] Finished invoices test

---
 lib/utils/i18n.dart                   | 18 ++++++++++++++++++
 test_driver/invoices_it_test.dart     |  4 ++--
 test_driver/utils/common_actions.dart |  5 ++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart
index fec3f7394..7182a5908 100644
--- a/lib/utils/i18n.dart
+++ b/lib/utils/i18n.dart
@@ -34460,6 +34460,24 @@ mixin LocalizationsProvider on LocaleCodeAware {
   String get paymentStatus =>
       _localizedValues[localeCode]['payment_status'] ?? '';
 
+  String get paymentStatus1 =>
+      _localizedValues[localeCode]['payment_status_1'] ?? '';
+
+  String get paymentStatus2 =>
+      _localizedValues[localeCode]['payment_status_2'] ?? '';
+
+  String get paymentStatus3 =>
+      _localizedValues[localeCode]['payment_status_3'] ?? '';
+
+  String get paymentStatus4 =>
+      _localizedValues[localeCode]['payment_status_4'] ?? '';
+
+  String get paymentStatus5 =>
+      _localizedValues[localeCode]['payment_status_5'] ?? '';
+
+  String get paymentStatus6 =>
+      _localizedValues[localeCode]['payment_status_6'] ?? '';
+
   String get net => _localizedValues[localeCode]['net'] ?? '';
 
   String get clientPortal =>
diff --git a/test_driver/invoices_it_test.dart b/test_driver/invoices_it_test.dart
index dafa9d13e..b905fb244 100644
--- a/test_driver/invoices_it_test.dart
+++ b/test_driver/invoices_it_test.dart
@@ -80,7 +80,6 @@ void runTestSuite({bool batchMode = false}) {
       // Await for Debouncer
       await Future<dynamic>.delayed(Duration(milliseconds: 500));
       await driver.tap(find.text(localization.save));
-      await driver.tap(find.byTooltip(localization.back));
 
       print('Fill the invoice form');
       await driver.tap(find.byTooltip(localization.addItem));
@@ -140,7 +139,8 @@ void runTestSuite({bool batchMode = false}) {
     test('Mark invoice as paid', () async {
       await selectAction(driver, localization.enterPayment);
       await driver.tap(find.text(localization.save));
-      await driver.waitFor(find.text(localization.paymentStatus));
+      // "Completed" status
+      await driver.waitFor(find.text(localization.paymentStatus4.toUpperCase()));
 
       if (await isMobile(driver)) {
         await driver.tap(find.pageBack());
diff --git a/test_driver/utils/common_actions.dart b/test_driver/utils/common_actions.dart
index b86c3531f..0430431de 100644
--- a/test_driver/utils/common_actions.dart
+++ b/test_driver/utils/common_actions.dart
@@ -40,6 +40,9 @@ Future<void> login(FlutterDriver driver,
     await driver.tap(find.byValueKey(localization.selfhostLogin));
   }
    */
+  if (selfHosted) {
+    await driver.tap(find.text(localization.selfhosted.toUpperCase()));
+  }
 
   await fillTextFields(driver, <String, dynamic>{
     localization.email: loginEmail,
@@ -53,7 +56,7 @@ Future<void> login(FlutterDriver driver,
     });
   }
 
-  await driver.tap(find.text(localization.login.toUpperCase()));
+  await driver.tap(find.text(localization.emailSignIn));
 
   if (loginEmail.isNotEmpty) {
     await driver.waitFor(find.text(localization.overview),