Merge remote-tracking branch 'origin/master'

Author: Gid733

eform-client/e2e/Helper methods/go-to-pages.ts

@@ -25,6 +25,7 @@ export async function goToMainPage() {
   await browser.get(data.startPageUrl);
   await loginPage.login();
   await browser.waitForAngular();
+  await browser.sleep(5000);
   // waitTillVisibleAndClick(navbar.mainPageButton);
 }
 

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

@@ -13,8 +13,10 @@ export async function signOut() {
   const loginPage = new LoginPage();
   const navbar = new Navbar();
   await browser.waitForAngular();
+  browser.sleep(3000);
   await waitTillVisibleAndClick(navbar.signOutDropdown);
   await browser.waitForAngular();
+  browser.sleep(3000);
   await waitTillVisibleAndClick(navbar.signOutButton);
   await waitFor(loginPage.loginButton);
 }

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

@@ -34,7 +34,8 @@ export class MainPage {
 
   // actions
   async getRowNumber() { // this method will be made static in future
-    browser.waitForAngular();
+    await browser.sleep(5000);
+    await browser.waitForAngular();
     const rowNum = $$('#mainPageEFormsTableBody > tr').count();
     return await rowNum;
   }

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

@@ -1,5 +1,5 @@
 import {PairingModalRowObject} from './pairingModal.row-object';
-import {$, by, element, ElementFinder} from 'protractor';
+import {$, browser, by, element, ElementFinder} from 'protractor';
 
 export class PairEformModal {
   public pairEformRowObjects: PairingModalRowObject[] = [];
@@ -18,6 +18,7 @@ export class PairEformModal {
     return rowObj;
   }
   async getAllPairingModalRowObjects() {
+    await browser.sleep(4000);
     const pairingModalRowObjNum = await element.all(by.xpath('//*[@id="pairingModalTableBody"]/tr')).count();
     for (let i = 1; i <= pairingModalRowObjNum; i++) {
       this.pairEformRowObjects.push(await this.getPairingModalRowObj(i));

eform-client/e2e/tests/main-page/main-page.delete-eform.e2e-spec.ts

@@ -19,7 +19,9 @@ describe('Main page - DELETE. User', function () {
     it('should delete existing eform', async  () => {
       browser.waitForAngular();
       const firstRowObj = await getMainPageRowObject(1);
+      await browser.sleep(3000);
       await firstRowObj.deleteEFormBtn.click();
+      browser.sleep(3000);
       await waitTillVisibleAndClick(mainPage.deleteEformModal.deleteEFormOkBtn);
       const allMainPageRowObjects = await MainPage.getAllMainPageRowObjects();
       const rowIsDeleted: boolean = allMainPageRowObjects.filter(item => item.id === firstRowObj.id).length === 0;

eform-client/e2e/tests/main-page/main-page.filter-eform.e2e-spec.ts

@@ -9,7 +9,7 @@ const mainPage = new MainPage();
 
 
 describe('Main page - FILTERS', function () {
-  xdescribe('By label user', function () {
+  describe('By label user', function () {
     beforeAll(async () => {
       await goToMainPage();
     });
@@ -55,7 +55,9 @@ describe('Main page - FILTERS', function () {
     });
     it('should be able to filter using 1 tag', async () => {
       await browser.waitForAngular();
+      await browser.sleep(5000);
       await waitTillVisibleAndClick(mainPage.tagSelector);
+      await browser.sleep(5000);
       const tagArray: ElementArrayFinder = mainPage.getTagsForFilter(); // ElementArrayFinder lacks functionality compared to ordinary
                                                                         // arrays. Thus it is better to make simple array
       const tagArr: ElementFinder[] = []; // This is simple array of ElementFinder elements
@@ -98,7 +100,6 @@ describe('Main page - FILTERS', function () {
       }
       await randomTagArray.forEach(async (item) => await item.click()) ;
       await browser.waitForAngular();
-      await browser.sleep(5000);
       const finalRowNum = await mainPage.getRowNumber();
       const finalRowObjArr: MainPageRowObject[] = [];
       for (let i = 1; i <= finalRowNum; i++) {
@@ -114,7 +115,6 @@ describe('Main page - FILTERS', function () {
       expect(filteredByTags).toBeTruthy('Eforms are filtered by tags incorrectly');
       await randomTagArray.forEach(async tag => await tag.click());
       await browser.waitForAngular();
-      await browser.sleep(5000);
       const postRefilterRowNum = await mainPage.getRowNumber();
       expect(postRefilterRowNum).toBeGreaterThan(finalRowNum, 'Deleting tags in selector hasn\'t increased eforms number');
     });

eform-client/e2e/tests/main-page/main-page.pairing-eform.e2e-spec.ts

@@ -14,7 +14,6 @@ describe('Pairing on the main page:', function () {
   afterAll(async () => {
     await signOut();
   });
-
   describe('After clicking "Pair eForm" button user', function () {
     afterEach(async () => {
       const mainPage = new MainPage();
@@ -29,8 +28,8 @@ describe('Pairing on the main page:', function () {
       await browser.waitForAngular();
       await waitFor(mainPage.pairEformModal.saveBtn);
       await mainPage.pairEformModal.getAllPairingModalRowObjects();
-      const uncheckedPairEformModalRowObj1 = mainPage.pairEformModal.uncheckedPairEformRowObjects[3];
-      const uncheckedPairEformModalRowObj2 = mainPage.pairEformModal.uncheckedPairEformRowObjects[4];
+      const uncheckedPairEformModalRowObj1 = mainPage.pairEformModal.uncheckedPairEformRowObjects[0];
+      const uncheckedPairEformModalRowObj2 = mainPage.pairEformModal.uncheckedPairEformRowObjects[0];
       await uncheckedPairEformModalRowObj1.checkToPairChbx.click();
       await uncheckedPairEformModalRowObj2.checkToPairChbx.click();
       let expectedPairedNamesArr: string[] = [];
@@ -86,7 +85,7 @@ describe('Pairing on the main page:', function () {
       let expectedPairedNamesArr: string[] = [];
       try {
         const checkedPairEformModalRowObj = mainPage.pairEformModal.checkedPairEformRowObjects[0];
-        const uncheckedPairEformModalRowObj = mainPage.pairEformModal.uncheckedPairEformRowObjects[3];
+        const uncheckedPairEformModalRowObj = mainPage.pairEformModal.uncheckedPairEformRowObjects[0];
         await checkedPairEformModalRowObj.checkToPairChbx.click();
         await uncheckedPairEformModalRowObj.checkToPairChbx.click();
         mainPage.pairEformModal.checkedPairEformRowObjects.shift(); // remove clicked row from list of checked rows

eform-client/e2e/tests/main-page/main-page.tags.e2e-spec.ts

@@ -66,6 +66,7 @@ describe('Main Page - EDIT, DELETE AND CREATE TAGS', function () {
       const randomTagText = await randomTag.getText();
       await randomTag.click();
       await mainPage.editTagModal.saveBtn.click();
+      await browser.sleep(4000);
       const finalFirstRowObj = await getMainPageRowObject(1);
       expect(finalFirstRowObj.tags.indexOf(randomTagText) !== -1).toBeTruthy('Tag was not added');
     });

eform-client/package.json

@@ -15,7 +15,7 @@
     "winserver-install": "node svc.js install",
     "winserver-uninstall": "node svc.js uninstall",
     "test-single-headless": "ng test --single-run=true --browsers=PhantomJS --reporters=progress,junit",
-    "test-suite":"node .\\node_modules\\protractor\\bin\\protractor --suite"
+    "test-suite": "node .\\node_modules\\protractor\\bin\\protractor --suite"
   },
   "private": true,
   "dependencies": {
@@ -77,7 +77,7 @@
     "karma-remap-istanbul": "^0.6.0",
     "path": "^0.12.7",
     "phantomjs-prebuilt": "^2.1.16",
-    "protractor": "~5.1.0",
+    "protractor": "~5.3.2",
     "run-sequence": "^2.2.1",
     "ts-node": "~2.0.0",
     "tslint": "~4.5.0",

eform-client/protractor.conf.js

@@ -56,6 +56,7 @@ exports.config = {
   },
   onPrepare: function () {
     jasmine.getEnv().addReporter(new SpecReporter());
+    browser.driver.manage().window().maximize();
   }
 
 };