From 2f2313703574c4b5927dd082553caf099e456fbf Mon Sep 17 00:00:00 2001 From: Sudha Bisht Date: Mon, 23 Nov 2015 19:41:16 +0530 Subject: [PATCH] Minor fix --- tests/phpunit/WebTest/Contact/MergeContactsTest.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/phpunit/WebTest/Contact/MergeContactsTest.php b/tests/phpunit/WebTest/Contact/MergeContactsTest.php index fd0f6811c9..2085d6824c 100644 --- a/tests/phpunit/WebTest/Contact/MergeContactsTest.php +++ b/tests/phpunit/WebTest/Contact/MergeContactsTest.php @@ -472,9 +472,8 @@ class WebTest_Contact_MergeContactsTest extends CiviSeleniumTestCase { // Select the contacts to be merged $this->waitForElementPresent('dupePairs_length'); - $this->select("name=dupePairs_length", "value=100"); - $this->waitForElementPresent("xpath=//table[@id='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[8]/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)']"); @@ -595,7 +594,6 @@ class WebTest_Contact_MergeContactsTest extends CiviSeleniumTestCase { $this->openCiviPage("contact/dedupefind", "reset=1&rgid=1&action=renew", "dupePairs"); $this->waitForElementPresent('dupePairs_length'); - $this->select("name=dupePairs_length", "value=100"); $totalContacts = $this->getXpathCount("//table[@id='dupePairs']/tbody/tr"); $this->click("//form[@id='DedupeFind']//a/span[contains(text(),' Batch Merge All Duplicates')]"); -- 2.25.1