Bug 1481052 - Work around test that causes Mozmill to die a horrible death; rs=bustage-fix
authorGeoff Lankow <geoff@darktrojan.net>
Thu, 29 Nov 2018 23:18:46 +1300
changeset 33814 70a161f6a58b31113ed2bc62eda86073db82cec9
parent 33813 06599026d496381c837d6b565fbd9a12361f3575
child 33815 6d2e32bd972987445f659ef51d701d54fa286618
push id388
push userclokep@gmail.com
push dateMon, 28 Jan 2019 20:54:56 +0000
reviewersbustage-fix
bugs1481052
Bug 1481052 - Work around test that causes Mozmill to die a horrible death; rs=bustage-fix
mail/test/mozmill/cloudfile/test-cloudfile-add-account-dialog.js
--- a/mail/test/mozmill/cloudfile/test-cloudfile-add-account-dialog.js
+++ b/mail/test/mozmill/cloudfile/test-cloudfile-add-account-dialog.js
@@ -86,17 +86,20 @@ function get_accept_button(aController) 
 /**
  * Helper function that waits for the contents of the Filelink provider
  * settings IFrame to be fully loaded.
  *
  * @param aController a controller for an 'Add an Account' dialog
  * @param aURL the expected URL for the IFrame to load.
  */
 function wait_for_settings_loaded(aController, aURL) {
-  wait_for_frame_load(aController.e('accountSettings'), aURL);
+  // Mozmill chokes horribly here, so don't look directly into the iframe.
+  aController.waitFor(() => {
+    return aController.e("accountType").nextElementSibling.src == aURL;
+  });
 }
 
 /**
  * Test that when the dialog first spawns, and the 'Select an account type'
  * menuitem is selected, that the accept button is disabled.
  */
 function test_accept_disabled_by_default() {
   gMockCloudfileManager.register('service1');
@@ -172,17 +175,16 @@ function subtest_lone_provider_auto_sele
   wait_for_element_enabled(aController, get_accept_button(aController),
                            true);
 }
 
 /**
  * Test that if a provider has a settings form, that the 'Set up Account'
  * button does not become enabled until the form passes validation.
  */
-test_accept_enabled_on_form_validation.__force_skip__ = true;
 function test_accept_enabled_on_form_validation() {
   // settings-with-form.xhtml has a form with a single text input. The form
   // requires that there be something in the text input before it passes
   // validation.
   gMockCloudfileManager.register('service-with-form', {
     settingsURL: kSettingsWithForm,
   });