Make sure find returns right value on failure

appium · Feb 1, 2016 · 542b903 · 542b903
1 parent fd451bf
commit 542b903
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/lib/commands/find.js b/lib/commands/find.js
@@ -49,7 +49,7 @@ helpers.findElOrEls = async function (strategy, selector, mult, context = '') {
   try {
     await this.implicitWaitForCondition(doFind);
   } catch (err) {
-    if (err.message && err.message.match(/Condition unmet/)){
+    if (mult && err.message && err.message.match(/Condition unmet/)){
       // only get here if we are looking for multiple elements
       // condition was not met setting res to empty array
       element = [];

diff --git a/lib/driver.js b/lib/driver.js
@@ -32,7 +32,6 @@ class AndroidDriver extends BaseDriver {
       'xpath',
       'id',
       'class name',
-      'tag name',
       'accessibility id',
       '-android uiautomator'
     ];

diff --git a/test/functional/commands/find/find-basic-e2e-specs.js b/test/functional/commands/find/find-basic-e2e-specs.js
@@ -79,7 +79,7 @@ describe('Find - basic', function () {
     await driver.findElOrEls('id', singleResourceId, true)
       .should.eventually.have.length(1);
   });
-  describe.only('implicit wait', () => {
+  describe('implicit wait', () => {
     let implicitWait = 5000;
     before(async () => {
       await driver.implicitWait(implicitWait);