updated grabbers (#2381)

* updated grabbers

* fixed Playwright tests

Author: DavertMik

lib/helper/Playwright.js

@@ -1477,51 +1477,87 @@ class Playwright extends Helper {
    *
    */
   async grabTextFrom(locator) {
+    const texts = await this.grabTextFromAll(locator);
+    assertElementExists(texts, locator);
+    this.debugSection('Text', texts[0]);
+    return texts[0];
+  }
+
+
+  /**
+   * {{> grabTextFromAll }}
+   *
+   */
+  async grabTextFromAll(locator) {
     const els = await this._locate(locator);
-    assertElementExists(els, locator);
     const texts = [];
     for (const el of els) {
       texts.push(await (await el.getProperty('innerText')).jsonValue());
     }
-    if (texts.length === 1) return texts[0];
+    this.debug(`Matched ${els.length} elements`);
     return texts;
   }
 
   /**
    * {{> grabValueFrom }}
    */
   async grabValueFrom(locator) {
+    const values = await this.grabValueFromAll(locator);
+    assertElementExists(values, locator);
+    this.debugSection('Value', values[0]);
+    return values[0];
+  }
+
+  /**
+   * {{> grabValueFromAll }}
+   */
+  async grabValueFromAll(locator) {
     const els = await findFields.call(this, locator);
-    assertElementExists(els, locator);
-    return els[0].getProperty('value').then(t => t.jsonValue());
+    this.debug(`Matched ${els.length} elements`);
+    return Promise.all(els.map(el => el.getProperty('value').then(t => t.jsonValue())));
   }
 
   /**
    * {{> grabHTMLFrom }}
    */
   async grabHTMLFrom(locator) {
+    const html = await this.grabHTMLFromAll(locator);
+    assertElementExists(html, locator);
+    this.debugSection('HTML', html[0]);
+    return html[0];
+  }
+
+  /**
+   * {{> grabHTMLFromAll }}
+   */
+  async grabHTMLFromAll(locator) {
     const els = await this._locate(locator);
-    assertElementExists(els, locator);
-    const values = await Promise.all(els.map(el => el.$eval('xpath=.', element => element.innerHTML, el)));
-    if (Array.isArray(values) && values.length === 1) {
-      return values[0];
-    }
-    return values;
+    this.debug(`Matched ${els.length} elements`);
+    return Promise.all(els.map(el => el.$eval('xpath=.', element => element.innerHTML, el)));
   }
 
   /**
    * {{> grabCssPropertyFrom }}
    *
    */
   async grabCssPropertyFrom(locator, cssProperty) {
+    const cssValues = await this.grabCssPropertyFromAll(locator, cssProperty);
+    assertElementExists(cssValues, locator);
+    this.debugSection('CSS', cssValues[0]);
+    return cssValues[0];
+  }
+
+  /**
+   * {{> grabCssPropertyFromAll }}
+   *
+   */
+  async grabCssPropertyFromAll(locator, cssProperty) {
     const els = await this._locate(locator);
+    this.debug(`Matched ${els.length} elements`);
     const res = await Promise.all(els.map(el => el.$eval('xpath=.', el => JSON.parse(JSON.stringify(getComputedStyle(el))), el)));
     const cssValues = res.map(props => props[toCamelCase(cssProperty)]);
 
-    if (res.length > 0) {
-      return cssValues;
-    }
-    return cssValues[0];
+    return cssValues;
   }
 
   /**
@@ -1618,16 +1654,28 @@ class Playwright extends Helper {
    *
    */
   async grabAttributeFrom(locator, attr) {
+    const attrs = await this.grabAttributeFromAll(locator, attr);
+    assertElementExists(attrs, locator);
+    this.debugSection('Attribute', attrs[0]);
+    return attrs[0];
+  }
+
+
+  /**
+   * {{> grabAttributeFromAll }}
+   *
+   */
+  async grabAttributeFromAll(locator, attr) {
     const els = await this._locate(locator);
-    assertElementExists(els, locator);
+    this.debug(`Matched ${els.length} elements`);
     const array = [];
 
     for (let index = 0; index < els.length; index++) {
       const a = await this._evaluateHandeInContext(([el, attr]) => el[attr] || el.getAttribute(attr), [els[index], attr]);
       array.push(await a.jsonValue());
     }
 
-    return array.length === 1 ? array[0] : array;
+    return array;
   }
 
   /**

test/helper/Playwright_test.js

@@ -540,26 +540,6 @@ describe('Playwright', function () {
       .then(() => I.seeInField('#text2', 'London')));
   });
 
-
-  describe('#grabHTMLFrom', () => {
-    it('should grab inner html from an element using xpath query', () => I.amOnPage('/')
-      .then(() => I.grabHTMLFrom('//title'))
-      .then(html => assert.equal(html, 'TestEd Beta 2.0')));
-
-    it('should grab inner html from an element using id query', () => I.amOnPage('/')
-      .then(() => I.grabHTMLFrom('#area1'))
-      .then(html => assert.equal(html.trim(), '<a href="/form/file" qa-id="test" qa-link="test"> Test Link </a>')));
-
-    it('should grab inner html from multiple elements', () => I.amOnPage('/')
-      .then(() => I.grabHTMLFrom('//a'))
-      .then(html => assert.equal(html.length, 5)));
-
-    it('should grab inner html from within an iframe', () => I.amOnPage('/iframe')
-      .then(() => I.switchTo({ frame: 'iframe' }))
-      .then(() => I.grabHTMLFrom('#new-tab'))
-      .then(html => assert.equal(html.trim(), '<a href="/login" target="_blank">New tab</a>')));
-  });
-
   describe('#grabBrowserLogs', () => {
     it('should grab browser logs', () => I.amOnPage('/')
       .then(() => I.executeScript(() => {