+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015 |
+ | Copyright CiviCRM LLC (c) 2004-2016 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
// Select the contacts to be merged
$this->waitForElementPresent('dupePairs_length');
- $this->select("name=dupePairs_length", "value=100");
$this->waitForElementPresent("xpath=//a[text()='$firstName $lastName']");
- $this->click("xpath=//a[text()='$firstName $lastName']/../../td[4]/a[text()='merge']");
+ $this->click("xpath=//a[text()='$firstName $lastName']/../../td[8]/a[text()='merge']");
$this->waitForElementPresent('_qf_Merge_cancel-bottom');
- $this->clickLink("css=div.crm-contact-merge-form-block div.action-link a", "xpath=//form[@id='Merge']/div[2]/table/tbody/tr[3]/td[4]/span[text()='(overwrite)']", FALSE);
+ $this->clickLink("css=div.crm-contact-merge-form-block div.action-link a");
+
+ $this->waitForElementPresent("xpath=//form[@id='Merge']/div[2]/table/tbody/tr[3]/td[4]/span[text()='(overwrite)']");
$this->waitForElementPresent("xpath=//form[@id='Merge']/div[2]/table/tbody/tr[5]/td[4]/span[text()='(add)']");
$this->waitForElementPresent('_qf_Merge_cancel-bottom');
// Select the contacts to be merged
$this->waitForElementPresent('dupePairs_length');
- $this->select("name=dupePairs_length", "value=100");
- $this->waitForElementPresent("xpath=//table[@class='pagerDisplay dataTable no-footer']/tbody//tr/td[1]/a[text()='$firstName1 $lastName1']/../../td[2]/a[text()='$firstName1 $lastName1']");
- $this->click("xpath=//table[@class='pagerDisplay dataTable no-footer']/tbody//tr/td[1]/a[text()='$firstName1 $lastName1']/../../td[2]/a[text()='$firstName1 $lastName1']/../../td[4]/a[text()='merge']");
+ $this->waitForElementPresent("xpath=//a[text()='$firstName1 $lastName1']");
+ $this->click("xpath=//a[text()='$firstName1 $lastName1']/../../td[8]/a[text()='merge']");
$this->waitForElementPresent('_qf_Merge_cancel-bottom');
$this->clickLink("css=div.crm-contact-merge-form-block div.action-link a", "xpath=//form[@id='Merge']/div[2]/table/tbody/tr[4]/td[4]/span[text()='(overwrite)']");
$this->waitForElementPresent("xpath=//form[@id='Merge']/div[2]/table/tbody/tr[3]/td[4]/span[text()='(add)']");
// add relationship "Employer of"
// click through to the relationship view screen
+ $this->waitForAjaxContent();
$this->click("css=li#tab_rel a");
// wait for add Relationship link
$this->select('relationship_type_id', "value=5_b_a");
//fill in the individual
+ $this->waitForElementPresent('related_contact_id');
$this->select2('related_contact_id', $sortName, TRUE, FALSE);
$this->waitForElementPresent("_qf_Relationship_upload");
//check the status message
$this->waitForText('crm-notification-container', "Relationship created.");
-
$this->waitForElementPresent("xpath=//div[@class='dataTables_wrapper no-footer']/table/tbody/tr/td[9]/span/a[text()='View']");
- $this->waitForElementPresent("xpath=//a[text()='$sortName']");
+ $this->waitForAjaxContent();
$this->click("xpath=//a[text()='$sortName']");
- $this->waitForPageToLoad($this->getTimeoutMsec());
+ $this->waitForAjaxContent();
// Check if Membership for the individual is created
$this->waitForElementPresent("xpath=//li[@id='tab_member']/a/em");
// add relationship "Employer of"
// click through to the relationship view screen
+ $this->waitForAjaxContent();
$this->click("css=li#tab_rel a");
// wait for add Relationship link
$this->select('relationship_type_id', "value=5_b_a");
//fill in the individual
+ $this->waitForElementPresent('related_contact_id');
$this->select2('related_contact_id', $sortNameOther, TRUE, FALSE);
$this->waitForElementPresent("_qf_Relationship_upload");
$this->waitForPageToLoad($this->getTimeoutMsec());
// click through to the relationship view screen
+ $this->waitForAjaxContent();
$this->click("css=li#tab_rel a");
// wait for add Relationship link
- $this->waitForElementPresent("xpath=//a[text()='$sortName']");
+ $this->waitForElementPresent("xpath=//div[@class='dataTables_wrapper no-footer']/table/tbody//tr//td//a[text()='$sortName']");
// go to duplicate organization's related contact
// to check if membership is added to that contact
- $this->click("xpath=//a[text()='$sortName']");
+ $this->click("xpath=//div[@class='dataTables_wrapper no-footer']/table/tbody//tr//td//a[text()='$sortName']");
$this->waitForPageToLoad($this->getTimeoutMsec());
// Check if Membership for the individual is created