Merge pull request #994 from microting/copilot/fix-2609c090-4c58-4853-acc3-c8b2f5065d38

Update CustomersSettings.page.ts to conform to new WebdriverIO style pattern

Author: renemadsen

eform-client/e2e/Page objects/Customers/CustomersSettings.page.ts

@@ -6,47 +6,57 @@ export class CustomersSettingsPage extends Page {
   }
 
   public get deleteCustomerBtn() {
-    $('#cancelCreateBtn').waitForDisplayed({timeout: 20000});
-    $('#cancelCreateBtn').waitForClickable({timeout: 20000});
-    return $('#cancelCreateBtn');
+    const ele = $('#cancelCreateBtn');
+    ele.waitForDisplayed({timeout: 20000});
+    ele.waitForClickable({timeout: 20000});
+    return ele;
   }
 
   public get saveEditBtn() {
-    $('#saveEditBtn').waitForDisplayed({timeout: 20000});
-    $('#saveEditBtn').waitForClickable({timeout: 20000});
-    return $('#saveEditBtn');
+    const ele = $('#saveEditBtn');
+    ele.waitForDisplayed({timeout: 20000});
+    ele.waitForClickable({timeout: 20000});
+    return ele;
   }
 
   public get cancelEditBtn() {
-    $('#cancelEditBtn').waitForDisplayed({timeout: 20000});
-    $('#cancelEditBtn').waitForClickable({timeout: 20000});
-    return $('#cancelEditBtn');
+    const ele = $('#cancelEditBtn');
+    ele.waitForDisplayed({timeout: 20000});
+    ele.waitForClickable({timeout: 20000});
+    return ele;
   }
 
   public get saveDeleteBtn() {
-    $('#saveDeleteBtn').waitForDisplayed({timeout: 20000});
-    $('#saveDeleteBtn').waitForClickable({timeout: 20000});
-    return $('#saveDeleteBtn');
+    const ele = $('#saveDeleteBtn');
+    ele.waitForDisplayed({timeout: 20000});
+    ele.waitForClickable({timeout: 20000});
+    return ele;
   }
 
   public get cancelDeleteBtn() {
-    $('#cancelDeleteBtn').waitForDisplayed({timeout: 20000});
-    $('#cancelDeleteBtn').waitForClickable({timeout: 20000});
-    return $('#cancelDeleteBtn');
+    const ele = $('#cancelDeleteBtn');
+    ele.waitForDisplayed({timeout: 20000});
+    ele.waitForClickable({timeout: 20000});
+    return ele;
   }
   public getCheckboxById(id: string) {
-    return $('#checkbox' + id);
+    const ele = $('#checkbox' + id);
+    ele.waitForDisplayed({ timeout: 20000 });
+    return ele;
   }
 
   public clickCheckboxById(id: string) {
-    const el = $('#mat-checkbox' + id);
-    el.click();
+    const ele = $('#mat-checkbox' + id);
+    ele.waitForDisplayed({ timeout: 20000 });
+    ele.waitForClickable({ timeout: 20000 });
+    ele.click();
     // browser.pause(1000);
   }
   public  getSearchField() {
-    $('.ng-input > input').waitForDisplayed({timeout: 20000});
-    $('.ng-input > input').waitForClickable({timeout: 20000});
-    return $('.ng-input > input');
+    const ele = $('.ng-input > input');
+    ele.waitForDisplayed({timeout: 20000});
+    ele.waitForClickable({timeout: 20000});
+    return ele;
   }
   public getListOfChoices() {
     return browser.$$('.ng-option');
@@ -57,6 +67,8 @@ export class CustomersSettingsPage extends Page {
 
   public saveSettings() {
     const saveSettingsBtn = $('#saveSettingsBtn');
+    saveSettingsBtn.waitForDisplayed({ timeout: 20000 });
+    saveSettingsBtn.waitForClickable({ timeout: 20000 });
     saveSettingsBtn.click();
     //$('.ng-input > input').waitForDisplayed({timeout: 20000});
     //$('.ng-input > input').waitForClickable({timeout: 20000});

eform-client/e2e/Tests/customer-general/customer.settings.spec.ts

@@ -16,7 +16,10 @@ describe('Customers plugin settings page', function () {
     spinnerAnimation.waitForDisplayed({ timeout: 20000, reverse: true });
 
     const plugin = pluginPage.getFirstPluginRowObj();
-    plugin.settingsBtn.click();
+    const settingsBtn = plugin.settingsBtn;
+    settingsBtn.waitForDisplayed({ timeout: 20000 });
+    settingsBtn.waitForClickable({ timeout: 20000 });
+    settingsBtn.click();
     spinnerAnimation.waitForDisplayed({ timeout: 20000, reverse: true });
     const customerCheckbox = customersSettingsPage.getCheckboxById(
       'CustomerNo'
@@ -66,7 +69,10 @@ describe('Customers plugin settings page', function () {
     myEformsPage.Navbar.goToPluginsPage();
     spinnerAnimation.waitForDisplayed({ timeout: 20000, reverse: true });
 
-    plugin.settingsBtn.click();
+    const settingsBtn2 = plugin.settingsBtn;
+    settingsBtn2.waitForDisplayed({ timeout: 20000 });
+    settingsBtn2.waitForClickable({ timeout: 20000 });
+    settingsBtn2.click();
     spinnerAnimation.waitForDisplayed({ timeout: 20000, reverse: true });
     expect(
       customerCheckbox.getValue(),
@@ -86,7 +92,10 @@ describe('Customers plugin settings page', function () {
     spinnerAnimation.waitForDisplayed({ timeout: 20000, reverse: true });
 
     const plugin = pluginPage.getFirstPluginRowObj();
-    plugin.settingsBtn.click();
+    const settingsBtn = plugin.settingsBtn;
+    settingsBtn.waitForDisplayed({ timeout: 20000 });
+    settingsBtn.waitForClickable({ timeout: 20000 });
+    settingsBtn.click();
     spinnerAnimation.waitForDisplayed({ timeout: 20000, reverse: true });
 
     const checkboxIds = [
@@ -130,7 +139,10 @@ describe('Customers plugin settings page', function () {
     spinnerAnimation.waitForDisplayed({ timeout: 20000, reverse: true });
 
     const plugin = pluginPage.getFirstPluginRowObj();
-    plugin.settingsBtn.click();
+    const settingsBtn = plugin.settingsBtn;
+    settingsBtn.waitForDisplayed({ timeout: 20000 });
+    settingsBtn.waitForClickable({ timeout: 20000 });
+    settingsBtn.click();
     spinnerAnimation.waitForDisplayed({ timeout: 20000, reverse: true });
     const checkboxIds = [
       'Version',
@@ -158,7 +170,10 @@ describe('Customers plugin settings page', function () {
     spinnerAnimation.waitForDisplayed({ timeout: 20000, reverse: true });
 
     const plugin = pluginPage.getFirstPluginRowObj();
-    plugin.settingsBtn.click();
+    const settingsBtn = plugin.settingsBtn;
+    settingsBtn.waitForDisplayed({ timeout: 20000 });
+    settingsBtn.waitForClickable({ timeout: 20000 });
+    settingsBtn.click();
     spinnerAnimation.waitForDisplayed({ timeout: 20000, reverse: true });
 
     const checkboxIds = [