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

Backed out changeset 4517cfdd7f79 (bug 1277090)
Backed out changeset 7be72cdc9d78 (bug 1277090)

testing/marionette/driver.js

@@ -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:

testing/marionette/harness/marionette/tests/unit/test_mouse_action.py

@@ -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())

testing/marionette/harness/marionette/tests/unit/test_typing.py

@@ -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")