Bug 1130979 - Added ANON constant to By class and changed hard-coded values in test file; r?maja_zf
MozReview-Commit-ID: AOsb6l9UpVR
--- a/testing/marionette/client/marionette_driver/by.py
+++ b/testing/marionette/client/marionette_driver/by.py
@@ -19,8 +19,9 @@ class By(object):
XPATH = "xpath"
LINK_TEXT = "link text"
PARTIAL_LINK_TEXT = "partial link text"
NAME = "name"
TAG_NAME = "tag name"
CLASS_NAME = "class name"
CSS_SELECTOR = "css selector"
ANON_ATTRIBUTE = "anon attribute"
+ ANON = "anon"
--- a/testing/marionette/harness/marionette/tests/unit/test_anonymous_content.py
+++ b/testing/marionette/harness/marionette/tests/unit/test_anonymous_content.py
@@ -51,15 +51,15 @@ class TestAnonymousContent(MarionetteTes
self.assertEquals(1, len(el.find_elements(By.ANON_ATTRIBUTE, {"anonid": "buttons"})))
with self.assertRaises(NoSuchElementException):
el.find_element(By.ANON_ATTRIBUTE, {"anonid": "nonexistent"})
self.assertEquals([], el.find_elements(By.ANON_ATTRIBUTE, {"anonid": "nonexistent"}))
def test_find_anonymous_children(self):
el = Wait(self.marionette).until(element_present(By.ID, "dia"))
- self.assertEquals(HTMLElement, type(el.find_element("anon", None)))
- self.assertEquals(2, len(el.find_elements("anon", None)))
+ self.assertEquals(HTMLElement, type(el.find_element(By.ANON, None)))
+ self.assertEquals(2, len(el.find_elements(By.ANON, None)))
el = self.marionette.find_element(By.ID, "framebox")
with self.assertRaises(NoSuchElementException):
- el.find_element("anon", None)
- self.assertEquals([], el.find_elements("anon", None))
+ el.find_element(By.ANON, None)
+ self.assertEquals([], el.find_elements(By.ANON, None))