Fixes/find elements result value in async commands (#2820)

nightwatchjs · Jul 29, 2021 · babd88c · babd88c
1 parent 4ec23f2
commit babd88c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/lib/api/element-commands/findElements.js b/lib/api/element-commands/findElements.js
@@ -51,7 +51,7 @@ module.exports = class Elements extends BaseElementCommand {
       return result;
     }
 
-    return result.value;
+    return result;
   }
 
 };
diff --git a/test/sampletests/es6await/webdriver/getText/getTextES6.js b/test/sampletests/es6await/webdriver/getText/getTextES6.js
@@ -7,10 +7,18 @@ module.exports = {
     const page = client.page.simplePageObj();
 
     const result = await client.findElements('#element-selector');
-    assert.ok(result[0]);
-    assert.ok('element-6066-11e4-a52e-4f735466cecf' in result[0]);
-    assert.strictEqual(result[0].getId(), '5cc459b8-36a8-3042-8b4a-258883ea642b');
-    assert.strictEqual(result[0]['element-6066-11e4-a52e-4f735466cecf'], '5cc459b8-36a8-3042-8b4a-258883ea642b');
+    assert.strictEqual(result.status, 0);
+    assert.ok(result.value[0]);
+    assert.ok('element-6066-11e4-a52e-4f735466cecf' in result.value[0]);
+    assert.strictEqual(result.value[0].getId(), '5cc459b8-36a8-3042-8b4a-258883ea642b');
+    assert.strictEqual(result.value[0]['element-6066-11e4-a52e-4f735466cecf'], '5cc459b8-36a8-3042-8b4a-258883ea642b');
+
+    const elementSelector = await client.findElement('#element-selector');
+    assert.strictEqual(elementSelector.status, 0);
+    assert.ok(elementSelector.value);
+    assert.ok('element-6066-11e4-a52e-4f735466cecf' in elementSelector.value);
+    assert.strictEqual(elementSelector.value.getId(), '5cc459b8-36a8-3042-8b4a-258883ea642b');
+    assert.strictEqual(elementSelector.value['element-6066-11e4-a52e-4f735466cecf'], '5cc459b8-36a8-3042-8b4a-258883ea642b');
 
     const textResult = await page.getText('#element-selector');
     assert.ok(!!textResult);
@@ -20,4 +28,6 @@ module.exports = {
     const resultSection = await page.section.signUp.getText('@help');
     assert.strictEqual(resultSection.value, 'help text value');
   }
+
+
 };
diff --git a/test/src/runner/testRunnerEs6Async.js b/test/src/runner/testRunnerEs6Async.js
@@ -196,7 +196,7 @@ describe('testRunner ES6 Async', function() {
           'element-6066-11e4-a52e-4f735466cecf': '5cc459b8-36a8-3042-8b4a-258883ea642b'
         }]
       })
-    }, true, true);
+    }, false, true);
 
     MockServer.addMock({
       url: '/session/13521-10219-202/element/5cc459b8-36a8-3042-8b4a-258883ea642b/text',