merge upstream

Author: zephraph

src/Selenium2Library/keywords/_element.py

@@ -26,7 +26,7 @@ def get_webelement(self, locator):
 
         See `introduction` for details about locating elements.
         """
-        return self.get_webelements(locator)[0]
+        return self._element_find(locator, True, True)
 
     def get_webelements(self, locator):
         """Returns list of WebElement objects matching locator.

test/acceptance/keywords/elements.robot

@@ -7,12 +7,12 @@ Get Elements
     @{links}=  Get WebElements  //div[@id="div_id"]/a
     Length Should Be  ${links}  11
 
-Get First Matching Element
+Get Web Element
     @{links}=  Get WebElements  //div[@id="div_id"]/a
     ${link}=  Get WebElement  //div[@id="div_id"]/a
-    LOG  @{links}[0]
-    LOG  ${link}
     Should Be Equal  @{links}[0]  ${link}
+    Run Keyword and Expect Error  ValueError: Element locator 'id=non_existing_elem' did not match any elements.
+    ...  Get WebElement  id=non_existing_elem
 
 More Get Elements
     [Setup]  Go To Page "forms/prefilled_email_form.html"