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

Backed out 2 changesets (bug 1277090) for breaking Firefox ui tests CLOSED TREE

Browse Source 
Backed out changeset 4517cfdd7f79 (bug 1277090)
Backed out changeset 7be72cdc9d78 (bug 1277090)
This commit is contained in:
Wes Kocher 2016-06-21 09:03:49 -07:00
parent 26ac166ea9
commit 2488f506e6
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
testing/marionette/driver.js
View File

@ -1786,16 +1786,7 @@ GeckoDriver.prototype.getElementAttribute = function*(cmd, resp) {
case Context.CHROME:
let win = this.getCurrentWindow();
let el = this.curBrowser.seenEls.get(id, {frame: win});
if (element.isBooleanAttribute(el, name)) {
if (el.hasAttribute(name)) {
resp.body.value = "true";
} else {
resp.body.value = null;
}
} else {
resp.body.value = el.getAttribute(name);
}
resp.body.value = atom.getElementAttribute(el, name, this.getCurrentWindow());
break;
case Context.CONTENT:

10
testing/marionette/harness/marionette/tests/unit/test_mouse_action.py
View File

@ -50,7 +50,7 @@ class TestMouseAction(MarionetteTestCase):
def context_menu_state():
with self.marionette.using_context("chrome"):
cm_el = self.marionette.find_element(By.ID, "contentAreaContextMenu")
return cm_el.get_property("state")
return cm_el.get_attribute("state")
self.assertEqual("closed", context_menu_state())
self.action.context_click(click_el).perform()
@ -87,20 +87,20 @@ class TestMouseAction(MarionetteTestCase):
with self.marionette.using_context("chrome"):
urlbar = self.marionette.find_element(By.ID, "urlbar")
self.assertEqual("", urlbar.get_property("value"))
self.assertEqual("", urlbar.get_attribute("value"))
urlbar.send_keys(test_word)
self.assertEqual(urlbar.get_property("value"), test_word)
self.assertEqual(urlbar.get_attribute("value"), test_word)
(self.action.double_click(urlbar).perform()
.key_down(self.mod_key)
.key_down("x").perform())
self.assertEqual(urlbar.get_property("value"), "")
self.assertEqual(urlbar.get_attribute("value"), "")
def test_chrome_context_click_action(self):
self.marionette.set_context("chrome")
def context_menu_state():
cm_el = self.marionette.find_element(By.ID, "tabContextMenu")
return cm_el.get_property("state")
return cm_el.get_attribute("state")
currtab = self.marionette.execute_script("return gBrowser.selectedTab")
self.assertEqual("closed", context_menu_state())

4
testing/marionette/harness/marionette/tests/unit/test_typing.py
View File

@ -83,9 +83,9 @@ class TestTyping(MarionetteTestCase):
url_bar.send_keys(mod_key, "a")
url_bar.send_keys(Keys.BACK_SPACE)
self.assertEqual("", url_bar.get_property("value"))
self.assertEqual("", url_bar.get_attribute("value"))
url_bar.send_keys(mod_key, "v")
self.assertEqual("zyxwvutsr", url_bar.get_property("value"))
self.assertEqual("zyxwvutsr", url_bar.get_attribute("value"))
def testShouldBeAbleToTypeQuoteMarks(self):
test_html = self.marionette.absolute_url("javascriptPage.html")