MDL-45284 behat: Replace wrongly triggered not found exception

moodle · Apr 27, 2014 · 560fc52 · 560fc52
1 parent a046134
commit 560fc52
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/behat/behat_field_manager.php b/lib/behat/behat_field_manager.php
@@ -54,10 +54,15 @@ public static function get_form_field_from_label($label, RawMinkContext $context
         try {
             // The DOM node.
             $fieldnode = $context->find_field($label);
-        } catch (ElementNotFoundException $e) {
+        } catch (ElementNotFoundException $fieldexception) {
 
             // Looking for labels that points to filemanagers.
-            $fieldnode = $context->find_filemanager($label);
+            try {
+                $fieldnode = $context->find_filemanager($label);
+            } catch (ElementNotFoundException $filemanagerexception) {
+                // We want the generic 'field' exception.
+                throw $fieldexception;
+            }
         }
 
         // The behat field manager.