Added a few improvements to better support component testing

lib/api/_loaders/element-global.js

@@ -300,6 +300,7 @@ class ElementGlobal {
       Object.assign(node.deferred.promise, api);
       if (commandName === 'findElement') {
         node.deferred.promise['@nightwatch_element'] = true;
+        node.deferred.promise['@nightwatch_args'] = args;
         if (this.isComponent) {
           node.deferred.promise['@nightwatch_component'] = true;
         }

lib/api/_loaders/expect.js

@@ -45,8 +45,21 @@ class ExpectLoader extends BaseCommandLoader {
         }
 
         if ((args[0] instanceof Promise) && args[0]['@nightwatch_element']) {
+          const elementArgs = args[0]['@nightwatch_args'];
+          let selector = '';
+          if (elementArgs[0] && elementArgs[0].value) {
+            selector = elementArgs[0].value;
+          }
           args[0].then(result => {
             args[0] = result;
+            if (!result) {
+              const err = new Error(`Unable to find element <${selector}>.`);
+              err.isExpect = true;
+              this.emit('error', err);
+
+              return this;
+            }
+
             this.run(...args);
           });
         } else {

lib/api/element-commands/_baseElementCommand.js

@@ -45,6 +45,10 @@ class BaseElementCommand extends ElementCommand {
       };
     }
 
+    if ((this.selector instanceof Promise) && this.selector['@nightwatch_element']) {
+      this.__element = await this.selector;
+    }
+
     return this.findElement({cacheElementId});
   }
 

lib/api/protocol/elements.js

@@ -51,10 +51,16 @@ const Element = require('../../element');
 module.exports = class Elements extends ProtocolAction {
   command(using, value, callback) {
     const commandName = 'elements';
-
+    let element;
     if (using instanceof Element) {
+      element = using;
+    } else if (value instanceof Element) {
+      element = value;
+    }
+
+    if (element) {
       return this.findElements({
-        element: using,
+        element,
         callback: typeof value == 'function' ? value : callback,
         commandName
       });

lib/element/index.js

@@ -203,16 +203,23 @@ class Element {
       throw new Error(`Invalid selector value specified "${value}"`);
     }
 
-    if (value instanceof Element) {
+    if ((value instanceof Element) && value.selector) {
       if (!value.locateStrategy) {
         value.locateStrategy = using;
       }
 
       return value;
     }
 
+    if (value['@nightwatch_element']) {
+      return value;
+    }
+
     let definition;
     let options;
+    if ((value instanceof Element) && (value.webElement instanceof WebElement)) {
+      return value;
+    }
 
     if (WebElement.isId(value)) {
       definition = {

package.json

@@ -17,7 +17,7 @@
   "dependencies": {
     "assertion-error": "1.1.0",
     "boxen": "5.1.2",
-    "chai-nightwatch": "0.5.2",
+    "chai-nightwatch": "0.5.3",
     "ci-info": "^3.2.0",
     "didyoumean": "^1.2.2",
     "dotenv": "10.0.0",

test/src/runner/testRunWithExternalGlobals.js

@@ -0,0 +1,43 @@
+const path = require('path');
+const assert = require('assert');
+const common = require('../../common.js');
+const CommandGlobals = require('../../lib/globals/commands.js');
+const MockServer = require('../../lib/mockserver.js');
+const {settings} = common;
+const {runTests} = common.require('index.js');
+
+describe('testRunWithExternalGlobals', function() {
+  beforeEach(function(done) {
+    this.server = MockServer.init();
+
+    this.server.on('listening', () => {
+      done();
+    });
+  });
+
+  afterEach(function(done) {
+    CommandGlobals.afterEach.call(this, done);
+  });
+
+  beforeEach(function() {
+    process.removeAllListeners('exit');
+    process.removeAllListeners('uncaughtException');
+    process.removeAllListeners('unhandledRejection');
+  });
+
+  it('testRun with external globals', function() {
+    let testsPath = path.join(__dirname, '../../sampletests/before-after/sampleSingleTest.js');
+    const globals = {
+      reporterCount: 0
+    };
+
+    return runTests(testsPath, settings({
+      globals,
+      globals_path: path.join(__dirname, '../../extra/external-globals.js'),
+
+      output_folder: false
+    }));
+  });
+
+
+});