Backed out changeset 62ac95a65617 (bug 1495621) for marionette mozpro…

…cess timed out failures.
dothq · Jun 13, 2019 · 01662f5 · 01662f5
1 parent ed60adf
commit 01662f5
Show file tree

Hide file tree

Showing 6 changed files with 434 additions and 369 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -350,6 +350,9 @@ toolkit/components/reader/JSDOMParser.js
 # Uses preprocessing
 toolkit/components/reader/Readerable.jsm
 
+# Should be going away soon
+toolkit/content/widgets/wizard.xml
+
 # Uses preprocessing
 toolkit/mozapps/update/tests/data/xpcshellConstantsPP.js
 toolkit/modules/AppConstants.jsm

diff --git a/testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/wizard.py b/testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/update_wizard/wizard.py
@@ -50,7 +50,7 @@ def _create_panel_for_id(self, panel_id):
 
     @property
     def _buttons(self):
-        return self.element.get_property('_wizardButtons')
+        return self.element.find_element(By.ANON_ATTRIBUTE, {'anonid': 'Buttons'})
 
     @property
     def cancel_button(self):

diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
@@ -75,6 +75,7 @@ toolkit.jar:
 *  content/global/bindings/textbox.xml         (widgets/textbox.xml)
    content/global/bindings/timekeeper.js       (widgets/timekeeper.js)
    content/global/bindings/timepicker.js       (widgets/timepicker.js)
+   content/global/bindings/wizard.xml          (widgets/wizard.xml)
    content/global/elements/autocomplete-popup.js              (widgets/autocomplete-popup.js)
    content/global/elements/autocomplete-richlistitem.js       (widgets/autocomplete-richlistitem.js)
    content/global/elements/browser-custom-element.js          (widgets/browser-custom-element.js)