Bug 904132 - port "card is null" fix from 826732 to TB24-beta. r+a=Standard8
authoraceman <acelists@atlas.sk>
Mon, 23 Sep 2013 12:23:22 +0100
changeset 16006 dfaec501b9b1
parent 16005 875c73aee9ba
child 16007 a9e6156ef5e0
push id7
push userbugzilla@standard8.plus.com
push date2013-09-23 11:23 +0000
bugs904132, 826732
Bug 904132 - port "card is null" fix from 826732 to TB24-beta. r+a=Standard8
mail/test/mozmill/composition/test-send-button.js
--- a/mail/test/mozmill/composition/test-send-button.js
+++ b/mail/test/mozmill/composition/test-send-button.js
@@ -116,16 +116,19 @@ function test_send_enabled_address_conta
   load_contacts_into_address_book(defaultAB, [contact]);
 
   let cwc = open_compose_new_mail(); // compose controller
   // On an empty window, Send must be disabled.
   check_send_commands_state(cwc, false);
 
   // Open Contacts sidebar and use our contact.
   cwc.window.toggleAddressPicker();
-  let sidebar = cwc.window.document.getElementById("sidebar");
-  cwc.waitForElement(new elib.ID(sidebar.contentDocument, "ccButton"));
+
+  let sidebar = cwc.e("sidebar");
+  wait_for_frame_load(sidebar,
+    "chrome://messenger/content/addressbook/abContactsPanel.xul");
   sidebar.contentDocument.getElementById("ccButton").click();
+
   // The recipient is filled in, Send must be enabled.
   check_send_commands_state(cwc, true);
 
   close_compose_window(cwc);
 }