Finished tags tests + test refactoring

Author: Vladislav

eform-client/e2e/Helper methods/other-helper-methods.ts

@@ -1,13 +1,13 @@
-import {browser, ExpectedConditions} from 'protractor';
+import {browser, ElementFinder, ExpectedConditions} from 'protractor';
 import {LoginPage} from '../Page objects/LoginPage';
 import {default as data} from '../data';
 import {Navbar} from '../Page objects/Navbar';
 
 const loginPage = new LoginPage();
 const navbar = new Navbar();
-const startPageUrl = data.startPageUrl;
 
 export function waitTillVisibleAndClick(element): void {
+  browser.waitForAngular();
   browser.wait(ExpectedConditions.visibilityOf(element));
   element.click();
 }
@@ -27,3 +27,4 @@ export function signOut() {
 export function waitFor(element) {
   browser.wait(ExpectedConditions.elementToBeClickable(element));
 }
+

eform-client/e2e/Page objects/Device users/DeviceUsersPage.ts

@@ -9,9 +9,9 @@ import {DeleteModal} from './delete.modal';
 export class DeviceUsersPage {
 
   // modal windows
-  OTPModal = new OtpModal();
-  addNewUserModal = new AddNewUserModal();
-  deleteModal = new DeleteModal();
+  OTPModal: OtpModal;
+  addNewUserModal: AddNewUserModal;
+  deleteModal: DeleteModal;
   // elements
   newDeviceUserButton: ElementFinder;
   deleteUserButton: ElementFinder;
@@ -24,16 +24,20 @@ export class DeviceUsersPage {
 
   async usersCleanup() {
     let startNum = await this.getRowsNumber();
-    while (startNum > 2) {
+    for (let i = 0; i < startNum - 2; i++) {
+      // while (startNum > 2) {
       this.deleteUserButton.click();
       this.deleteModal.okButton.click();
       startNum = await this.getRowsNumber();
     }
-    return;
+    // return;
   }
 
   constructor() {
     this.newDeviceUserButton = $('#newDeviceUserButton');
     this.deleteUserButton = element(by.xpath(data.DeviceUsersPage.deleteUserXPath));
+    this.OTPModal = new OtpModal();
+    this.addNewUserModal = new AddNewUserModal();
+    this.deleteModal = new DeleteModal();
   }
 }

eform-client/e2e/Page objects/Device users/delete.modal.ts

@@ -5,7 +5,7 @@ export class DeleteModal {
   public cancelButton: ElementFinder;
 
   constructor() {
-    this.okButton = $('#deleteOkButton');
-    this.cancelButton = $('#deleteCancelButton');
+    this.okButton = $('#deleteModalOkButton');
+    this.cancelButton = $('#deleteModalCancelButton');
   }
 }

eform-client/e2e/Page objects/Main Page/MainPage.ts

@@ -1,11 +1,9 @@
-import {$, $$, browser, by, element, ElementArrayFinder, ElementFinder, ExpectedConditions} from 'protractor';
+import {$, $$, by, element, ElementArrayFinder, ElementFinder} from 'protractor';
 import {DeleteEformModal} from './delete-eform.modal';
 import {EditColumnsModal} from './edit-columns.modal';
 import {EditTagModal} from './edit-tag.modal';
 import {PairEformModal} from './pair-eform.modal';
 import {CreateEformModal} from './create-eform.modal';
-import {MainPageRowObject} from './mainPage.row-object';
-import {promise} from 'selenium-webdriver';
 
 export class MainPage {
   // Modals
@@ -30,31 +28,10 @@ export class MainPage {
     return await rowNum;
   }
 
-  selectTagForFilter(tagName) {
-    const tag = element(by.xpath(`//*[@id="tagSelector"]//span[text()="${tagName}"]`));
-    tag.click();
-  }
-
   getTagsForFilter(): ElementArrayFinder {
     return element.all(by.xpath('//*[@id="tagSelector"]/div/div/a'));
   }
 
-  sortByID() {
-
-  }
-
-  sortByCreatedAt() {
-
-  }
-
-  sortByNameEForm() {
-
-  }
-
-  deleteEform() {
-
-  }
-
   constructor() {
     // modals
     this.deleteEformModal = new DeleteEformModal();

eform-client/e2e/Page objects/Main Page/create-eform.modal.ts

@@ -18,17 +18,14 @@ export class CreateEformModal {
     const tag = element(by.xpath(`//*[@id="createEFormMultiSelector"]//span[text()="${tagName}"]`));
     tag.click();
   };
+
   enterXML(name) {
     let text = xmlData.xmlTest1.text;
     text = text.replace(data.MainPage.wordToReplaceInXML,
       name + Math.floor(Math.random() * data.MainPage.auxiliaryNumberForReplacing) + 1);
     this.xmlTextArea.clear();
-    // browser.executeScript(this.xmlTextArea)
-    // let sampletext = 'SAMPLE_TEXT--';
-    // browser.executeScript('document.getElementById(\'eFormXml\').value = arguments[0]', text);
-    // browser.executeScript('document.getElementById(\'eFormXml\').setAttribute(\'ng-reflect-model\', arguments[0])', text);
-    // browser.executeScript('document.getElementById(\'eFormXml\').setAttribute(\'value\', arguments[0])', text);
-    this.xmlTextArea.sendKeys(text);
+    browser.executeScript(`document.querySelector('#eFormXml').value = arguments[0];`, text);
+    this.xmlTextArea.sendKeys(' ');
   }
 
   constructor() {
@@ -40,5 +37,4 @@ export class CreateEformModal {
     this.saveEFormBtn = $('#createEFormSaveEFormBtn');
     this.closeTagInputBtn = $('#closeTagInputBtn');
   }
-
 }

eform-client/e2e/Page objects/Main Page/delete-eform.modal.ts

@@ -5,7 +5,7 @@ export class DeleteEformModal {
   deleteEFormOkBtn: ElementFinder;
   deleteEFormCancelBtn: ElementFinder;
 
-  constructor(){
+  constructor() {
     this.deleteEFormOkBtn = $('#deleteEFormOkBtn');
     this.deleteEFormCancelBtn = $('#deleteEFormCancelBtn');
   }

eform-client/e2e/Page objects/Main Page/edit-tag.modal.ts

@@ -1,3 +1,40 @@
+import {$, $$, by, element, ElementArrayFinder, ElementFinder} from 'protractor';
+import data from '../../data';
+
 export class EditTagModal {
+  // elements
+  saveBtn: ElementFinder;
+  saveNewTagBtn: ElementFinder;
+  deleteTagBtn: ElementFinder;
+  templateTagsSelector: ElementFinder;
+  newTagInput: ElementFinder;
+  cancelBtn: ElementFinder;
+  tagListSelectorForDelete: ElementFinder;
+
+  // actions
+  async getTemplateTags() {
+    const elementFinderArray = element.all(by.xpath(data.MainPage.xpathForTagsInTagSelectorInEditTagModal));
+    const elementFinderArrayLength = await elementFinderArray.count();
+    let tagArr: ElementFinder[];
+    const elementPromiseArr = [];
+    for (let i = 0; i < elementFinderArrayLength; i++) {
+      elementPromiseArr.push(elementFinderArray.get(i));
+    }
+    tagArr = await Promise.all(elementPromiseArr);
+    return tagArr;
+  }
+
+  getTagsInTagList() {
+    return element.all(by.xpath(`${data.MainPage.xpathForTagsInTagListForDeletion}`));
+  }
 
+  constructor() {
+    this.saveBtn = $('#saveTemplateTagBtn');
+    this.newTagInput = $('#newTagInput');
+    this.cancelBtn = $('#cancelCreationOfTemplateTagBtn');
+    this.saveNewTagBtn = $('#saveNewTagBtn');
+    this.deleteTagBtn = $('#deleteTagBtn');
+    this.templateTagsSelector = $('#templateTagsSelector');
+    this.tagListSelectorForDelete = $('#tagListSelectorForDelete');
+  }
 }

eform-client/e2e/Page objects/Main Page/mainPage.row-object.ts

@@ -13,7 +13,7 @@ export class MainPageRowObject {
 
 export async function getMainPageRowObject(rowNumber: number) {
   const _mainPageRowObj = new MainPageRowObject();
-  _mainPageRowObj.id = +element(by.xpath(`//*[@id="units"]/tbody/tr[${rowNumber}]/td[1]`)).getText();
+  _mainPageRowObj.id = +(await element(by.xpath(`//*[@id="units"]/tbody/tr[${rowNumber}]/td[1]`)).getText());
   _mainPageRowObj.createdAt = await element(by.xpath(`//*[@id="units"]/tbody/tr[${rowNumber}]/td[2]`)).getText();
   _mainPageRowObj.nameEForm = await element(by.xpath(`//*[@id="units"]/tbody/tr[${rowNumber}]/td[3]`)).getText();
   const tagsString = await element(by.xpath(`//*[@id="units"]/tbody/tr[${rowNumber}]/td[4]/div/div[1]`)).getText();

eform-client/e2e/data.ts

@@ -41,7 +41,9 @@ export default {
     thirdTagForAdding: 'testTag3',
     forthTagForAdding: 'testTag4',
     fifthTagForAdding: 'testTag5',
-    tagsNumberForSelectionForFilter: 2
+    tagsNumberForSelectionForFilter: 2,
+    xpathForTagsInTagSelectorInEditTagModal: '//*[@id="templateTagsSelector"]/div/div/a/span/span[2]',
+    xpathForTagsInTagListForDeletion: '//*[@id="tagListSelectorForDelete"]/option'
   }
-}
+};
 

eform-client/e2e/tests/device-users/device-users.delete.e2e-spec.ts

@@ -1,24 +1,25 @@
 import {goToDeviceUsersPage} from '../../Helper methods/go-to-pages';
-import {signOut} from '../../Helper methods/other-helper-methods';
+import {signOut, waitTillVisibleAndClick} from '../../Helper methods/other-helper-methods';
 import {DeviceUsersPage} from '../../Page objects/Device users/DeviceUsersPage';
 import {browser, ExpectedConditions} from 'protractor';
+import {getMainPageRowObject} from '../../Page objects/Main Page/mainPage.row-object';
+import {getRowObject} from '../../Page objects/Device users/row-object';
 
 
 const deviceUsersPage: DeviceUsersPage = new DeviceUsersPage();
 
 describe('Tests for user deletion', function () {
-  beforeAll((done) => {
+  beforeEach((done) => {
     goToDeviceUsersPage();
     done();
   });
-  afterAll((done) => {
+  afterEach((done) => {
     signOut();
     done();
   });
 
-  describe('Device user delete button', function () {
+  xdescribe('Device user delete button', function () {
     it('should delete user', async function (done) {
-      console.log('Adding person');
       const initialrowNumber = deviceUsersPage.getRowsNumber();
       deviceUsersPage.newDeviceUserButton.click();
       browser.wait(ExpectedConditions.visibilityOf(deviceUsersPage.addNewUserModal.saveButton));
@@ -28,32 +29,33 @@ describe('Tests for user deletion', function () {
       browser.wait(ExpectedConditions.visibilityOf(deviceUsersPage.newDeviceUserButton));
       const finalRowSnumber = deviceUsersPage.getRowsNumber();
       expect(await initialrowNumber + 1).toEqual(await finalRowSnumber, 'User was not added!');
-      deviceUsersPage.deleteUserButton.click();
+      waitTillVisibleAndClick(deviceUsersPage.deleteUserButton);
       deviceUsersPage.deleteModal.okButton.click();
       browser.wait(ExpectedConditions.elementToBeClickable(deviceUsersPage.newDeviceUserButton));
       const afterDeleteRowCount = deviceUsersPage.getRowsNumber();
-      expect(await afterDeleteRowCount).toEqual(await initialrowNumber);
+      expect(afterDeleteRowCount).toEqual(initialrowNumber);
       done();
     });
   });
 
   describe('Cancel button in delete modal', function () {
     it('should not delete user', async function (done) {
-      console.log('Adding person');
-      const initialrowNumber = deviceUsersPage.getRowsNumber();
+      const initialrowNumber = await deviceUsersPage.getRowsNumber();
       deviceUsersPage.newDeviceUserButton.click();
       browser.wait(ExpectedConditions.visibilityOf(deviceUsersPage.addNewUserModal.saveButton));
       deviceUsersPage.addNewUserModal.fillFirstNameInput();
       deviceUsersPage.addNewUserModal.fillLastNameInput();
       deviceUsersPage.addNewUserModal.save();
       browser.wait(ExpectedConditions.visibilityOf(deviceUsersPage.newDeviceUserButton));
-      const finalRowSnumber = deviceUsersPage.getRowsNumber();
-      expect(await initialrowNumber + 1).toEqual(await finalRowSnumber, 'User was not added!');
-      deviceUsersPage.deleteUserButton.click();
+      const finalRowSnumber = await deviceUsersPage.getRowsNumber();
+      const userAdded: boolean = initialrowNumber + 1 === finalRowSnumber;
+      expect(userAdded).toBeTruthy('User was not added! -- It doesn\'t mean that deletion does not work,' +
+        ' but there\'s trouble with adding person');
+      waitTillVisibleAndClick(deviceUsersPage.deleteUserButton);
       deviceUsersPage.deleteModal.cancelButton.click();
       browser.wait(ExpectedConditions.elementToBeClickable(deviceUsersPage.newDeviceUserButton));
-      const afterDeleteCancel = deviceUsersPage.getRowsNumber();
-      expect(await afterDeleteCancel).toEqual(await initialrowNumber + 1);
+      const afterDeleteCancel = await deviceUsersPage.getRowsNumber();
+      expect(afterDeleteCancel).toEqual(finalRowSnumber, 'User was deleted');
       done();
     });
   });