Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# Pages/Customers.js
# Specs/gate1.js
diff --git a/Pages/Accounting b/Pages/Accounting
index 8206f69..45b19c2 100644
--- a/Pages/Accounting
+++ b/Pages/Accounting
@@ -54,7 +54,7 @@
browser.sleep(1000);
},
clickLinkShowForAccountWithName: function(identifier) {
- browser.sleep(1000);
+ browser.sleep(2000);
browser.wait(EC.invisibilityOf($("div[class='md-padding'] h3")), 5000);
browser.wait(EC.textToBePresentInElement($$("tbody tr .td-data-table-cell").last(), "SHOW"), 5000);
$$('tbody tr').filter(function(elem, index) {
diff --git a/Pages/Loans.js b/Pages/Loans.js
index 57e9d01..8b08bdd 100644
--- a/Pages/Loans.js
+++ b/Pages/Loans.js
@@ -159,6 +159,7 @@
},
enterTextIntoArrearsAllowanceAccountInputField: function(text) {
browser.executeScript("arguments[0].scrollIntoView();", arrearsAllowanceAccountInput.getWebElement());
+ browser.wait(EC.elementToBeClickable(arrearsAllowanceAccountInput), 3000);
arrearsAllowanceAccountInput.click().sendKeys(text);
},
clickEnabledCreateProductButton: function(){
