Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 781932 - Update enabled() to be is_enabled to make Selenium API. r=jgriffin

Browse Source
This commit is contained in:
Ekanan Ketunuti 2012-08-15 08:21:41 +07:00
parent b81f1fb70b
commit 33433c8f39
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing/marionette/client/marionette/marionette.py
View File

@ -71,7 +71,7 @@ class HTMLElement(object):
def is_selected(self):
return self.marionette._send_message('isElementSelected', 'value', element=self.id)
def enabled(self):
def is_enabled(self):
return self.marionette._send_message('isElementEnabled', 'value', element=self.id)
def is_displayed(self):

2
testing/marionette/client/marionette/test_protocol.py
View File

@ -50,7 +50,7 @@ if __name__ == '__main__':
assert(m.find_element(HTMLElement.ID, 'id3').clear())
assert(m.find_element(HTMLElement.ID, 'id3').is_selected())
assert(m.find_element(HTMLElement.ID, 'id1').equals(m.find_element(HTMLElement.TAG, 'p')))
assert(m.find_element(HTMLElement.ID, 'id3').enabled())
assert(m.find_element(HTMLElement.ID, 'id3').is_enabled())
assert(m.find_element(HTMLElement.ID, 'id3').displayed())
assert(m.find_element(HTMLElement.ID, 'id3').get_attribute('value') == server.TEST_GET_VALUE)
assert(m.delete_session())

2
testing/marionette/client/marionette/tests/unit/test_clearing.py
View File

@ -62,7 +62,7 @@ class TestClear(MarionetteTestCase):
self.marionette.navigate(test_html)
try:
element = self.marionette.find_element("id","textInputnotenabled")
self.assertFalse(element.enabled())
self.assertFalse(element.is_enabled())
element.clear()
self.fail("Should not have been able to clear")
except InvalidElementStateException:

8
testing/marionette/client/marionette/tests/unit/test_elementState.py
View File

@ -10,9 +10,9 @@ class TestState(MarionetteTestCase):
test_html = self.marionette.absolute_url("test.html")
self.marionette.navigate(test_html)
l = self.marionette.find_element("name", "myCheckBox")
self.assertTrue(l.enabled())
self.assertTrue(l.is_enabled())
self.marionette.execute_script("arguments[0].disabled = true;", [l])
self.assertFalse(l.enabled())
self.assertFalse(l.is_enabled())
def test_isDisplayed(self):
test_html = self.marionette.absolute_url("test.html")
@ -36,9 +36,9 @@ class TestStateChrome(MarionetteTestCase):
def test_isEnabled(self):
l = self.marionette.find_element("id", "textInput")
self.assertTrue(l.enabled())
self.assertTrue(l.is_enabled())
self.marionette.execute_script("arguments[0].disabled = true;", [l])
self.assertFalse(l.enabled())
self.assertFalse(l.is_enabled())
self.marionette.execute_script("arguments[0].disabled = false;", [l])
def test_isDisplayed(self):