fixes for profile

diff --git a/tests/phpunit/WebTest/Profile/BatchUpdateTest.php b/tests/phpunit/WebTest/Profile/BatchUpdateTest.php
index ac250c8bf6eab07953410a139af84fe3f913f2e1..1459051a98c068e29bb5bd28ccb9b2ed02b23c56 100644 (file)
--- a/tests/phpunit/WebTest/Profile/BatchUpdateTest.php
+++ b/tests/phpunit/WebTest/Profile/BatchUpdateTest.php
@@ -320,54 +320,6 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
 
     $this->assertTrue($assertCheck, 'copy rows for field two failed[radio button]');
 
-    //test with tinymce editor
-    $this->openCiviPage('admin/setting/preferences/display', 'reset=1', '_qf_Display_next-bottom');
-    $this->select('editor_id', 'TinyMCE');
-    $this->click('_qf_Display_next-bottom');
-    $this->waitForPageToLoad($this->getTimeoutMsec());
-
-    // Find Contact
-    $this->openCiviPage('contact/search', 'reset=1', '_qf_Basic_refresh');
-    $this->type('sort_name', $lastName);
-    $this->click('_qf_Basic_refresh');
-
-    // Update multiple contacts
-    $this->waitForElementPresent('CIVICRM_QFID_ts_all_4');
-    $this->click('CIVICRM_QFID_ts_all_4');
-
-    $this->select('task', "label=Update multiple contacts");
-    $this->waitForElementPresent('_qf_PickProfile_next');
-
-    $this->select('uf_group_id', "label={$profileTitle}");
-    $this->click('_qf_PickProfile_next');
-
-    $this->waitForElementPresent('_qf_Batch_next');
-
-    $this->isElementPresent("xpath=//form[@id='Batch']/div[2]/table/tbody//tr/td[text()='{$Name2}']");
-    $this->isElementPresent("xpath=//form[@id='Batch']/div[2]/table/tbody//tr/td[text()='{$Name1}']");
-
-    $richTextAreaIdOne = $this->getAttribute("xpath=//form[@id='Batch']/div[2]/table/tbody/tr/td[5]/textarea/@id");
-    $richTextAreaIdTwo = $this->getAttribute("xpath=//form[@id='Batch']/div[2]/table/tbody/tr[2]/td[5]/textarea/@id");
-
-    $this->selectFrame("css=td.mceIframeContainer iframe#{$richTextAreaIdOne}_ifr");
-    $this->type("//html/body", 'this is intro text');
-    $this->selectFrame('relative=top');
-
-    $this->click("xpath=//table[@class='crm-copy-fields']/thead/tr/td[5]/img");
-    // Because it tends to cause problems, all uses of sleep() must be justified in comments
-    // Sleep should never be used for wait for anything to load from the server
-    // Justification for this instance: FIXME
-    sleep(5);
-
-    if ($this->getValue($richTextAreaIdOne) == $this->getValue($richTextAreaIdTwo)) {
-      $assertCheck = TRUE;
-    }
-    else {
-      $assertCheck = FALSE;
-    }
-
-    $this->assertTrue($assertCheck, 'Rich Text Area coping failed [TinyMCE]');
-
     //campaign test for interview
     //enable CiviCampaign module if necessary
     $this->enableComponents("CiviCampaign");

diff --git a/tests/phpunit/WebTest/Profile/SearchTest.php b/tests/phpunit/WebTest/Profile/SearchTest.php
index 9210ec2282611d1299f3efa0da8062fbd75f301e..14b29f67890f67d880dcb8e60f3bd54d81aaddf9 100644 (file)
--- a/tests/phpunit/WebTest/Profile/SearchTest.php
+++ b/tests/phpunit/WebTest/Profile/SearchTest.php
@@ -83,6 +83,7 @@ class WebTest_Profile_SearchTest extends CiviSeleniumTestCase {
     $this->waitForText('crm-notification-container', "Your CiviCRM Profile Field 'Last Name' has been saved to '$profileTitle'.");
 
     // Add Email field.
+    $this->waitForElementPresent("field_name[0]");
     $this->click('field_name[0]');
     $this->select('field_name[0]', 'value=Contact');
     $this->click('field_name[1]');