@qavajs/cypress 2.2.0 → 2.3.0

package/CHANGELOG.md

@@ -10,6 +10,12 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 :pencil: - chore
 :microscope: - experimental
 
+## [2.3.0]
+- :rocket: added `into` preposition to type and type chars steps
+- :x: removed iframe steps
+- :beetle: - fixed alert steps
+- :beetle: - fixed desynchronization in validation steps 
+
 ## [2.2.0]
 - :rocket: added `to satisfy` validation to verify user-defined expectation provided as predicate
 ```Gherkin

package/README.md

@@ -3,7 +3,7 @@ qavajs implementation for cypress runner
 
 ## Installation
 
-```
+```bash
 npm install @qavajs/cypress @qavajs/cypress-runner-adapter @qavajs/memory
 ```
 
@@ -45,7 +45,6 @@ Install dependencies
 npm install
 ```
 
-
 Execute tests
 ```
 npm run test

package/lib/actions.js

@@ -15,8 +15,9 @@ When('I open {value} url', function (url) {
  * @param {string} alias - element to type
  * @param {string} value - value to type
  * @example I type 'wikipedia' to 'Google Input'
+ * @example I type 'wikipedia' into 'Google Input'
  */
-When('I type {value} to {locator}', function (type, locator) {
+When('I type {value} (in)to {locator}', function (type, locator) {
     locator.type(type.value());
 });
 //
@@ -65,40 +66,6 @@ When('I clear {locator}', function (locator) {
     locator.clear();
 });
 
-/**
- * Switch to parent frame
- * @example I switch to parent frame
- */
-When('I switch to parent frame', function () {
-    this.cy = cy;
-});
-
-/**
- * Switch to frame by index
- * @param {number} index - index to switch
- * @example I switch to 2 frame
- */
-When('I switch to {int} frame', function (index) {
-    const root = this.cy === cy ? this.cy.get('iframe') : this.cy.find('iframe');
-    this.cy = root
-        .eq(index - 1)
-        .then((iframe) => iframe.contents())
-        .should('exist')
-        .find('body');
-});
-
-/**
- * Switch to frame by alias
- * @param {string} index - alias to switch
- * @example I switch to 'IFrame' frame
- */
-When('I switch to {locator} frame', function (frame) {
-    this.cy = frame
-        .then((iframe) => iframe.contents())
-        .should('exist')
-        .find('body');
-});
-
 /**
  * Refresh current page
  * @example I r efresh page

package/lib/pageObjects.js

@@ -88,6 +88,5 @@ export function element(path) {
         }
         method = 'find';
     }
-    Cypress.log({ displayName: path });
-    return current
+    return current.as(path);
 }

package/lib/setup.js

@@ -1,21 +1,23 @@
 import memory from '@qavajs/memory';
-import { setWorldConstructor } from '@qavajs/cypress-runner-adapter';
-import { element } from './pageObjects';
+import {setWorldConstructor} from '@qavajs/cypress-runner-adapter';
+import {element} from './pageObjects';
 
 const logger = {
     log: (value) => {
         const [displayName, divider, message] = value.split(/\s(->|<-)\s/);
-        Cypress.log({
-            displayName: `${displayName} ${divider}`,
-            message,
-            type: 'parent',
-            consoleProps: () => {
-                return {
-                    Key: displayName,
-                    Value: message,
+        cy.then(() => {
+            Cypress.log({
+                displayName: `${displayName} ${divider}`,
+                message,
+                type: 'parent',
+                consoleProps: () => {
+                    return {
+                        Key: displayName,
+                        Value: message,
+                    }
                 }
-            }
-        })
+            })
+        });
     }
 };
 

package/lib/storage.js

@@ -40,7 +40,6 @@ When('I set {value} {word} storage value as {value}', function (storageKey, stor
     const resolvedValue = value.value();
     const storageKeyName = storageKey.value();
     cy.window().then((win) => {
-        console.log(win)
         win[storageType + 'Storage'].setItem(storageKeyName, resolvedValue);
     });
 });

package/lib/validation.js

@@ -230,9 +230,12 @@ Then(
                 resolve(alertText)
             });
         });
-        return alertHandler.then(alertText => {
-            validation(alertText, expectedValue)
+        cy.then(() => {
+            return alertHandler.then(alertText => {
+                validation(alertText, expectedValue.value())
+            });
         })
+
     }
 );
 

package/lib/valueValidation.js

@@ -14,9 +14,11 @@ import { getValidation } from './valueExpect';
 Then(
     'I expect {value} {validation} {value}',
     function (value1, validation, value2) {
-        const val1 = value1.value();
-        const val2 = value2.value();
-        validation(val1, val2);
+        cy.then(() => {
+            const val1 = value1.value();
+            const val2 = value2.value();
+            validation(val1, val2);
+        });
     });
 
 /**
@@ -30,20 +32,22 @@ Then(
 Then(
     'I expect at least {int} element(s) in {value} array {validation} {value}',
     function (expectedNumber, arr, validation, expectedValue) {
-        const array = arr.value();
-        const val = expectedValue.value();
-        const failCounter = { fail: 0, pass: 0 };
-        for (const value of array) {
-            try {
-                validation(value, val);
-                failCounter.pass++;
-            } catch (err) {
-                failCounter.fail++;
+        cy.then(() => {
+            const array = arr.value();
+            const val = expectedValue.value();
+            const failCounter = { fail: 0, pass: 0 };
+            for (const value of array) {
+                try {
+                    validation(value, val);
+                    failCounter.pass++;
+                } catch (err) {
+                    failCounter.fail++;
+                }
             }
-        }
-        if (failCounter.pass < expectedNumber) {
-            throw new Error(`Less than ${expectedNumber} pass ${validation} verification`);
-        }
+            if (failCounter.pass < expectedNumber) {
+                throw new Error(`Less than ${expectedNumber} pass ${validation} verification`);
+            }
+        });
     }
 );
 
@@ -58,11 +62,13 @@ Then(
 Then(
     'I expect every element in {value} array {validation} {value}',
     function (arr, validation, expectedValue) {
-        const array = arr.value();
-        const val = expectedValue.value();
-        for (const value of array) {
-            validation(value, val);
-        }
+        cy.then(() => {
+            const array = arr.value();
+            const val = expectedValue.value();
+            for (const value of array) {
+                validation(value, val);
+            }
+        });
     }
 );
 
@@ -77,14 +83,16 @@ Then(
 Then(
     'I expect {value} array to be sorted by {value}',
     function (arr, comparator) {
-        const array = arr.value();
-        if (!Array.isArray(array)) throw new Error(`'${arr}' is not an array`);
-        const comparatorFn = comparator.value();
-        if (typeof comparatorFn !== 'function') throw new Error(`'${comparator}' is not implemented`);
-        const arrayCopy = [...array];
-        arrayCopy.sort(comparatorFn);
-        const validation = getValidation('to deeply equal');
-        validation(array, arrayCopy);
+        cy.then(() => {
+            const array = arr.value();
+            if (!Array.isArray(array)) throw new Error(`'${arr}' is not an array`);
+            const comparatorFn = comparator.value();
+            if (typeof comparatorFn !== 'function') throw new Error(`'${comparator}' is not implemented`);
+            const arrayCopy = [...array];
+            arrayCopy.sort(comparatorFn);
+            const validation = getValidation('to deeply equal');
+            validation(array, arrayCopy);
+        });
     }
 );
 
@@ -102,9 +110,11 @@ Then(
 Then(
     'I expect {value} array {validation}:',
     function (arr, validation, members) {
-        const array = arr.value();
-        const membersArray = dataTable2Array(this, members);
-        validation(array, membersArray);
+        cy.then(() => {
+            const array = arr.value();
+            const membersArray = dataTable2Array(this, members);
+            validation(array, membersArray);
+        });
     }
 );
 
@@ -119,11 +129,13 @@ Then(
 Then(
     'I expect {value} {validation} at least one of {value}',
     function (actual, validation, expected) {
-        const actualValue = actual.value();
-        const expectedValues = expected.value();
-        if (!(expectedValues instanceof Array)) throw new Error(`'${expected}' parameter is not an array`);
-        const validate = (AR, ER) => validation(AR, ER);
-        validateAnyOf(actualValue, expectedValues, validate);
+        cy.then(() => {
+            const actualValue = actual.value();
+            const expectedValues = expected.value();
+            if (!(expectedValues instanceof Array)) throw new Error(`'${expected}' parameter is not an array`);
+            const validate = (AR, ER) => validation(AR, ER);
+            validateAnyOf(actualValue, expectedValues, validate);
+        });
     }
 );
 
@@ -140,10 +152,12 @@ Then(
 Then(
     'I expect {value} {validation} at least one of:',
     function (actual, valueExpect, expected) {
-    const actualValue = actual.value();
-    const expectedValues = dataTable2Array(this, expected);
-    const validation = (AR, ER) => valueExpect(AR, ER, validation);
-    validateAnyOf(actualValue, expectedValues, validation);
+        cy.then(() => {
+            const actualValue = actual.value();
+            const expectedValues = dataTable2Array(this, expected);
+            const validation = (AR, ER) => valueExpect(AR, ER, validation);
+            validateAnyOf(actualValue, expectedValues, validation);
+        });
 }
 );
 
@@ -158,11 +172,13 @@ Then(
 Then(
     'I expect {value} {validation} all of {value}',
     function (actual, valueExpect, expected) {
-        const actualValue = actual.value();
-        const expectedValues = expected.value();
-        if (!(expectedValues instanceof Array)) throw new Error(`'${expected}' parameter is not an array`);
-        const validation = (AR, ER) => valueExpect(AR, ER);
-        validateAllOf(actualValue, expectedValues, validation);
+        cy.then(() => {
+            const actualValue = actual.value();
+            const expectedValues = expected.value();
+            if (!(expectedValues instanceof Array)) throw new Error(`'${expected}' parameter is not an array`);
+            const validation = (AR, ER) => valueExpect(AR, ER);
+            validateAllOf(actualValue, expectedValues, validation);
+        });
     }
 );
 
@@ -179,11 +195,13 @@ Then(
 Then(
     'I expect {value} {validation} all of:',
     function (actual, valueExpect, expected) {
-    const actualValue = actual.value();
-    const expectedValues = dataTable2Array(this, expected);
-    const validation = (AR, ER) => valueExpect(AR, ER);
-    validateAllOf(actualValue, expectedValues, validation);
-}
+        cy.then(() => {
+            const actualValue = actual.value();
+            const expectedValues = dataTable2Array(this, expected);
+            const validation = (AR, ER) => valueExpect(AR, ER);
+            validateAllOf(actualValue, expectedValues, validation);
+        });
+    }
 );
 
 function validateAnyOf(AR, ERs, validation){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qavajs/cypress",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "qavajs for cypress runner",
   "main": "index.js",
   "scripts": {
@@ -9,13 +9,18 @@
   },
   "keywords": [
     "QA",
-    "Testing"
+    "testing",
+    "test-automation",
+    "cypress",
+    "qavajs",
+    "cucumber",
+    "cucumberjs"
   ],
   "author": "Alexandr Galichenko",
   "license": "MIT",
   "devDependencies": {
-    "@qavajs/cypress-runner-adapter": "^1.1.0",
+    "@qavajs/cypress-runner-adapter": "^1.3.0",
     "@qavajs/memory": "^1.10.2",
-    "cypress": "^15.0.0"
+    "cypress": "^15.3.0"
   }
 }