Protractor tests. Changed selectors.
diff --git a/Pages/Accounting b/Pages/Accounting
index a9212ec..2c9bc4e 100644
--- a/Pages/Accounting
+++ b/Pages/Accounting
@@ -10,8 +10,8 @@
var accountBalanceInput = $("fims-text-input[controlname='balance'] input");
var primaryButton = $$(".mat-raised-button.mat-primary");
var button = $$(".mat-raised-button.mat-accent");
-var radioButtonAsset = $$("md-radio-button").get(0);
-var radioButtonRevenue = $$("md-radio-button").get(4);
+var radioButtonAsset = $$("mat-radio-button").get(0);
+var radioButtonRevenue = $$("mat-radio-button").get(4);
//journal entries
var accountSearchInputField = $("fims-text-input[controlname='account'] input");
diff --git a/Pages/Customers.js b/Pages/Customers.js
index fa9a628..0216f55 100644
--- a/Pages/Customers.js
+++ b/Pages/Customers.js
@@ -11,7 +11,7 @@
var middleNameInput = $("fims-text-input[controlname='middleName'] input");
var lastNameInput = $("fims-text-input[controlname='lastName'] input");
var birthDayInput = $("#dayOfBirth");
-var memberCheckbox = $("md-checkbox[formcontrolname='member']");
+var memberCheckbox = $("mat-checkbox[formcontrolname='member']");
var streetInput = $("fims-text-input[controlname='street'] input");
var cityInput = $("fims-text-input[controlname='city'] input");
var countrySelect = $("input[formcontrolname='country']");
@@ -20,7 +20,7 @@
var mobileInput = $("fims-text-input[controlname='mobile'] input");
//create deposit account
-var productSelect = $("md-select[formcontrolname='productIdentifier'] .mat-select-trigger");
+var productSelect = $("mat-select[formcontrolname='productIdentifier'] .mat-select-trigger");
var beneficiaryInput = $("td-chips[formcontrolname='beneficiaries'] input");
//create loan account
@@ -28,8 +28,8 @@
var principalAmountInput = $("fims-number-input[controlname='principalAmount'] input");
var termInput = $("fims-text-input[controlname='term'] input");
var paymentPeriod = $("fima-text-input[controlname='paymentPeriod'] input");
-var depositAccountSelect = $("md-select[formcontrolname='depositAccountIdentifier'] .mat-select-trigger");
-var dayForMonthlyRepaySelect = $("md-select[formcontrolname='monthSettingDay'] .mat-select-trigger");
+var depositAccountSelect = $("mat-select[formcontrolname='depositAccountIdentifier'] .mat-select-trigger");
+var dayForMonthlyRepaySelect = $("mat-select[formcontrolname='monthSettingDay'] .mat-select-trigger");
//identification cards
var identificationCardNumberInput = $("fims-id-input[controlname='number'] input");
@@ -41,11 +41,11 @@
var identifierInput = $("fims-id-input[controlname='identifier'] input");
var nameInput = $("fims-text-input[controlname='name'] input");
var descriptionInput = $("textarea[formcontrolname='identifier']");
-var radioButtonFourEyes = $$("md-radio-group[formcontrolname='type'] md-radio-button").get(1);
-var radioButtonCustom = $$("md-radio-group[formcontrolname='type'] md-radio-button").get(2);
-var radioButtonIdentificationCard = $$("md-radio-group[formcontrolname='type'] md-radio-button").get(0);
-var checkboxMandatory = $("md-checkbox[formcontrolname='mandatory']");
-var checkboxAutoAssign = $("md-checkbox[formcontrolname='predefined']");
+var radioButtonFourEyes = $$("mat-radio-group[formcontrolname='type'] mat-radio-button").get(1);
+var radioButtonCustom = $$("mat-radio-group[formcontrolname='type'] mat-radio-button").get(2);
+var radioButtonIdentificationCard = $$("mat-radio-group[formcontrolname='type'] mat-radio-button").get(0);
+var checkboxMandatory = $("mat-checkbox[formcontrolname='mandatory']");
+var checkboxAutoAssign = $("mat-checkbox[formcontrolname='predefined']");
//payroll
@@ -223,7 +223,7 @@
browser.executeScript("arguments[0].scrollIntoView();", opt.getWebElement());
browser.wait(EC.elementToBeClickable(opt), 2000);
opt.click();
- browser.wait(EC.invisibilityOf($("md-tooltip-component")), 4000);
+ browser.wait(EC.invisibilityOf($("mat-tooltip-component")), 4000);
},
clickEnabledButtonCreateDepositAccount: function () {
browser.wait(EC.elementToBeClickable($(".mat-raised-button.mat-primary")), 5000);
@@ -358,9 +358,9 @@
$('a[href="' + link + '"]').click();
},
selectExecuteTaskCheckbox: function(){
- browser.wait(EC.visibilityOf($("md-checkbox[title='Execute task']")), 3000);
- $("md-checkbox[title='Execute task']").click();
- expect($("md-checkbox[title='Execute task']").getAttribute("class")).toMatch("mat-checkbox-checked");
+ browser.wait(EC.visibilityOf($("mat-checkbox[title='Execute task']")), 3000);
+ $("mat-checkbox[title='Execute task']").click();
+ expect($("mat-checkbox[title='Execute task']").getAttribute("class")).toMatch("mat-checkbox-checked");
},
clickButtonForTask: function (action) {
$$('.mat-raised-button.mat-accent').filter(function (elem, index) {
diff --git a/Pages/Deposits.js b/Pages/Deposits.js
index 49bbb57..b02769e 100644
--- a/Pages/Deposits.js
+++ b/Pages/Deposits.js
@@ -5,27 +5,27 @@
var EC = protractor.ExpectedConditions;
var titleRow = $("fims-layout-card-over .mat-toolbar-row span");
var createDeposit = $("a[href='/deposits/create']");
-var radioGroupType = $("md-radio-group[formcontrolname='type']")
-var radioChecking = $$("md-radio-group md-radio-button").get(0);
-var radioSavings = $$("md-radio-group md-radio-button").get(1);
-var radioShare = $$("md-radio-group md-radio-button").get(2);
+var radioGroupType = $("mat-radio-group[formcontrolname='type']")
+var radioChecking = $$("mat-radio-group mat-radio-button").get(0);
+var radioSavings = $$("mat-radio-group mat-radio-button").get(1);
+var radioShare = $$("mat-radio-group mat-radio-button").get(2);
var shortNameInput = $("fims-id-input[controlname='identifier'] input");
var nameInput = $("fims-text-input[controlname='name'] input");
var descriptionInput = $(".mat-input-infix input[formcontrolname='description']");
var minimumBalanceInput = $("fims-number-input[controlname='minimumBalance'] input");
-var currencySelect = $("md-select[formcontrolname='currencyCode']");
-var radioGroupInterest = $("md-radio-group[formcontrolname='termInterestPayable']");
-var radioMaturity = radioGroupInterest.$$("md-radio-button").get(0);
-var radioAnnually = radioGroupInterest.$$("md-radio-button").get(1);
-var radioQuarterly = radioGroupInterest.$$("md-radio-button").get(2);
-var radioMonthly = radioGroupInterest.$$("md-radio-button").get(3);
-var checkboxFlexibleInterest = $("md-checkbox[formcontrolname='flexible']")
+var currencySelect = $("mat-select[formcontrolname='currencyCode']");
+var radioGroupInterest = $("mat-radio-group[formcontrolname='termInterestPayable']");
+var radioMaturity = radioGroupInterest.$$("mat-radio-button").get(0);
+var radioAnnually = radioGroupInterest.$$("mat-radio-button").get(1);
+var radioQuarterly = radioGroupInterest.$$("mat-radio-button").get(2);
+var radioMonthly = radioGroupInterest.$$("mat-radio-button").get(3);
+var checkboxFlexibleInterest = $("mat-checkbox[formcontrolname='flexible']")
var interestInput = $("fims-number-input[controlname='interest'] input");
var termPeriodInput = $("fims-text-input[controlname='termPeriod'] input");
-var fixedTermEnabledToggle = $("md-slide-toggle[formcontrolname='fixedTermEnabled']");
-var termTimeUnit = $("md-radio-group[formcontrolname='termTimeUnit']");
-var radioMonth = termTimeUnit.$$("md-radio-button").get(0);
-var radioYear = termTimeUnit.$$("md-radio-button").get(1);
+var fixedTermEnabledToggle = $("mat-slide-toggle[formcontrolname='fixedTermEnabled']");
+var termTimeUnit = $("mat-radio-group[formcontrolname='termTimeUnit']");
+var radioMonth = termTimeUnit.$$("mat-radio-button").get(0);
+var radioYear = termTimeUnit.$$("mat-radio-button").get(1);
var cashAccountInput = $("fims-account-select[formcontrolname='cashAccountIdentifier'] input");
var expenseAccountInput = $("fims-account-select[formcontrolname='expenseAccountIdentifier'] input");
@@ -37,12 +37,12 @@
var chargeDescriptionInput = $("input[formcontrolname='description']");
var chargeAmountInput1 = $$("fims-number-input[controlname='amount'] input").get(0);
var chargeAmountInput2 = $$("fims-number-input[controlname='amount'] input").get(1);
-var chargeTypeSelect1 = $$("md-select[formcontrolname='actionIdentifier']").get(0);
-var chargeTypeSelect2 = $$("md-select[formcontrolname='actionIdentifier']").get(1);
+var chargeTypeSelect1 = $$("mat-select[formcontrolname='actionIdentifier']").get(0);
+var chargeTypeSelect2 = $$("mat-select[formcontrolname='actionIdentifier']").get(1);
var incomeAccountInput1 = $$("fims-account-select[formcontrolname='incomeAccountIdentifier'] input").get(0);
var incomeAccountInput2 = $$("fims-account-select[formcontrolname='incomeAccountIdentifier'] input").get(1);
-var checkboxProportional1 = $$("md-checkbox[formcontrolname='proportional']").get(0);
-var checkboxProportional2 = $$("md-checkbox[formcontrolname='proportional'] label").get(1);
+var checkboxProportional1 = $$("mat-checkbox[formcontrolname='proportional']").get(0);
+var checkboxProportional2 = $$("mat-checkbox[formcontrolname='proportional'] label").get(1);
var primaryButton = $$(".mat-raised-button.mat-primary");
module.exports = {
@@ -139,12 +139,12 @@
expect(termPeriodInput.isEnabled()).toBe(true);
},
verifyRadioButtonsMonthAndYearDisabled: function() {
- expect(termTimeUnit.$$("md-radio-button input").get(0).isEnabled()).toBe(false);
- expect(termTimeUnit.$$("md-radio-button input").get(1).isEnabled()).toBe(false);
+ expect(termTimeUnit.$$("mat-radio-button input").get(0).isEnabled()).toBe(false);
+ expect(termTimeUnit.$$("mat-radio-button input").get(1).isEnabled()).toBe(false);
},
verifyRadioButtonsMonthAndYearEnabled: function() {
- expect(termTimeUnit.$$("md-radio-button input").get(0).isEnabled()).toBe(true);
- expect(termTimeUnit.$$("md-radio-button input").get(1).isEnabled()).toBe(true);
+ expect(termTimeUnit.$$("mat-radio-button input").get(0).isEnabled()).toBe(true);
+ expect(termTimeUnit.$$("mat-radio-button input").get(1).isEnabled()).toBe(true);
},
selectRadioButtonMonth: function(){
browser.executeScript("arguments[0].scrollIntoView();", radioMonth.getWebElement());
diff --git a/Pages/Employees.js b/Pages/Employees.js
index 717e913..cf8edce 100644
--- a/Pages/Employees.js
+++ b/Pages/Employees.js
@@ -64,7 +64,7 @@
},
selectRoleByName: function(name){
browser.sleep();
- roleSelection = $("md-select[formcontrolname='role'] .mat-select-trigger");
+ roleSelection = $("mat-select[formcontrolname='role'] .mat-select-trigger");
browser.wait(EC.elementToBeClickable(roleSelection), 3000);
roleSelection.click();
browser.wait(EC.visibilityOf($(".mat-option")), 5000);
diff --git a/Pages/Loans.js b/Pages/Loans.js
index 1eb497a..362986b 100644
--- a/Pages/Loans.js
+++ b/Pages/Loans.js
@@ -9,11 +9,11 @@
var descriptionInput = $(".mat-input-infix textarea[formcontrolname='description']");
var minimumPrincipalInput = $("fims-min-max input[placeholder='Minimum principal amount']");
var maximumPrincipalInput = $("fims-min-max input[placeholder='Maximum principal amount']");
-var currencySelect = $("md-select[formcontrolname='currencyCode']");
+var currencySelect = $("mat-select[formcontrolname='currencyCode']");
var termInput = $("fims-text-input[controlname='term'] input");
-var radioWeeks = $$("md-radio-group .mat-radio-button").first();
-var radioMonths = $$("md-radio-group .mat-radio-button").get(1);
-var radioYears = $$("md-radio-group .mat-radio-button").get(2);
+var radioWeeks = $$("mat-radio-group .mat-radio-button").first();
+var radioMonths = $$("mat-radio-group .mat-radio-button").get(1);
+var radioYears = $$("mat-radio-group .mat-radio-button").get(2);
var cashAccountInput = $("fims-account-select[formcontrolname='loanFundAccount'] input");
var loanInProcessLedgerInput = $("fims-ledger-select[formcontrolname='loansPayableLedger'] input");
@@ -35,17 +35,17 @@
var primaryButton = $$(".mat-raised-button.mat-primary");
var feeAmountInput = $("fims-text-input[controlname='amount'] input");
-var feeProportionalToSelect = $("md-select[formcontrolname='proportionalTo'] .mat-select-trigger");
-var radioFixed = $$("md-radio-group[formcontrolname='chargeMethod'] md-radio-button").get(0);
-var radioProportional = $$("md-radio-group[formcontrolname='chargeMethod'] md-radio-button").get(1);
+var feeProportionalToSelect = $("mat-select[formcontrolname='proportionalTo'] .mat-select-trigger");
+var radioFixed = $$("mat-radio-group[formcontrolname='chargeMethod'] mat-radio-button").get(0);
+var radioProportional = $$("mat-radio-group[formcontrolname='chargeMethod'] mat-radio-button").get(1);
var taskIdentifierInput = $("fims-id-input[controlname='identifier'] input");
var taskNameInput = $("fims-text-input[controlname='name'] input");
var taskDescriptionInput = $(".mat-input-infix textarea[formcontrolname='description']");
-var mandatoryCheckbox = $("md-checkbox[formcontrolname='mandatory']");
-var fourEyesCheckbox = $("md-checkbox[formcontrolname='fourEyes']");
-var actionSelect1 = $("md-select[formcontrolname='action'] .mat-select-trigger");
-var actionSelect2 = $$("md-select[formcontrolname='action'] .mat-select-trigger").get(1);
+var mandatoryCheckbox = $("mat-checkbox[formcontrolname='mandatory']");
+var fourEyesCheckbox = $("mat-checkbox[formcontrolname='fourEyes']");
+var actionSelect1 = $("mat-select[formcontrolname='action'] .mat-select-trigger");
+var actionSelect2 = $$("mat-select[formcontrolname='action'] .mat-select-trigger").get(1);
module.exports = {
goToLoanProductsViaSidePanel: function() {
@@ -126,6 +126,7 @@
$$(".mat-raised-button").get(3).click();
},
enterTextIntoProcessingFeeIncomeAccountInputField: function(text) {
+ browser.sleep(100);
browser.executeScript("arguments[0].scrollIntoView();", processingFeeIncomeAccountInput.getWebElement());
browser.wait(EC.elementToBeClickable(processingFeeIncomeAccountInput), 2000);
processingFeeIncomeAccountInput.click().sendKeys(text);
diff --git a/Pages/Login.js b/Pages/Login.js
index ea5786c..3f30920 100644
--- a/Pages/Login.js
+++ b/Pages/Login.js
@@ -10,7 +10,7 @@
var inputPassword = $(".mat-input-element[formcontrolname='password']");
var inputNewPassword = $(".mat-input-element[formcontrolname='newPassword']");
var inputConfirmNewPassword = $(".mat-input-element[formcontrolname='confirmNewPassword']");
-var userAccountButton =$$("md-toolbar-row .mat-icon-button").get(1);
+var userAccountButton =$$("mat-toolbar-row .mat-icon-button").get(1);
var buttonSignOut = $$(".mat-menu-panel .mat-menu-item").get(2);
module.exports = {
diff --git a/Pages/Offices.js b/Pages/Offices.js
index ac6f9f5..7976e55 100644
--- a/Pages/Offices.js
+++ b/Pages/Offices.js
@@ -22,9 +22,9 @@
//open teller
var assignedEmployeeInput = $("fims-employee-auto-complete[formcontrolname='assignedEmployeeIdentifier'] input");
var amountInput = $("fims-text-input[controlname='amount'] input");
-var radioNone = $$("md-radio-group[formcontrolname='adjustment'] md-radio-button").first();
-var radioCashIn = $$("md-radio-group[formcontrolname='adjustment'] md-radio-button").last();
-var radioCashOut = $$("md-radio-group[formcontrolname='adjustment'] md-radio-button").last();
+var radioNone = $$("mat-radio-group[formcontrolname='adjustment'] mat-radio-button").first();
+var radioCashIn = $$("mat-radio-group[formcontrolname='adjustment'] mat-radio-button").last();
+var radioCashOut = $$("mat-radio-group[formcontrolname='adjustment'] mat-radio-button").last();
//general elements
@@ -106,7 +106,7 @@
},
verifyCashWithdrawalLimitInputFieldHasError: function(text) {
expect(withdrawalLimitInput.getAttribute("class")).toMatch("ng-invalid");
- expect(withdrawalLimitInput.element(by.xpath("..")).element(by.xpath("..")).element(by.xpath("..")).$("md-error").getText()).toEqual(text);
+ expect(withdrawalLimitInput.element(by.xpath("..")).element(by.xpath("..")).element(by.xpath("..")).$("mat-error").getText()).toEqual(text);
},
enterTextIntoTellerAccountInputFieldAndSelectMatchingEntry: function(text) {
tellerAccountInput.click().clear().sendKeys(text);
@@ -123,7 +123,7 @@
},
verifyVaultAccountInputFieldHasError: function(text) {
expect(vaultAccountInput.getAttribute("class")).toMatch("ng-invalid");
- expect(vaultAccountInput.element(by.xpath("..")).element(by.xpath("..")).element(by.xpath("..")).$("md-error").getText()).toEqual(text);
+ expect(vaultAccountInput.element(by.xpath("..")).element(by.xpath("..")).element(by.xpath("..")).$("mat-error").getText()).toEqual(text);
},
enterTextIntoChequesReceivableAccountInputFieldAndSelectMatchingEntry: function(text) {
chequesReceivableAccountInput.click().clear().sendKeys(text);
@@ -134,8 +134,8 @@
chequesReceivableAccountInput.click().clear().sendKeys(text);
},
verifyChequesReceivableAccountInputFieldHasError: function(text) {
- browser.wait(EC.presenceOf($("md-hint")), 2500);
- expect(chequesReceivableAccountInput.element(by.xpath("..")).element(by.xpath("..")).element(by.xpath("..")).$("md-hint").getText()).toEqual(text);
+ browser.wait(EC.presenceOf($("mat-hint")), 2500);
+ expect(chequesReceivableAccountInput.element(by.xpath("..")).element(by.xpath("..")).element(by.xpath("..")).$("mat-hint").getText()).toEqual(text);
},
verifyRadioNoneSelected: function(){
expect(radioNone.getAttribute('class')).toMatch("mat-radio-checked");
diff --git a/Pages/Roles.js b/Pages/Roles.js
index b3ae2a0..c7def3c 100644
--- a/Pages/Roles.js
+++ b/Pages/Roles.js
@@ -4,7 +4,7 @@
var EC = protractor.ExpectedConditions;
var identifierInput = $(".mat-input-infix input[placeholder='Identifier']");
-var checkboxAllPermissionsDelete = $$("md-checkbox").get(2);
+var checkboxAllPermissionsDelete = $$("mat-checkbox").get(2);
var createNewRoleQA = $("a[href='/roles/create']");
var titleRow = $("fims-layout-card-over .mat-toolbar-row span");
var primaryButton = $$(".mat-raised-button.mat-primary");
diff --git a/Pages/Teller.js b/Pages/Teller.js
index e7bc18f..9e176a5 100644
--- a/Pages/Teller.js
+++ b/Pages/Teller.js
@@ -5,12 +5,12 @@
var EC = protractor.ExpectedConditions;
var tellerNumberInput = $("input[placeholder='Teller number']");
var passwordInput = $("input[formcontrolname='password']");
-var accountSelect = $("md-select[formcontrolname='productInstance'] .mat-select-trigger");
+var accountSelect = $("mat-select[formcontrolname='productInstance'] .mat-select-trigger");
var amountInput = $("fims-text-input[controlname='amount'] input");
var primaryButton = $$(".mat-raised-button.mat-primary");
-var checkboxChargesInCash = $("md-checkbox");
+var checkboxChargesInCash = $("mat-checkbox");
-var loanAccountSelect = $("md-select[formcontrolname='caseInstance'] .mat-select-trigger");
+var loanAccountSelect = $("mat-select[formcontrolname='caseInstance'] .mat-select-trigger");
module.exports = {
goToTellerManagementViaSidePanel: function() {
@@ -166,9 +166,9 @@
amountInput.click().clear().sendKeys(text);
},
verifyAmountInputFieldHasError: function(text) {
- $(".text-md").click();
+ $(".text-mat").click();
expect(amountInput.getAttribute("class")).toMatch("ng-invalid");
- expect(amountInput.element(by.xpath("..")).element(by.xpath("..")).element(by.xpath("..")).$("md-error").getText()).toEqual(text);
+ expect(amountInput.element(by.xpath("..")).element(by.xpath("..")).element(by.xpath("..")).$("mat-error").getText()).toEqual(text);
},
clickEnabledCreateTransactionButton: function(){
primaryButton.filter(function(elem, index) {
@@ -233,7 +233,7 @@
})).toBe(true);
},
verifyCashdrawLimitHintIsDisplayed: function(text){
- browser.wait(EC.textToBePresentInElement($(".text-md"), text), 2000);
+ browser.wait(EC.textToBePresentInElement($(".text-mat"), text), 2000);
},
verifyExpectedPaymentAmount: function(text) {
browser.wait(EC.textToBePresentInElement($("fims-loan-transaction-form p"), text), 2000);
