Attached Files | waitProcesses-popup-posterminal.diff [^] (5,356 bytes) 2019-03-11 12:02 [Show Content] [Hide Content]diff -r 1eb79cfcd128 web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js Wed Mar 06 11:41:40 2019 +0100
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js Fri Mar 08 17:02:56 2019 +0100
@@ -2896,7 +2896,7 @@
if (callback) {
callback(success, orderline);
}
- }, execution);
+ });
} else {
OB.UTIL.showI18NWarning('OBPOS_ProductNotFoundInPriceList');
OB.UTIL.ProcessController.finish('addProduct', execution);
@@ -2928,12 +2928,12 @@
if (callback) {
callback(success, orderline);
}
- }, execution);
- }
- }
- },
-
- addProductToOrder: function (p, qty, options, attrs, callback, execution) {
+ });
+ }
+ }
+ },
+
+ addProductToOrder: function (p, qty, options, attrs, callback) {
var executeAddProduct, finalCallback, me = this,
attributeSearchAllowed = OB.MobileApp.model.hasPermission('OBPOS_EnableSupportForProductAttributes', true);
finalCallback = function (success, orderline) {
@@ -2989,12 +2989,10 @@
executeAddProduct = function () {
var isQuotationAndAttributeAllowed = args.receipt.get('isQuotation') && OB.MobileApp.model.hasPermission('OBPOS_AskForAttributesWhenCreatingQuotation', true);
if ((!args || !args.options || !args.options.line) && attributeSearchAllowed && p.get('hasAttributes') && qty >= 1 && (!args.receipt.get('isQuotation') || isQuotationAndAttributeAllowed)) {
- OB.UTIL.ProcessController.pause('addProduct', execution);
OB.MobileApp.view.waterfall('onShowPopup', {
popup: 'modalProductAttribute',
args: {
callback: function (attributeValue) {
- OB.UTIL.ProcessController.resume('addProduct', execution);
if (!OB.UTIL.isNullOrUndefined(attributeValue)) {
if (_.isEmpty(attributeValue)) {
// the attributes for layaways accepts empty values, but for manage later easy to be null instead ""
@@ -5000,13 +4998,11 @@
this.adjustPayment();
}
OB.UTIL.PrepaymentUtils.managePrepaymentChange(this, payment, payments, function () {
- OB.UTIL.ProcessController.pause('addPayment', execution);
OB.UTIL.HookManager.executeHooks('OBPOS_preAddPayment', {
paymentToAdd: payment,
payments: payments,
receipt: me
}, function (args) {
- OB.UTIL.ProcessController.resume('addPayment', execution);
var executeFinalCallback = function (saveChanges) {
if (saveChanges && !payment.get('changePayment')) {
order.adjustPayment();
diff -r 1eb79cfcd128 web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js Wed Mar 06 11:41:40 2019 +0100
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js Fri Mar 08 17:02:56 2019 +0100
@@ -410,12 +410,10 @@
var symbol = OB.MobileApp.model.get('terminal').symbol;
var symbolAtRight = OB.MobileApp.model.get('terminal').currencySymbolAtTheRight;
var amount = receipt.getPaymentStatus().overpayment;
- OB.UTIL.ProcessController.pause('paymentDone', execution);
OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBPOS_OverpaymentWarningTitle'), OB.I18N.getLabel('OBPOS_OverpaymentWarningBody', [OB.I18N.formatCurrencyWithSymbol(amount, symbol, symbolAtRight)]), [{
label: OB.I18N.getLabel('OBMOBC_LblOk'),
isConfirmButton: true,
action: function () {
- OB.UTIL.ProcessController.resume('paymentDone', execution);
me.openDrawer = openDrawer;
// Need to finish process here??
callback(true);
@@ -423,7 +421,6 @@
}, {
label: OB.I18N.getLabel('OBMOBC_LblCancel'),
action: function () {
- OB.UTIL.ProcessController.resume('paymentDone', execution);
callbackPaymentCancelled(function () {
callback(false);
});
diff -r 1eb79cfcd128 web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js Wed Mar 06 11:41:40 2019 +0100
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js Fri Mar 08 17:02:56 2019 +0100
@@ -1770,13 +1770,11 @@
});
}
if (!approval) {
- OB.UTIL.ProcessController.pause('tapDoneButton', execution);
OB.UTIL.Approval.requestApproval(
me.model, [{
approval: 'OBPOS_approval.prepaymentUnderLimit',
message: 'OBPOS_approval.prepaymentUnderLimit'
}], function (approved, supervisor, approvalType) {
- OB.UTIL.ProcessController.resume('tapDoneButton', execution);
if (approved) {
if (OB.MobileApp.model.get('context').user.id === supervisor.get('id')) {
OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBPOS_UnderpaymentWarningTitle'), OB.I18N.getLabel('OBPOS_UnderpaymentWarningBody'), [{
waitProcesses-popup-piMobile.diff [^] (36,627 bytes) 2019-03-11 12:02 [Show Content] [Hide Content]diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/terminals/WebPOSExtModulesTerminalHelper.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/terminals/WebPOSExtModulesTerminalHelper.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/terminals/WebPOSExtModulesTerminalHelper.java Fri Mar 08 17:01:01 2019 +0100
@@ -105,7 +105,7 @@
throw new RuntimeException("To be implemented");
}
- MobileCoreAPI.waitToFinishAllProcesses();
+ MobileCoreAPI.waitToFinishAllProcesses(0);
setEnableStockValidation(false);
}
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/creditnote/CreditNoteReversePayment.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/creditnote/CreditNoteReversePayment.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/creditnote/CreditNoteReversePayment.java Fri Mar 08 17:01:01 2019 +0100
@@ -141,8 +141,8 @@
TestIdExtModules.BUTTON_PAYMENT_CREDITNOTE.enyoNode().waitUntilIsReady(100);
tap(TestIdExtModules.BUTTON_PAYMENT_CREDITNOTE);
tap(TestIdExtModules.BUTTON_PAY_EXACT);
- write(TestIdExtModules.FIELD_CREDITNOTE_MODAL, creditNoteValue);
- tap(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_SEARCH);
+ writeNoWaitProcesses(TestIdExtModules.FIELD_CREDITNOTE_MODAL, creditNoteValue);
+ tapNoWaitProcesses(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_SEARCH);
verify(TestIdExtModules.LABEL_INITIAL_BALANCE, "150.50");
verify(TestIdExtModules.LABEL_CURRENT_BALANCEE, "150.50");
tap(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_APPLY);
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/creditnote/ForbidCustomerDifferentAssignedTicketUseCreditNote.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/creditnote/ForbidCustomerDifferentAssignedTicketUseCreditNote.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/creditnote/ForbidCustomerDifferentAssignedTicketUseCreditNote.java Fri Mar 08 17:01:01 2019 +0100
@@ -54,8 +54,8 @@
tap(TestIdExtModules.BUTTON_PAY);
tap(TestIdExtModules.BUTTON_PAYMENT_CREDITNOTE);
tap(TestIdExtModules.BUTTON_PAY_EXACT);
- tap(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_SEARCH);
- tap(TestIdExtModules.BUTTON_FIRSTROW_CREDITNOTE);
+ tapNoWaitProcesses(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_SEARCH);
+ tapNoWaitProcesses(TestIdExtModules.BUTTON_FIRSTROW_CREDITNOTE);
tap(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_APPLY);
tap(TestIdExtModules.BUTTON_RECEIPT_CUSTOMER);
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/creditnote/ForbidCustomerDifferentAssignedTicketUseCreditNoteInPayOpenTickets.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/creditnote/ForbidCustomerDifferentAssignedTicketUseCreditNoteInPayOpenTickets.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/creditnote/ForbidCustomerDifferentAssignedTicketUseCreditNoteInPayOpenTickets.java Fri Mar 08 17:01:01 2019 +0100
@@ -57,8 +57,8 @@
tap(TestIdExtModules.BUTTON_KEYPAD_0);
tap(TestIdExtModules.BUTTON_KEYPAD_0);
tap(TestIdExtModules.BUTTON_KEYPAD_ENTER);
- tap(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_SEARCH);
- tap(TestIdExtModules.BUTTON_FIRSTROW_CREDITNOTE);
+ tapNoWaitProcesses(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_SEARCH);
+ tapNoWaitProcesses(TestIdExtModules.BUTTON_FIRSTROW_CREDITNOTE);
tap(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_APPLY);
// Change the customer
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/creditnote/PayUsingCreditNote.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/creditnote/PayUsingCreditNote.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/creditnote/PayUsingCreditNote.java Fri Mar 08 17:01:01 2019 +0100
@@ -154,8 +154,8 @@
tap(TestIdExtModules.BUTTON_PAYMENT_CREDITNOTE);
tap(TestIdExtModules.BUTTON_PAY_EXACT);
// The credit notes selector appears, with the availables to this bp
- write(TestIdExtModules.FIELD_CREDITNOTE_MODAL, creditNoteValue);
- tap(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_SEARCH);
+ writeNoWaitProcesses(TestIdExtModules.FIELD_CREDITNOTE_MODAL, creditNoteValue);
+ tapNoWaitProcesses(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_SEARCH);
verify(TestIdExtModules.LABEL_INITIAL_BALANCE, "150.50");
verify(TestIdExtModules.LABEL_CURRENT_BALANCEE, "150.50");
tap(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_APPLY);
@@ -233,8 +233,8 @@
tap(TestIdExtModules.BUTTON_PAY);
tap(TestIdExtModules.BUTTON_PAYMENT_CREDITNOTE);
tap(TestIdExtModules.BUTTON_PAY_EXACT);
- write(TestIdExtModules.FIELD_CREDITNOTE_MODAL, creditNoteValue);
- tap(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_SEARCH);
+ writeNoWaitProcesses(TestIdExtModules.FIELD_CREDITNOTE_MODAL, creditNoteValue);
+ tapNoWaitProcesses(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_SEARCH);
verify(TestIdExtModules.LABEL_INITIAL_BALANCE, "150.50");
verify(TestIdExtModules.LABEL_CURRENT_BALANCEE, "136.00");
tap(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_APPLY);
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/creditnote/UseCreditNoteWithAnonymousCustomer.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/creditnote/UseCreditNoteWithAnonymousCustomer.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/creditnote/UseCreditNoteWithAnonymousCustomer.java Fri Mar 08 17:01:01 2019 +0100
@@ -56,8 +56,8 @@
tap(TestIdExtModules.BUTTON_PAY);
tap(TestIdExtModules.BUTTON_PAYMENT_CREDITNOTE);
tap(TestIdExtModules.BUTTON_PAY_EXACT);
- tap(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_SEARCH);
- tap(TestIdExtModules.BUTTON_FIRSTROW_CREDITNOTE);
+ tapNoWaitProcesses(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_SEARCH);
+ tapNoWaitProcesses(TestIdExtModules.BUTTON_FIRSTROW_CREDITNOTE);
tap(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_APPLY);
tap(TestIdExtModules.BUTTON_RECEIPT_CUSTOMER);
write(TestIdExtModules.FIELD_CUSTOMER_MODAL, "Arturo Montoro");
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/creditnote/UseCreditNoteWithAnonymousCustomerInPayOpenTickets.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/creditnote/UseCreditNoteWithAnonymousCustomerInPayOpenTickets.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/creditnote/UseCreditNoteWithAnonymousCustomerInPayOpenTickets.java Fri Mar 08 17:01:01 2019 +0100
@@ -61,8 +61,8 @@
tap(TestIdExtModules.BUTTON_KEYPAD_0);
tap(TestIdExtModules.BUTTON_KEYPAD_0);
tap(TestIdExtModules.BUTTON_KEYPAD_ENTER);
- tap(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_SEARCH);
- tap(TestIdExtModules.BUTTON_FIRSTROW_CREDITNOTE);
+ tapNoWaitProcesses(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_SEARCH);
+ tapNoWaitProcesses(TestIdExtModules.BUTTON_FIRSTROW_CREDITNOTE);
tap(TestIdExtModules.BUTTON_CREDITNOTE_MODAL_APPLY);
tap(TestIdExtModules.BUTTON_RECEIPT_CUSTOMER);
write(TestIdExtModules.FIELD_CUSTOMER_MODAL, "Arturo Montoro");
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/giftcards/I36010_PayCertificateTicketOtherTerminal.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/giftcards/I36010_PayCertificateTicketOtherTerminal.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/giftcards/I36010_PayCertificateTicketOtherTerminal.java Fri Mar 08 17:01:01 2019 +0100
@@ -34,7 +34,6 @@
import org.openbravo.test.mobile.retail.extmodules.selenium.terminals.WebPOSExtModulesTerminalHelper;
import org.openbravo.test.mobile.retail.mobilecore.annotations.TestClassAnnotations;
import org.openbravo.test.mobile.retail.mobilecore.database.DatabaseHelperSelect;
-import org.openbravo.test.mobile.retail.mobilecore.selenium.TestIdCore;
import org.openbravo.test.mobile.retail.mobilecore.utils.ApplicationWindow;
import org.openbravo.test.mobile.retail.mobilecore.utils.RetailUtils;
import org.openbravo.test.mobile.retail.pack.selenium.TestIdPack;
@@ -83,8 +82,8 @@
verifyGiftCardInstanceBeforePay(numberGiftCard1);
tap(TestIdExtModules.BUTTON_PAY_EXACT);
- write(TestIdExtModules.FIELD_GIFTCARDPAYMENT_CARDID, numberGiftCard1);
- tap(TestIdExtModules.BUTTON_GIFTCARDPAYMENT_SEARCH);
+ writeNoWaitProcesses(TestIdExtModules.FIELD_GIFTCARDPAYMENT_CARDID, numberGiftCard1);
+ tapNoWaitProcesses(TestIdExtModules.BUTTON_GIFTCARDPAYMENT_SEARCH);
tap(TestIdExtModules.BUTTON_GIFTCARDPAYMENT_APPLY);
verify(TestIdPack.LABEL_RECEIPT_ADDEDPAYMENT_ROW1_NAME, "Gift Certificate");
verify(TestIdPack.LABEL_RECEIPT_ADDEDPAYMENT_ROW1_AMOUNT, "150.50");
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/giftcards/I38553_VerifyLayawayPartiallyPaidWithGift.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/giftcards/I38553_VerifyLayawayPartiallyPaidWithGift.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/giftcards/I38553_VerifyLayawayPartiallyPaidWithGift.java Fri Mar 08 17:01:01 2019 +0100
@@ -56,8 +56,8 @@
write(TestIdPack.INPUT_POINTOFSALE, "50");
TestIdPack.INPUT_POINTOFSALE.enyoNode().executeExtension(".waterfall('onchange')");
tap(TestIdPack.BUTTON_KEYPAD_ENTER);
- tap(TestIdExtModules.BUTTON_GIFTCARDPAYMENT_SEARCH);
- tap(TestIdExtModules.GIFTCARD_ROW1);
+ tapNoWaitProcesses(TestIdExtModules.BUTTON_GIFTCARDPAYMENT_SEARCH);
+ tapNoWaitProcesses(TestIdExtModules.GIFTCARD_ROW1);
tap(TestIdExtModules.BUTTON_GIFTCARDPAYMENT_APPLY);
waitUntilCertainWindowIsReached(ApplicationWindow.POINTOFSALE);
SynchronizationMonitor.waitUntilDataIsInTheServer(true);
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA001SerialNumberProductWithStock.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA001SerialNumberProductWithStock.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA001SerialNumberProductWithStock.java Fri Mar 08 17:01:01 2019 +0100
@@ -16,7 +16,7 @@
write(TestIdExtModules.FIELD_SEARCH_TEXT, "Balaclava Cap");
tap(TestIdExtModules.BUTTON_SEARCH_EXECUTE);
tap(TestIdExtModules.BUTTON_SEARCHPRODUCT_BALACLAVA_CAP);
- write(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, "10001_20-03-2018");
+ writeNoWaitProcesses(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, "10001_20-03-2018");
tap(TestIdExtModules.BUTTON_MODAL_ATTRIBUTE_OK);
verify(TestIdExtModules.LABEL_TOTALTOPAY, "169.00");
tap(TestIdExample.BUTTON_PAY);
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA001SerialNumberProductWithoutStock.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA001SerialNumberProductWithoutStock.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA001SerialNumberProductWithoutStock.java Fri Mar 08 17:01:01 2019 +0100
@@ -23,7 +23,7 @@
Date curDate = new Date();
SimpleDateFormat dateFormatter = new SimpleDateFormat("ddMMyyyhhmm");
String newSerno = dateFormatter.format(curDate);
- write(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, newSerno + "_28-03-2018");
+ writeNoWaitProcesses(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, newSerno + "_28-03-2018");
tap(TestIdExtModules.BUTTON_MODAL_ATTRIBUTE_OK);
TestIdExtModules.CONFIRMATION_POPUP.enyoNode().waitUntilIsReady();
tap(TestIdExtModules.BUTTON_POPUP_PROCEED);
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA002NonSerialNumberProductWithStock.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA002NonSerialNumberProductWithStock.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA002NonSerialNumberProductWithStock.java Fri Mar 08 17:01:01 2019 +0100
@@ -16,7 +16,7 @@
write(TestIdExtModules.FIELD_SEARCH_TEXT, "Hiking Boots");
tap(TestIdExtModules.BUTTON_SEARCH_EXECUTE);
tap(TestIdExtModules.BUTTON_SEARCHPRODUCT_HIKING_BOOTS);
- write(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, "10001_20-03-2018");
+ writeNoWaitProcesses(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, "10001_20-03-2018");
tap(TestIdExtModules.BUTTON_MODAL_ATTRIBUTE_OK);
verify(TestIdExtModules.LABEL_TOTALTOPAY, "169.00");
tap(TestIdExample.BUTTON_PAY);
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA002NonSerialNumberProductWithoutStock.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA002NonSerialNumberProductWithoutStock.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA002NonSerialNumberProductWithoutStock.java Fri Mar 08 17:01:01 2019 +0100
@@ -23,7 +23,7 @@
Date curDate = new Date();
SimpleDateFormat dateFormatter = new SimpleDateFormat("ddMMyyyhhmm");
String newLot = dateFormatter.format(curDate);
- write(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, newLot + "_28-03-2018");
+ writeNoWaitProcesses(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, newLot + "_28-03-2018");
tap(TestIdExtModules.BUTTON_MODAL_ATTRIBUTE_OK);
TestIdExtModules.CONFIRMATION_POPUP.enyoNode().waitUntilIsReady();
tap(TestIdExtModules.BUTTON_POPUP_PROCEED);
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA004SerialNumberMoreThanOneQuantity.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA004SerialNumberMoreThanOneQuantity.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA004SerialNumberMoreThanOneQuantity.java Fri Mar 08 17:01:01 2019 +0100
@@ -16,12 +16,12 @@
write(TestIdExtModules.FIELD_SEARCH_TEXT, "Balaclava Cap");
tap(TestIdExtModules.BUTTON_SEARCH_EXECUTE);
tap(TestIdExtModules.BUTTON_SEARCHPRODUCT_BALACLAVA_CAP);
- write(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, "10001_20-03-2018");
+ writeNoWaitProcesses(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, "10001_20-03-2018");
tap(TestIdExtModules.BUTTON_MODAL_ATTRIBUTE_OK);
write(TestIdExtModules.FIELD_SEARCH_TEXT, "Balaclava Cap");
tap(TestIdExtModules.BUTTON_SEARCH_EXECUTE);
tap(TestIdExtModules.BUTTON_SEARCHPRODUCT_BALACLAVA_CAP);
- write(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, "10001_20-03-2018");
+ writeNoWaitProcesses(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, "10001_20-03-2018");
tap(TestIdExtModules.BUTTON_MODAL_ATTRIBUTE_OK);
tap(TestIdExtModules.BUTTON_MODAL_CANNOT_CHANGE_QTY_OK);
verify(TestIdExtModules.LABEL_TOTALTOPAY, "169.00");
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA005NonSerialMoreThanOneQuantity.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA005NonSerialMoreThanOneQuantity.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA005NonSerialMoreThanOneQuantity.java Fri Mar 08 17:01:01 2019 +0100
@@ -16,13 +16,13 @@
write(TestIdExtModules.FIELD_SEARCH_TEXT, "Hiking Boots");
tap(TestIdExtModules.BUTTON_SEARCH_EXECUTE);
tap(TestIdExtModules.BUTTON_SEARCHPRODUCT_HIKING_BOOTS);
- write(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, "10001_20-03-2018");
+ writeNoWaitProcesses(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, "10001_20-03-2018");
tap(TestIdExtModules.BUTTON_MODAL_ATTRIBUTE_OK);
tap(TestIdExtModules.BUTTON_SEARCH);
write(TestIdExtModules.FIELD_SEARCH_TEXT, "Hiking Boots");
tap(TestIdExtModules.BUTTON_SEARCH_EXECUTE);
tap(TestIdExtModules.BUTTON_SEARCHPRODUCT_HIKING_BOOTS);
- write(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, "10001_20-03-2018");
+ writeNoWaitProcesses(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, "10001_20-03-2018");
tap(TestIdExtModules.BUTTON_MODAL_ATTRIBUTE_OK);
verify(TestIdExtModules.LABEL_TOTALTOPAY, "338.00");
tap(TestIdExample.BUTTON_PAY);
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA006AddUnitToSerialNumber.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA006AddUnitToSerialNumber.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA006AddUnitToSerialNumber.java Fri Mar 08 17:01:01 2019 +0100
@@ -17,7 +17,7 @@
write(TestIdExtModules.FIELD_SEARCH_TEXT, "Balaclava Cap");
tap(TestIdExtModules.BUTTON_SEARCH_EXECUTE);
tap(TestIdExtModules.BUTTON_SEARCHPRODUCT_BALACLAVA_CAP);
- write(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, "10001_20-03-2018");
+ writeNoWaitProcesses(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, "10001_20-03-2018");
tap(TestIdExtModules.BUTTON_MODAL_ATTRIBUTE_OK);
tap(TestIdPack.BUTTON_SCAN);
isDisabled(TestIdPack.BUTTON_KEYPAD_PLUS, true);
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA007AddUnitToNonSerialNumber.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA007AddUnitToNonSerialNumber.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/supportforattributes/SFA007AddUnitToNonSerialNumber.java Fri Mar 08 17:01:01 2019 +0100
@@ -17,7 +17,7 @@
write(TestIdExtModules.FIELD_SEARCH_TEXT, "Hiking Boots");
tap(TestIdExtModules.BUTTON_SEARCH_EXECUTE);
tap(TestIdExtModules.BUTTON_SEARCHPRODUCT_HIKING_BOOTS);
- write(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, "10001_20-03-2018");
+ writeNoWaitProcesses(TestIdExtModules.FIELD_MODAL_ATTRIBUTE_VALUE, "10001_20-03-2018");
tap(TestIdExtModules.BUTTON_MODAL_ATTRIBUTE_OK);
tap(TestIdPack.BUTTON_SCAN);
isVisible(TestIdPack.BUTTON_KEYPAD_PLUS, true);
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/mobilecore/intuitive/IntuitiveCommandsMobileCore.java
--- a/src-test/org/openbravo/test/mobile/retail/mobilecore/intuitive/IntuitiveCommandsMobileCore.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/mobilecore/intuitive/IntuitiveCommandsMobileCore.java Fri Mar 08 17:01:01 2019 +0100
@@ -194,6 +194,11 @@
*/
private void tap(final TestIdConstructor dom, boolean waitProcesses) {
+ long numberOfActivePopups = -1;
+ if (waitProcesses) {
+ numberOfActivePopups = MobileCoreAPI.numActivePopups();
+ }
+
// Avoid pressing Done button 2 times in one second
if (dom == TestIdPack.BUTTON_PAY_DONE) {
final long timeDifference = System.currentTimeMillis() - lastDone;
@@ -245,7 +250,7 @@
}
if (waitProcesses) {
- MobileCoreAPI.waitToFinishAllProcesses();
+ MobileCoreAPI.waitToFinishAllProcesses(numberOfActivePopups);
}
}
@@ -367,10 +372,20 @@
*/
@Override
public void write(final TestIdConstructor dom, final String text) {
+ long numberOfActivePopups = MobileCoreAPI.numActivePopups();
+ writeNoWaitProcesses(dom, text);
+ MobileCoreAPI.waitToFinishAllProcesses(numberOfActivePopups);
+ }
+
+ /*
+ * Especial write that don't wait for finish all processes For use only when we know that a
+ * process is running while we write the text, and it will not open a popup
+ *
+ */
+ public void writeNoWaitProcesses(final TestIdConstructor dom, final String text) {
final EnyoNode enyoNode = dom.enyoNode();
logger.info(String.format("Writing '%s' into '%s'", text, dom.name()));
enyoNode.write(text);
- MobileCoreAPI.waitToFinishAllProcesses();
}
/***
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/mobilecore/javascript/EnyoNode.java
--- a/src-test/org/openbravo/test/mobile/retail/mobilecore/javascript/EnyoNode.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/mobilecore/javascript/EnyoNode.java Fri Mar 08 17:01:01 2019 +0100
@@ -108,8 +108,9 @@
*/
public void executeExtension(final String scriptExtension) {
waitUntilIsReady();
+ long numberOfActivePopups = MobileCoreAPI.numActivePopups();
execute(scriptExtension);
- MobileCoreAPI.waitToFinishAllProcesses();
+ MobileCoreAPI.waitToFinishAllProcesses(numberOfActivePopups);
}
/**
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/mobilecore/javascript/MobileCoreAPI.java
--- a/src-test/org/openbravo/test/mobile/retail/mobilecore/javascript/MobileCoreAPI.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/mobilecore/javascript/MobileCoreAPI.java Fri Mar 08 17:01:01 2019 +0100
@@ -114,13 +114,17 @@
}
public static void waitToFinishAllProcesses() {
+ waitToFinishAllProcesses(-1);
+ }
+
+ public static void waitToFinishAllProcesses(long numActivePopups) {
new OBWait(OBConstants.WAIT_PROCESSES_RETRY_TIME, OBConstants.WAIT_PROCESSES_RETRY_MAX_ITER) {
@Override
protected boolean until(final int currentIteration) {
TestLogger.getLogger()
.info("Waiting for finish all processes: iter " + currentIteration + " of "
+ OBConstants.WAIT_PROCESSES_RETRY_MAX_ITER);
- return hasFinishAllProcesses();
+ return hasFinishAllProcesses() || hasIncreaseThePopups(numActivePopups);
}
@Override
@@ -153,6 +157,23 @@
"OB.UTIL.ProcessController && OB.UTIL.ProcessController.getProcessesInExecLog()");
}
+ public static boolean hasIncreaseThePopups(long currentNumberOfActivePopups) {
+ if (currentNumberOfActivePopups == -1) {
+ return false;
+ }
+ return numActivePopups() > currentNumberOfActivePopups;
+ }
+
+ public static long numActivePopups() {
+ Object numActivePopups = SeleniumHelper
+ .executeScriptWithReturn("OB.MobileApp.view.activePopups.length");
+ if (numActivePopups != null) {
+ return (long) numActivePopups;
+ } else {
+ return -1;
+ }
+ }
+
public static void disableSound(String jobName) {
// once disabled, don't disable again
// variable isThrottleDisabled is destroyed in each suite, so it is needed to check also in db
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/mobilecore/utils/RetailUtils.java
--- a/src-test/org/openbravo/test/mobile/retail/mobilecore/utils/RetailUtils.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/mobilecore/utils/RetailUtils.java Fri Mar 08 17:01:01 2019 +0100
@@ -105,7 +105,7 @@
// do nothing
break;
default:
- MobileCoreAPI.waitToFinishAllProcesses();
+ MobileCoreAPI.waitToFinishAllProcesses(0);
SynchronizationMonitor.waitUntilCurrentWindowIsRendered(currentWindow);
}
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/pack/selenium/terminals/WebPOSInvoicePrepaymentServiceTerminalHelper.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/terminals/WebPOSInvoicePrepaymentServiceTerminalHelper.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/terminals/WebPOSInvoicePrepaymentServiceTerminalHelper.java Fri Mar 08 17:01:01 2019 +0100
@@ -65,8 +65,8 @@
protected void approve() {
SeleniumHelper.executeScript("TestRegistry.appendIdTestToDOM()");
- write(TestIdPack.FIELD_APPROVAL_POPUP_USERNAME, "Openbravo");
- write(TestIdPack.FIELD_APPROVAL_POPUP_PASSWORD, "openbravo");
+ writeNoWaitProcesses(TestIdPack.FIELD_APPROVAL_POPUP_USERNAME, "Openbravo");
+ writeNoWaitProcesses(TestIdPack.FIELD_APPROVAL_POPUP_PASSWORD, "openbravo");
tap(TestIdPack.BUTTON_APPROVAL_POPUP_APPROVE);
}
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/attributes/ATT010_AttributesLayaways.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/attributes/ATT010_AttributesLayaways.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/attributes/ATT010_AttributesLayaways.java Fri Mar 08 17:01:01 2019 +0100
@@ -57,7 +57,7 @@
tap(TestIdPack.BUTTON_OK_POPUP);
isVisible(TestIdPack.LABEL_POPUP_TITLE, true);
verify(TestIdPack.LABEL_POPUP_TITLE, "The attribute value cannot be empty.");
- tap(TestIdPack.BUTTON_POPUP_CONFIRMATION_OK);
+ tapNoWaitProcesses(TestIdPack.BUTTON_POPUP_CONFIRMATION_OK);
tap(TestIdPack.ATTRIBUTE_BUTTON_CANCEL);
// layaway the receipt and try to add a product with attributes not setting the value for the
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/attributes/ATT020A_AttributesLayawaysChecks.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/attributes/ATT020A_AttributesLayawaysChecks.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/attributes/ATT020A_AttributesLayawaysChecks.java Fri Mar 08 17:01:01 2019 +0100
@@ -61,7 +61,7 @@
// test number of attributes
selectProduct();
- write(TestIdPack.ATTRIBUTE_VALUE_INPUT, "10001");
+ writeNoWaitProcesses(TestIdPack.ATTRIBUTE_VALUE_INPUT, "10001");
tap(TestIdPack.BUTTON_OK_POPUP);
tap(TestIdPack.BUTTON_PAY);
tap(TestIdPack.BUTTON_LAYAWAY);
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/attributes/ATT020B_AttributesLayawaysChecks.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/attributes/ATT020B_AttributesLayawaysChecks.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/attributes/ATT020B_AttributesLayawaysChecks.java Fri Mar 08 17:01:01 2019 +0100
@@ -61,10 +61,10 @@
tap(TestIdPack.BUTTON_MENU);
tap(TestIdPack.BUTTON_MENU_LAYAWAYTHISRECEIPT);
selectProduct();
- write(TestIdPack.ATTRIBUTE_VALUE_INPUT, ATTRIBUTE_SET);
+ writeNoWaitProcesses(TestIdPack.ATTRIBUTE_VALUE_INPUT, ATTRIBUTE_SET);
tap(TestIdPack.BUTTON_OK_POPUP);
selectProduct();
- write(TestIdPack.ATTRIBUTE_VALUE_INPUT, ATTRIBUTE_SET);
+ writeNoWaitProcesses(TestIdPack.ATTRIBUTE_VALUE_INPUT, ATTRIBUTE_SET);
tap(TestIdPack.BUTTON_OK_POPUP);
verify(TestIdPack.LABEL_POPUP_DINAMIC_CONFIRMATION_TITLE, EXPECTED_SAMEVALUE_ERROR_MESSAGE);
tap(TestIdPack.BUTTON_POPUP_CONFIRMATION_OK);
@@ -73,11 +73,11 @@
// test the cancel button, verify the product is not added when click on cancel button
selectProduct();
- write(TestIdPack.ATTRIBUTE_VALUE_INPUT, ATTRIBUTE_SET);
+ writeNoWaitProcesses(TestIdPack.ATTRIBUTE_VALUE_INPUT, ATTRIBUTE_SET);
tap(TestIdPack.ATTRIBUTE_BUTTON_CANCEL);
isVisible(TestIdPack.LABEL_NEW_RECEIPT, true);
selectProduct();
- write(TestIdPack.ATTRIBUTE_VALUE_INPUT, ATTRIBUTE_SET);
+ writeNoWaitProcesses(TestIdPack.ATTRIBUTE_VALUE_INPUT, ATTRIBUTE_SET);
tap(TestIdPack.BUTTON_OK_POPUP);
tap(TestIdPack.BUTTON_RECEIPT_ROW1);
tap(TestIdPack.PRODUCT_EDIT_ATTRIBUTES);
@@ -89,7 +89,7 @@
// check the trim in attribute's value
selectProduct();
- write(TestIdPack.ATTRIBUTE_VALUE_INPUT, " " + ATTRIBUTE_SET + " ");
+ writeNoWaitProcesses(TestIdPack.ATTRIBUTE_VALUE_INPUT, " " + ATTRIBUTE_SET + " ");
tap(TestIdPack.BUTTON_OK_POPUP);
receiptNo = BackboneHelper.getDocumentNo();
tap(TestIdPack.BUTTON_PAY);
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/attributes/ATT040_ReceiptsWithAttributes.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/attributes/ATT040_ReceiptsWithAttributes.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/attributes/ATT040_ReceiptsWithAttributes.java Fri Mar 08 17:01:01 2019 +0100
@@ -57,15 +57,15 @@
tap(TestIdPack.BUTTON_OK_POPUP);
isVisible(TestIdPack.LABEL_POPUP_TITLE, true);
verify(TestIdPack.LABEL_POPUP_TITLE, "The attribute value cannot be empty.");
- tap(TestIdPack.BUTTON_POPUP_CONFIRMATION_OK);
+ tapNoWaitProcesses(TestIdPack.BUTTON_POPUP_CONFIRMATION_OK);
tap(TestIdPack.ATTRIBUTE_BUTTON_CANCEL);
selectProduct();
- write(TestIdPack.ATTRIBUTE_VALUE_INPUT, "XYZ");
+ writeNoWaitProcesses(TestIdPack.ATTRIBUTE_VALUE_INPUT, "XYZ");
tap(TestIdPack.BUTTON_OK_POPUP);
tap(TestIdPack.BUTTON_RECEIPT_ROW1);
tap(TestIdPack.PRODUCT_EDIT_ATTRIBUTES);
- write(TestIdPack.ATTRIBUTE_VALUE_INPUT, ATTRIBUTE_SET);
+ writeNoWaitProcesses(TestIdPack.ATTRIBUTE_VALUE_INPUT, ATTRIBUTE_SET);
tap(TestIdPack.BUTTON_POPUP_MODALACTION_OK);
verify(TestIdPack.PRODUCT_ROW1_LABEL_ATTRIBUTE, "Attribute Value: " + ATTRIBUTE_SET);
tap(TestIdPack.BUTTON_PAY);
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/attributes/ATT090_AttributesInvoice.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/attributes/ATT090_AttributesInvoice.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/attributes/ATT090_AttributesInvoice.java Fri Mar 08 17:01:01 2019 +0100
@@ -59,7 +59,7 @@
// try to add a product with attributes, but do not set value for attribute, this should fail
selectProduct();
- write(TestIdPack.ATTRIBUTE_VALUE_INPUT, ATTRIBUTE_SET);
+ writeNoWaitProcesses(TestIdPack.ATTRIBUTE_VALUE_INPUT, ATTRIBUTE_SET);
tap(TestIdPack.BUTTON_OK_POPUP);
verify(TestIdPack.PRODUCT_ROW1_LABEL_ATTRIBUTE, "Attribute Value: " + ATTRIBUTE_SET);
tap(TestIdPack.BUTTON_PAY);
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/attributes/I37749_AttributeSetsAndControls.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/attributes/I37749_AttributeSetsAndControls.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/attributes/I37749_AttributeSetsAndControls.java Fri Mar 08 17:01:01 2019 +0100
@@ -70,25 +70,25 @@
write(TestIdPack.FIELD_SEARCH_TEXT, balaclavaSearchKey);
tap(TestIdPack.BUTTON_SEARCH_EXECUTE);
tap(TestIdPack.BUTTON_SEARCHPRODUCT_FIRSTROW);
- write(TestIdPack.ATTRIBUTE_VALUE_INPUT, balaclavaAttributeSet);
+ writeNoWaitProcesses(TestIdPack.ATTRIBUTE_VALUE_INPUT, balaclavaAttributeSet);
tap(TestIdPack.BUTTON_OK_POPUP);
tap(TestIdPack.BUTTON_SEARCH);
write(TestIdPack.FIELD_SEARCH_TEXT, travelCapSearchKey);
tap(TestIdPack.BUTTON_SEARCH_EXECUTE);
tap(TestIdPack.BUTTON_SEARCHPRODUCT_FIRSTROW);
- write(TestIdPack.ATTRIBUTE_VALUE_INPUT, travelCapAttributeSet);
+ writeNoWaitProcesses(TestIdPack.ATTRIBUTE_VALUE_INPUT, travelCapAttributeSet);
tap(TestIdPack.BUTTON_OK_POPUP);
tap(TestIdPack.BUTTON_SEARCH);
write(TestIdPack.FIELD_SEARCH_TEXT, skiLeggingsSearchKey);
tap(TestIdPack.BUTTON_SEARCH_EXECUTE);
tap(TestIdPack.BUTTON_SEARCHPRODUCT_FIRSTROW);
- write(TestIdPack.ATTRIBUTE_VALUE_INPUT, skiLeggingsAttributeSet);
+ writeNoWaitProcesses(TestIdPack.ATTRIBUTE_VALUE_INPUT, skiLeggingsAttributeSet);
tap(TestIdPack.BUTTON_OK_POPUP);
tap(TestIdPack.BUTTON_SEARCH);
write(TestIdPack.FIELD_SEARCH_TEXT, skiBooksSearchKey);
tap(TestIdPack.BUTTON_SEARCH_EXECUTE);
tap(TestIdPack.BUTTON_SEARCHPRODUCT_FIRSTROW);
- write(TestIdPack.ATTRIBUTE_VALUE_INPUT, skiBooksAttributeSet);
+ writeNoWaitProcesses(TestIdPack.ATTRIBUTE_VALUE_INPUT, skiBooksAttributeSet);
tap(TestIdPack.BUTTON_OK_POPUP);
verify(TestIdPack.LABEL_TOTALTOPAY, "241.38");
// Now, we change the quantities for aech line created
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/crossstore/CrossStoreTerminalHelper.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/crossstore/CrossStoreTerminalHelper.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/crossstore/CrossStoreTerminalHelper.java Fri Mar 08 17:01:01 2019 +0100
@@ -91,8 +91,8 @@
} else {
tap(TestIdPack.BUTTON_PAY_DONE);
TestRegistryHelper.forceRefresh();
- write(TestIdPack.FIELD_APPROVAL_POPUP_USERNAME, OPENBRAVO_USER);
- write(TestIdPack.FIELD_APPROVAL_POPUP_PASSWORD, OPENBRAVO_PASSWORD);
+ writeNoWaitProcesses(TestIdPack.FIELD_APPROVAL_POPUP_USERNAME, OPENBRAVO_USER);
+ writeNoWaitProcesses(TestIdPack.FIELD_APPROVAL_POPUP_PASSWORD, OPENBRAVO_PASSWORD);
tap(TestIdPack.BUTTON_APPROVAL_POPUP_APPROVE);
}
verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
@@ -119,8 +119,8 @@
} else {
tap(TestIdPack.BUTTON_PAY_CASH_50);
tap(TestIdPack.BUTTON_PAY_DONE);
- write(TestIdPack.FIELD_APPROVAL_POPUP_USERNAME, OPENBRAVO_USER);
- write(TestIdPack.FIELD_APPROVAL_POPUP_PASSWORD, OPENBRAVO_PASSWORD);
+ writeNoWaitProcesses(TestIdPack.FIELD_APPROVAL_POPUP_USERNAME, OPENBRAVO_USER);
+ writeNoWaitProcesses(TestIdPack.FIELD_APPROVAL_POPUP_PASSWORD, OPENBRAVO_PASSWORD);
tap(TestIdPack.BUTTON_APPROVAL_POPUP_APPROVE);
}
verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/multipricelists/MPLProductNoPriceList.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/multipricelists/MPLProductNoPriceList.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/multipricelists/MPLProductNoPriceList.java Fri Mar 08 17:01:01 2019 +0100
@@ -60,7 +60,10 @@
if (!SequentialTestInfo.getHighVolumenMode()) {
tap(TestIdPack.BUTTON_BROWSE);
tap(TestIdPack.BUTTON_CATEGORY_BACKPACKSANDTRAVEL);
- tap(TestIdPack.BUTTON_SEARCHPRODUCT_ALPINESKIING);
+
+ // tap(TestIdPack.BUTTON_SEARCHPRODUCT_ALPINESKIING);
+ tap(TestIdPack.BUTTON_PRODUCT_BACKPACKSANDTRAVEL_ALPINESKIING);
+
searchBusinessPartner("Janet Tucson");
verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
tap(TestIdPack.BUTTON_CATEGORY_BESTSELLERS);
diff -r 926eb33b65b7 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/receipts/I37298_VerifyAttSetInInvoice.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/receipts/I37298_VerifyAttSetInInvoice.java Thu Mar 07 08:40:53 2019 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/receipts/I37298_VerifyAttSetInInvoice.java Fri Mar 08 17:01:01 2019 +0100
@@ -58,7 +58,7 @@
write(TestIdPack.FIELD_SEARCH_TEXT, PRODUCT_NAME);
tap(TestIdPack.BUTTON_SEARCH_EXECUTE);
tap(TestIdPack.BUTTON_SEARCHPRODUCT_FIRSTROW);
- write(TestIdPack.ATTRIBUTE_VALUE_INPUT, ATTRIBUTE_SET);
+ writeNoWaitProcesses(TestIdPack.ATTRIBUTE_VALUE_INPUT, ATTRIBUTE_SET);
tap(TestIdPack.BUTTON_OK_POPUP);
tap(TestIdPack.BUTTON_MENU);
tap(TestIdPack.BUTTON_MENU_INVOICETHISRECEIPT);
|