Fix handling of attribute when hiding keyboard (#1024)

appium · Jul 31, 2019 · a5d996b · a5d996b
1 parent 8b44fcc
commit a5d996b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/lib/commands/element.js b/lib/commands/element.js
@@ -18,6 +18,8 @@ commands.getNativeAttribute = async function getNativeAttribute (attribute, el)
     return await this.getContentSize(el);
   }
 
+  el = util.unwrapElement(el);
+
   // otherwise let WDA handle attribute requests
   let value = await this.proxyCommand(`/element/${el}/attribute/${attribute}`, 'GET');
   // Transform the result for the case when WDA returns an integer representation for a boolean value

diff --git a/lib/commands/general.js b/lib/commands/general.js
@@ -114,11 +114,11 @@ commands.hideKeyboard = async function hideKeyboard (strategy, ...possibleKeys)
     try {
       await this.proxyCommand('/wda/keyboard/dismiss', 'POST');
       return;
-    } catch (err) {
-      log.debug('Cannot dismiss the keyboard using the native call. Trying to apply a workaround...');
-    }
+    } catch (ign) {}
   }
 
+  log.debug('Cannot dismiss the keyboard using the native call. Trying to apply a workaround...');
+
   let keyboard;
   try {
     keyboard = await this.findNativeElementOrElements('class name', 'XCUIElementTypeKeyboard', false);
@@ -130,7 +130,7 @@ commands.hideKeyboard = async function hideKeyboard (strategy, ...possibleKeys)
   possibleKeys.pop(); // last parameter is the session id
   possibleKeys = possibleKeys.filter((element) => !!element); // get rid of undefined elements
   if (possibleKeys.length) {
-    for (let key of possibleKeys) {
+    for (const key of possibleKeys) {
       let el = _.last(await this.findNativeElementOrElements('accessibility id', key, true, keyboard));
       if (el) {
         log.debug(`Attempting to hide keyboard by pressing '${key}' key.`);
@@ -146,6 +146,10 @@ commands.hideKeyboard = async function hideKeyboard (strategy, ...possibleKeys)
       return;
     }
     let buttons = await this.findNativeElementOrElements('class name', 'XCUIElementTypeButton', true, keyboard);
+    if (_.isEmpty(buttons)) {
+      log.warn(`No button elements found. Unable to hide.`);
+      return;
+    }
     await this.nativeClick(_.last(buttons));
   }
 };