BUG FIXED: try to find field by label firstly and then - by named sel…

…ector
BR0kEN- · Jan 12, 2016 · 721b79e · 721b79e
1 parent 3abe444
commit 721b79e
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/src/Context/RawPageContext.php b/src/Context/RawPageContext.php
@@ -65,23 +65,20 @@ public function findField($selector)
     {
         $selector = ltrim($selector, '#');
         $element = $this->getWorkingElement();
-        $field = $element->findField($selector);
-
-        if (null === $field) {
-            foreach ($this->findLabels($selector) as $forAttribute => $label) {
-                // We trying to find an ID with "-upload" suffix, because some
-                // image inputs in Drupal are suffixed by it.
-                foreach ([$forAttribute, "$forAttribute-upload"] as $elementID) {
-                    $field = $element->findById($elementID);
-
-                    if (null !== $field) {
-                        return $field;
-                    }
+
+        foreach ($this->findLabels($selector) as $forAttribute => $label) {
+            // We trying to find an ID with "-upload" suffix, because some
+            // image inputs in Drupal are suffixed by it.
+            foreach ([$forAttribute, "$forAttribute-upload"] as $elementID) {
+                $field = $element->findById($elementID);
+
+                if (null !== $field) {
+                    return $field;
                 }
             }
         }
 
-        return $field;
+        return $element->findField($selector);
     }
 
     /**