Merge branch 'spaces-in-locator-prefixes' of https://github.com/ombre42/robotframework-selenium2library into ombre42-spaces-in-locator-prefixes

Conflicts:	CHANGES.rst

Author: ombre42

CHANGES.rst

@@ -23,6 +23,12 @@ Release Notes
 
 - Fixed issue where a non-string assigned to window.id caused
  'Select Window' and 'Get Window *' keywords to fail.
+ [ombre42]
+
+- Allow using key attributes (default strategy) when the locator contains
+ a '=' by using the prefix 'default='. Also make locator prefixes
+ space-insensitive.
+ [ombre42]
 
 A big thank you to [eweitz] and [HelioGuilherme66] for getting the
 continuous integration builds to go green by fixing internal tests.

src/Selenium2Library/__init__.py

@@ -60,6 +60,14 @@ class Selenium2Library(
  | jquery | Click Element `|` jquery=div.my_class | Matches by jQuery/sizzle selector |
  | sizzle | Click Element `|` sizzle=div.my_class | Matches by jQuery/sizzle selector |
  | tag | Click Element `|` tag=div | Matches by HTML tag name |
+ | default* | Click Link `|` default=page?a=b | Matches key attributes with value after first '=' |
+ * Explicitly specifying the default strategy is only necessary if locating
+ elements by matching key attributes is desired and an attribute value
+ contains a '='. The following would fail because it appears as if _page?a_
+ is the specified lookup strategy:
+ | Click Link page?a=b
+ This can be fixed by changing the locator to:
+ | Click Link default=page?a=b
 
  Table related keywords, such as `Table Should Contain`, work differently.
  By default, when a table locator value is provided, it will search for

src/Selenium2Library/keywords/_element.py

@@ -436,11 +436,11 @@ def press_key(self, locator, key):
  """Simulates user pressing key on element identified by `locator`.
 
  `key` is either a single character, or a numerical ASCII code of the key
- lead by '\\'.
+ lead by '\\'. In test data, '\\' must be escaped, so use '\\\\'.
 
  Examples:
  | Press Key | text_field | q |
- | Press Key | login_button | \\13 | # ASCII code for enter key |
+ | Press Key | login_button | \\\\13 | # ASCII code for enter key |
  """
  if key.startswith('\\') and len(key) > 1:
  key = self._map_ascii_key_code_to_key(int(key[1:]))

src/Selenium2Library/locators/elementfinder.py

@@ -1,10 +1,12 @@
 from Selenium2Library import utils
 from robot.api import logger
+from robot.utils import NormalizedDict
+
 
 class ElementFinder(object):
 
  def __init__(self):
- self._strategies = {
+ strategies = {
  'identifier': self._find_by_identifier,
  'id': self._find_by_id,
  'name': self._find_by_name,
@@ -16,14 +18,16 @@ def __init__(self):
  'jquery': self._find_by_sizzle_selector,
  'sizzle': self._find_by_sizzle_selector,
  'tag': self._find_by_tag_name,
- None: self._find_by_default
+ 'default': self._find_by_default
  }
+ self._strategies = NormalizedDict(initial=strategies, caseless=True, spaceless=True)
 
  def find(self, browser, locator, tag=None):
  assert browser is not None
  assert locator is not None and len(locator) > 0
 
  (prefix, criteria) = self._parse_locator(locator)
+ prefix = 'default' if prefix is None else prefix
  strategy = self._strategies.get(prefix)
  if strategy is None:
  raise ValueError("Element locator with prefix '" + prefix + "' is not supported")
@@ -187,7 +191,7 @@ def _parse_locator(self, locator):
  if not locator.startswith('//'):
  locator_parts = locator.partition('=')
  if len(locator_parts[1]) > 0:
- prefix = locator_parts[0].strip().lower()
+ prefix = locator_parts[0]
  criteria = locator_parts[2].strip()
  return (prefix, criteria)
 

test/unit/locators/test_elementfinder.py

@@ -2,16 +2,17 @@
 import os
 from Selenium2Library.locators import ElementFinder
 from mockito import *
+from robot.utils.asserts import assert_raises_with_msg
 
 class ElementFinderTests(unittest.TestCase):
 
  def test_find_with_invalid_prefix(self):
  finder = ElementFinder()
  browser = mock()
- try:
- self.assertRaises(ValueError, finder.find, browser, "something=test1")
- except ValueError as e:
- self.assertEqual(e.message, "Element locator with prefix 'something' is not supported")
+ assert_raises_with_msg(ValueError, "Element locator with prefix 'something' is not supported",
+   finder.find, browser, "something=test1")
+ assert_raises_with_msg(ValueError, "Element locator with prefix ' by ID ' is not supported",
+  finder.find, browser, " by ID =test1")
 
  def test_find_with_null_browser(self):
  finder = ElementFinder()
@@ -36,6 +37,22 @@ def test_find_with_no_tag(self):
  finder.find(browser, "test1")
  verify(browser).find_elements_by_xpath("//*[(@id='test1' or @name='test1')]")
 
+ def test_find_with_explicit_default_strategy(self):
+ finder = ElementFinder()
+ browser = mock()
+ finder.find(browser, "default=test1")
+ verify(browser).find_elements_by_xpath("//*[(@id='test1' or @name='test1')]")
+
+ def test_find_with_explicit_default_strategy_and_equals(self):
+ finder = ElementFinder()
+ browser = mock()
+ when(browser).get_current_url().thenReturn("http://localhost/mypage.html")
+ finder.find(browser, "default=page.do?foo=bar", tag='a')
+ verify(browser).find_elements_by_xpath(
+ "//a[(@id='page.do?foo=bar' or @name='page.do?foo=bar' or @href='page.do?foo=bar' or " +
+ "normalize-space(descendant-or-self::text())='page.do?foo=bar' or " +
+ "@href='http://localhost/page.do?foo=bar')]")
+
  def test_find_with_tag(self):
  finder = ElementFinder()
  browser = mock()
@@ -285,6 +302,7 @@ def test_find_with_sloppy_prefix(self):
 
  elements = self._make_mock_elements('div', 'a', 'span', 'a')
  when(browser).find_elements_by_id("test1").thenReturn(elements)
+ when(browser).find_elements_by_partial_link_text("test1").thenReturn(elements)
 
  result = finder.find(browser, "ID=test1")
  self.assertEqual(result, elements)
@@ -294,6 +312,10 @@ def test_find_with_sloppy_prefix(self):
  self.assertEqual(result, elements)
  result = finder.find(browser, " id =test1")
  self.assertEqual(result, elements)
+ result = finder.find(browser, " partiallink =test1")
+ self.assertEqual(result, elements)
+ result = finder.find(browser, " p art iallin k =test1")
+ self.assertEqual(result, elements)
 
  def test_find_with_sloppy_criteria(self):
  finder = ElementFinder()