refactored Protractor helper

Author: DavertMik

examples/yahoo_test.js

@@ -1,7 +1,8 @@
 Feature('Yahoo test');
 
 Scenario('Nightmare basic test', (I) => {
-  I.amOnPage('http://yahoo.com');
+  I.amOnPage('http://127.0.0.1:8000');
+  pause();
   I.fillField('p', 'github nightmare');
   I.click('Search Web');
   I.waitForElement('#main', 2);

lib/helper/Protractor.js

@@ -1,5 +1,8 @@
 'use strict';
-let By, EC, Runner;
+let By;
+let EC;
+let Runner;
+let Key;
 
 const requireg = require('requireg');
 const Helper = require('../helper');
@@ -108,19 +111,13 @@ class Protractor extends Helper {
     this.options.waitForTimeout /= 1000; // convert to seconds
   }
 
-  _init() {
+  async _init() {
     Runner = requireg('protractor/built/runner').Runner;
     By = requireg('protractor').ProtractorBy;
-    this.isProtractor5 = !requireg('protractor').wrapDriver;
+    Key = requireg('protractor').Key;
+
     this.context = this.options.rootElement;
-    try {
-      // get selenium-webdriver
-      this.webdriver = requireg('selenium-webdriver');
-    } catch (e) {
-       // maybe it is installed as protractor dependency?
-      this.webdriver = requireg('protractor/node_modules/selenium-webdriver');
-    }
-    return Promise.resolve(Runner);
+    return Promise.resolve();
   }
 
   static _checkRequirements() {
@@ -237,6 +234,7 @@ class Protractor extends Helper {
   }
 
   _withinEnd() {
+    if (!Object.keys(withinStore).length) return;
     this.browser.findElement = withinStore.elFn;
     this.browser.findElements = withinStore.elsFn;
     withinStore = {};
@@ -308,7 +306,9 @@ class Protractor extends Helper {
   async click(locator, context = null) {
     let matcher = this.browser;
     if (context) {
-      matcher = await this._locate(context);
+      let els = await this._locate(context, true);
+      assertElementExists(els, context);
+      matcher = els[0];
     }
     let el = await findClickable.call(this, matcher, locator);
     return el.click();
@@ -320,7 +320,7 @@ class Protractor extends Helper {
   async doubleClick(locator, context = null) {
     let matcher = this.browser;
     if (context) {
-      let els = await this._locate(guessLocator(locator) || global.by.css(locator));
+      let els = await this._locate(context, true);
       assertElementExists(els, context);
       matcher = els[0];
     }
@@ -336,7 +336,7 @@ class Protractor extends Helper {
     if (offsetX !== null || offsetY !== null) {
       offset = {x: offsetX, y: offsetY};
     }
-    let els = await this._locate(guessLocator(locator) || global.by.css(locator));
+    let els = await this._locate(locator, true);
     assertElementExists(els, locator);
     return this.browser.actions().mouseMove(els[0], offset).perform();
   }
@@ -396,13 +396,13 @@ class Protractor extends Helper {
   async pressKey(key) {
     let modifier;
     if (Array.isArray(key) && ~['Control', 'Command', 'Shift', 'Alt'].indexOf(key[0])) {
-      modifier = this.browser.Key[key[0].toUpperCase()];
+      modifier = Key[key[0].toUpperCase()];
       key = key[1];
     }
 
     // guess special key in Selenium Webdriver list
-    if (this.browser.Key[key.toUpperCase()]) {
-      key = this.browser.Key[key.toUpperCase()];
+    if (Key[key.toUpperCase()]) {
+      key = Key[key.toUpperCase()];
     }
 
     let action = this.browser.actions();
@@ -467,7 +467,9 @@ class Protractor extends Helper {
   async checkOption(field, context = null) {
     let matcher = this.browser;
     if (context) {
-      matcher = await matcher.findElement(guessLocator(context) || global.by.css(context));
+      let els = await this._locate(context, true);
+      assertElementExists(els, context);
+      matcher = els[0];
     }
     let els = await findCheckable(matcher, field);
     assertElementExists(els, field, "Checkbox or radio");
@@ -887,7 +889,7 @@ async function findCheckable(client, locator) {
   if (els.length) {
     return els;
   }
-  return await client.findElements(global.by.css(locator));
+  return client.findElements(global.by.css(locator));
 }
 
 async function findFields(client, locator) {
@@ -970,7 +972,6 @@ async function findClickable(matcher, locator) {
     return els[0];
   }
   let literal = xpathLocator.literal(locator.value);
-
   let narrowLocator = Locator.clickable.narrow(literal);
   let els = await matcher.findElements(global.by.xpath(narrowLocator));
   if (els.length) {

lib/utils.js

@@ -167,6 +167,13 @@ module.exports.test = {
 
   submittedData: function (dataFile) {
     return function (key) {
+      if (!fs.existsSync(dataFile)) {
+        var waitTill = new Date(new Date().getTime() + 1 * 1000); // wait for one sec for file to be created
+        while(waitTill > new Date()){}
+      }
+      if (!fs.existsSync(dataFile)) {
+        throw new Error('Data file was not created in time');
+      }
       var data = JSON.parse(fs.readFileSync(dataFile, 'utf8'));
       if (key) {
         return data.form[key];

test/helper/Nightmare_test.js

@@ -30,7 +30,7 @@ describe('Nightmare', function () {
       show: false
     });
     I._init();
-    I._beforeSuite();
+    return I._beforeSuite();
   });
 
   beforeEach(function() {

test/helper/ProtractorWeb_test.js

@@ -39,16 +39,20 @@ describe('Protractor-NonAngular', function () {
     });
   });
 
-  webApiTests.init({ I, site_url});
 
   beforeEach(function() {
+    webApiTests.init({ I, site_url});
     return I._before();
   });
 
-  after(function() {
+  afterEach(function() {
     return I._after();
   });
 
+  after(function() {
+    return I._afterSuite();
+  });
+
   describe('open page : #amOnPage', () => {
     it('should open main page of configured site', function*() {
       yield I.amOnPage('/');
@@ -115,8 +119,8 @@ describe('Protractor-NonAngular', function () {
   });
 
   describe('SmartWait', () => {
-    before(() => I.options.smartWait = 3000);
-    after(() => I.options.smartWait = 0);
+    beforeEach(() => I.options.smartWait = 3000);
+    afterEach(() => I.options.smartWait = 0);
 
     it('should wait for element to appear', () => {
       return I.amOnPage('/form/wait_element')

test/helper/webapi.js

@@ -166,6 +166,7 @@ module.exports.tests = function() {
       yield I.amOnPage('/form/checkbox');
       yield I.checkOption('#checkin');
       yield I.click('Submit');
+      yield I.wait(1);
       return assert.equal(formContents('terms'), 'agree');
     });
 
@@ -508,7 +509,7 @@ module.exports.tests = function() {
         .then(() => assert.ok(fileExists(path.join(global.output_dir, `screenshot_full_${+sec}`)), null, 'file does not exists'));
     });
 
-    it('should create a screenshot on fail  @ups', () => {
+    it('should create a screenshot on fail @ups', () => {
       let sec = (new Date()).getUTCMilliseconds().toString();
       let test = { title: 'sw should do smth ' + sec };
       return I.amOnPage('/')
@@ -560,7 +561,7 @@ module.exports.tests = function() {
     });
   });
 
-  describe('#waitForElement', () => {
+  describe('#waitForElement @ups', () => {
     it('should wait for visible element', () => {
       return I.amOnPage('/form/wait_visible')
         .then(() => I.dontSee('Step One Button'))
@@ -590,23 +591,23 @@ module.exports.tests = function() {
 
 
   });
-  
+
   describe('#waitUntilExists', () => {
-   
+
     it('should wait for an element to be removed from DOM', () => {
       return I.amOnPage('/spinner')
         .then(() => I.seeElementInDOM('.loader'))
         .then(() => I.waitUntilExists('.loader'))
         .then(() => I.dontSeeElement('.loader'))
     });
-  
+
     it('should wait for a non-exising element to be removed from DOM', () => {
       return I.amOnPage('/spinner')
         .then(() => I.dontSeeElement('.non-existing-class'))
         .then(() => I.waitUntilExists('.non-existing-class'))
         .then(() => I.dontSeeElement('.non-existing-class'))
     });
-  
+
   });
 
   describe('within tests', () => {