Added waitForPageToLoad function

src/helpers/objects.processor.js

@@ -64,7 +64,7 @@ function pageObjectGetter (str) {
 function getPageObject (str) {
     const pageObjectGetterFunc = stepsConfig.objectsProcessor.pageObjectGetter || pageObjectGetter;
     const value = pageObjectGetterFunc(str);
-    const idValue = value.replace(_r(regDynamicId, 'g'), stepsConfig.id.getId());
+    const idValue = value.replace(_r(regDynamicId, 'g'), stepsConfig.id.id);
     const injection = `not(ancestor-or-self::*[contains(@style,"visibility: hidden;")
          or contains(@style,"display: none") or contains(@class,"x-hide-offsets")])`;
     const injectedValue = injectInto(idValue, injection);
@@ -99,7 +99,7 @@ function dictionaryGetter (str) {
 function getDictionaryObject (str) {
     const dictionaryGetterFunc = stepsConfig.objectsProcessor.dictionaryGetter || dictionaryGetter;
     const value = dictionaryGetterFunc(str);
-    const idValue = value.replace(_r(regDynamicId, 'g'), stepsConfig.id.getId());
+    const idValue = value.replace(_r(regDynamicId, 'g'), stepsConfig.id.id);
 
     return idValue;
 }

src/steps.conf.js

@@ -18,10 +18,14 @@ module.exports = function ({
     idGenerator = defaultIdGenerator, // <() => <string|number>> - function, that will return new generated id.
     objectsProcessor = {} // objectsProcessor childs could be previded here - see objects.processor.js for more details.
 }) {
-    const id = {
-        value: defaultIdValue || idGenerator.call(this),
-        getId: () => this.value,
-        regenerate: () => {
+    const Id = class {
+        constructor () {
+            this.value = defaultIdValue || idGenerator.call(this);
+        }
+        get id () {
+            return this.value;
+        }
+        regenerate () {
             this.value = idGenerator.call(this);
         }
     };
@@ -30,7 +34,7 @@ module.exports = function ({
         loaderSelectors,
         finishedLoadingConditions: finishedLoadingConditions.bind(this, loaderSelectors),
         pages,
-        id,
+        id: new Id(),
         objectsProcessor
     };
 };

test/mocha/objects.processor.spec.js

@@ -9,26 +9,22 @@ const {
     dynamicId
 } = require('../../src/helpers/objects.processor');
 const { _r } = require('../../src/helpers/utils');
+const stepsConfigGenerator = require('../../src/steps.conf');
 
 const realId = 12345;
 
 // Makes stepsConfig visible globally to use stepsConfig.pages, stepsConfig.id, stepsConfig.loaderSelectors
-global.stepsConfig = {};
-
-global.stepsConfig.pages = {
+const pages = {
     main: {
         object: `//div[@id='${dynamicId}']`
     },
     book: {
         word: `dictionaryObject${dynamicId}`
     }
 };
+const idGenerator = () => realId;
 
-global.stepsConfig.id = {
-    getId: () => realId
-};
-
-global.objectsProcessor = {};
+global.stepsConfig = stepsConfigGenerator({ pages, idGenerator });
 
 describe('injectInto', () => {
     const data = [