Merge branch '3.x' of github.com:codeceptjs/CodeceptJS into 3.x

Author: DavertMik

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.1.1
+
+* [Appium] Fixed #2759
+ `grabNumberOfVisibleElements`, `grabAttributeFrom`, `grabAttributeFromAll` to allow id locators.
+
 ## 3.1.0
 
 * [Plawyright] Updated to Playwright 1.13

lib/helper/Appium.js

@@ -1352,6 +1352,33 @@ class Appium extends Webdriver {
     return super.grabTextFrom(parseLocator.call(this, locator));
   }
 
+  /**
+   * {{> grabNumberOfVisibleElements }}
+   */
+  async grabNumberOfVisibleElements(locator) {
+    if (this.isWeb) return super.grabNumberOfVisibleElements(locator);
+    return super.grabNumberOfVisibleElements(parseLocator.call(this, locator));
+  }
+
+  /**
+   * Can be used for apps only with several values ("contentDescription", "text", "className", "resourceId")
+   *
+   * {{> grabAttributeFrom }}
+   */
+  async grabAttributeFrom(locator, attr) {
+    if (this.isWeb) return super.grabAttributeFrom(locator, attr);
+    return super.grabAttributeFrom(parseLocator.call(this, locator), attr);
+  }
+
+  /**
+   * Can be used for apps only with several values ("contentDescription", "text", "className", "resourceId")
+   * {{> grabAttributeFromAll }}
+   */
+  async grabAttributeFromAll(locator, attr) {
+    if (this.isWeb) return super.grabAttributeFromAll(locator, attr);
+    return super.grabAttributeFromAll(parseLocator.call(this, locator), attr);
+  }
+
   /**
    * {{> grabValueFromAll }}
    *

lib/helper/WebDriver.js

@@ -1252,7 +1252,6 @@ class WebDriver extends Helper {
 
   /**
    * {{> grabAttributeFromAll }}
-   * Appium: can be used for apps only with several values ("contentDescription", "text", "className", "resourceId")
    */
   async grabAttributeFromAll(locator, attr) {
     const res = await this._locate(locator, true);
@@ -1263,7 +1262,6 @@ class WebDriver extends Helper {
 
   /**
    * {{> grabAttributeFrom }}
-   * Appium: can be used for apps only with several values ("contentDescription", "text", "className", "resourceId")
    */
   async grabAttributeFrom(locator, attr) {
     const attrs = await this.grabAttributeFromAll(locator, attr);

test/helper/Appium_test.js

@@ -573,7 +573,7 @@ describe('Appium', function () {
     });
   });
 
-  describe('#grabTextFrom, #grabValueFrom, #grabAttributeFrom', () => {
+  describe('#grabTextFrom, #grabValueFrom, #grabAttributeFrom @quick', () => {
     it('should grab text from page', async () => {
       const val = await app.grabTextFrom('~buttonTestCD');
       assert.equal(val, 'EN Button');
@@ -583,6 +583,30 @@ describe('Appium', function () {
       const val = await app.grabAttributeFrom('~buttonTestCD', 'resourceId');
       assert.equal(val, 'io.selendroid.testapp:id/buttonTest');
     });
+
+    it('should be able to grab elements', async () => {
+      await app.click('~startUserRegistrationCD');
+      await app.click('~email of the customer');
+      await app.appendField('~email of the customer', '1');
+      await app.hideDeviceKeyboard('pressKey', 'Done');
+      await app.swipeTo(
+        '//android.widget.Button', '//android.widget.ScrollView/android.widget.LinearLayout', 'up', 30,
+        100, 700,
+      );
+      await app.click('//android.widget.Button');
+      await app.see(
+        '1',
+        '#io.selendroid.testapp:id/label_email_data',
+      );
+      const num = await app.grabNumberOfVisibleElements('#io.selendroid.testapp:id/label_email_data');
+      assert.strictEqual(1, num);
+
+      const id = await app.grabNumberOfVisibleElements(
+        '//android.widget.TextView[@resource-id="io.selendroid.testapp:id/label_email_data"]',
+        'contentDescription',
+      );
+      assert.strictEqual(1, id);
+    });
   });
 
   describe('#saveScreenshot @quick', () => {