- updated expect.element().value to use the getProperty('value') …

…command;

- fixed a problem with `.within()` command for component tests

examples/pages/google/search.js

@@ -21,7 +21,7 @@ module.exports = {
     consentModal: {
       selector: consentModal,
       elements: {
-        customizeButton: 'div.VDity button:nth-child(1)'
+        rejectAllButton: '.GzLjMd button:nth-child(1)'
       }
     }
   },

examples/tests/googlePageObject.js

@@ -9,18 +9,14 @@ describe('google search with consent form - page objects', function() {
 
   after(async (browser) => browser.quit());
 
-  it('should complete the consent form', async function (browser) {
-
+  it.only('should complete the consent form', async function (browser) {
     const consentPresent = await homePage.isPresent('@consentModal');
 
     if (consentPresent) {
       await homePage.expect.section('@consentModal').to.be.visible;
 
       const {consentModal} = homePage.section;
-      await consentModal.click('@customizeButton');
-
-      await browser.expect.url().toContain('https://consent.google.');
-      await consentPage.turnOffEverything();
+      await consentModal.click('@rejectAllButton');
     }
   });
 

lib/api/_loaders/_base-loader.js

@@ -351,7 +351,7 @@ class BaseLoader extends EventEmitter {
         }
 
         //prevent unhandled rejection.
-        node.deferred.promise.catch(err=> {
+        node.deferred.promise.catch(err => {
           BaseLoader.lastDeferred.reject(err);
         });
 

lib/api/_loaders/_command-loader.js

@@ -1,6 +1,5 @@
 const Element = require('../../element');
 const BaseLoader = require('./_base-loader.js');
-const Utils = require('../../utils');
 
 class BaseCommandLoader extends BaseLoader {
   constructor(nightwatchInstance) {

lib/api/_loaders/command.js

@@ -189,12 +189,11 @@ class CommandLoader extends BaseCommandLoader {
               return;
             }
 
-            Logger.error(err);
             if (!['NightwatchAssertError', 'NightwatchMountError', 'TestingLibraryError'].includes(err.name)) {
+              Logger.error(err);
               instance.client.reporter.registerTestError(err);
             }
 
-
             return err;
           })
           .then(result => {
@@ -207,7 +206,7 @@ class CommandLoader extends BaseCommandLoader {
             }
 
             if (result && result.status === -1 && instance.reportProtocolErrors(result) && reportErrors) {
-              let err = new Error(`Error while running .${this.commandName}(): ${result.error}`);;
+              let err = new Error(`Error while running .${this.commandName}(): ${result.error}`);
 
               if (result.stack) {
                 err.stack = result.stack;

lib/api/_loaders/within-context.js

@@ -23,6 +23,7 @@ class WithinLoader extends BaseLoader {
         if (nightwatchInstance.startSessionEnabled) {
           return apiLoader
             .loadCustomCommands(__commands_cache)
+            .then(() => apiLoader.initPluginTransforms())
             .then(() => apiLoader.loadPlugins(__commands_cache))
             .then(() => resolve());
         }
@@ -36,9 +37,16 @@ class WithinLoader extends BaseLoader {
   }
 
   loadApi(context) {
-    lodashMerge(context, __commands_cache);
-
     const ApiLoader = require('../index.js');
+
+    Object.keys(__commands_cache).forEach((command) => {
+      context[command] = ((commandName) => {
+        return (...args) => {
+          return this.nightwatchInstance.api[commandName](...args);
+        };
+      })(command);
+    });
+
     const elementCommands = ApiLoader.getElementsCommandsStrict();
 
     if (elementCommands.length > 0) {

lib/api/expect/assertions/element/value.js

@@ -31,7 +31,7 @@ class ValueAssertion extends BaseAssertion {
   }
 
   executeCommand() {
-    return this.executeProtocolAction('getElementAttribute', ['value']);
+    return this.executeProtocolAction('getElementProperty', ['value']);
   }
 
   onExecuteCommandResult(result) {

lib/page-object/command-wrapper.js

@@ -59,24 +59,26 @@ class Command {
   createWrapper(commandFn) {
     const self = this;
 
-    return (...args) => {
-      if (args.length > 0 && self.parent && self.parent.__needsRecursion) {
+    return function (...args) {
+
+      if (args.length > 0 && this.__needsRecursion) {
         // within commands
         let inputElement = Element.createFromSelector(args[0]);
 
-        if (this.isUserDefined) {
-          inputElement.container = self.parent.__element;
+        if (self.isUserDefined) {
+          inputElement.container = this.__element;
           args[0] = inputElement;
         } else {
           args[0] = Element.createFromSelector({
             locateStrategy: 'recursion',
-            selector: [self.parent.__element, inputElement]
+            selector: [this.__element, inputElement]
           });
         }
       }
 
-      const result = self.executeCommand(commandFn, args);
-      const {client = {}} = self.parent;
+      const client = this.client || self.parent && self.parent.client || {};
+      const result = self.executeCommand(commandFn, args, client);
+
       const {isES6AsyncTestcase} = client;
 
       if ((result instanceof Promise) && (self.parent.constructor.name === 'Page' || isES6AsyncTestcase)) {
@@ -229,8 +231,9 @@ class Command {
   /**
    * @param {Function} commandFn
    * @param {Array} args
+   * @param {Object} context
    */
-  executeCommand(commandFn, args) {
+  executeCommand(commandFn, args, context) {
     let parseArgs;
     if (Utils.isObject(args[0]) && Array.isArray(args[0].args)) {
       parseArgs = args[0].args;
@@ -240,7 +243,7 @@ class Command {
 
     this.parseElementSelector(parseArgs);
 
-    return commandFn.apply(this.parent.client, args);
+    return commandFn.apply(context, args);
   }
 }
 

test/lib/nocks.js

@@ -366,7 +366,7 @@ module.exports = {
 
   value(value, times) {
     var mock = nock('http://localhost:10195')
-      .get('/wd/hub/session/1352110219202/element/0/attribute/value');
+      .get('/wd/hub/session/1352110219202/element/0/property/value');
 
     if (times) {
       mock.times(times);

test/src/api/expect/testExpectValue.js

@@ -82,7 +82,7 @@ describe('expect.value', function () {
         .elementFound()
         .elementStateError({
           error: 'stale element reference',
-          url: '/wd/hub/session/1352110219202/element/0/attribute/value',
+          url: '/wd/hub/session/1352110219202/element/0/property/value',
           method: 'get'
         })
         .elementNotFound()