Fixed an issue where the error thrown in case of using incorrect argu…

…ments for element commands was not reported if using async/await

lib/core/asynctree.js

@@ -96,7 +96,7 @@ class AsyncTree extends EventEmitter{
       return err.waitFor;
     }
 
-    return this.currentNode.rejectPromise;
+    return this.currentNode.rejectPromise || err.rejectPromise;
   }
 
   shouldRejectParentNodePromise(err) {

lib/element/command.js

@@ -263,13 +263,25 @@ class ElementCommand extends EventEmitter {
     }
 
     if (this.extraArgsCount !== null) {
-      const expectedArgs = ElementCommand.ELEMENT_COMMAND_ARGS + this.extraArgsCount;
-      if (this.args.length < expectedArgs - 1 || this.args.length > expectedArgs) {
-        throw new Error(`${this.commandName} method expects ${(expectedArgs - 1)} `+
-          `(or ${expectedArgs} if using implicit "css selector" strategy) arguments - ${this.args.length} given.`);
+      let expectedArgs = ElementCommand.ELEMENT_COMMAND_ARGS + this.extraArgsCount;
+      let passedArgs = this.args.length;
+      let rejectPromise;
+
+      if (this.client.isES6AsyncTestcase) {
+        expectedArgs = expectedArgs - 1;
+        passedArgs = passedArgs - 1;
+        rejectPromise = true;
       }
 
-      if (Utils.isString(this.args[0]) && (expectedArgs === this.args.length || ElementCommand.isSelectorObject(this.args[1]))) {
+      if (passedArgs < expectedArgs - 1 || passedArgs > expectedArgs) {
+        const error = new Error(`${this.commandName} method expects ${(expectedArgs - 1)} `+
+          `(or ${expectedArgs} if using implicit "css selector" strategy) arguments - ${passedArgs} given.`);
+        error.rejectPromise = rejectPromise;
+
+        throw error;
+      }
+
+      if (Utils.isString(this.args[0]) && (expectedArgs === passedArgs || ElementCommand.isSelectorObject(this.args[1]))) {
         this.setStrategyFromArgs();
       }
     }

test/sampletests/es6await/incorrect-element-args/sampleTestProperty.js

@@ -0,0 +1,5 @@
+describe('element commands with incorrect args', function() {
+  it('getElementProperty', async function(browser) {
+    await browser.getElementProperty('aside');
+  })
+})

test/src/api/commands/element/testGetElementProperty.js

@@ -28,5 +28,4 @@ describe('getElementProperty', function() {
 
     this.client.start(done);
   });
-
 });

test/src/runner/testRunnerEs6Async.js

@@ -300,4 +300,25 @@ describe('testRunner ES6 Async', function () {
       globals
     }));
   });
+
+  it('test runner async with element incorrect args', function() {
+    const testsPath = path.join(__dirname, '../../sampletests/es6await/incorrect-element-args');
+
+    const globals = {
+      waitForConditionPollInterval: 50,
+      waitForConditionTimeout: 100,
+      retryAssertionTimeout: 150,
+
+      reporter(results) {
+        assert.strictEqual(results.errors, 1);
+        assert.ok(results.lastError instanceof Error);
+        assert.strictEqual(results.lastError.message, 'Error while running "getElementProperty" command: getElementProperty method expects 2 (or 3 if using implicit "css selector" strategy) arguments - 1 given.');
+        assert.strictEqual(results.lastError.rejectPromise, true);
+      }
+    };
+
+    return runTests(testsPath, settings({
+      globals
+    }));
+  });
 });