<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.5 |
+ | CiviCRM version 4.6 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
parent::setUp();
}
- function testIndividualAdd() {
+ public function testIndividualAdd() {
$this->webtestLogin();
$this->openCiviPage("contact/add", "reset=1&ct=Individual");
$this->assertChecked("check_3");
}
- function testMergeContactSubType() {
+ public function testMergeContactSubType() {
$this->webtestLogin();
$this->openCiviPage("contact/add", "reset=1&ct=Individual");
$this->waitForElementPresent('_qf_Contact_cancel-bottom');
//fill in first name
- $firstName = "Anderson".substr(sha1(rand()), 0, 4);
+ $firstName = "Anderson" . substr(sha1(rand()), 0, 4);
$this->type('first_name', $firstName);
//fill in last name
$this->openCiviPage("contact/add", "reset=1&ct=Individual");
$this->waitForElementPresent('_qf_Contact_cancel-bottom');
- $fName = "John".substr(sha1(rand()), 0, 4);
+ $fName = "John" . substr(sha1(rand()), 0, 4);
$this->type('first_name', $fName);
$lName = substr(sha1(rand()), 0, 4);
$this->type('last_name', $lName);
$this->waitForElementPresent('_qf_DedupeFind_submit-bottom');
$this->click("_qf_DedupeFind_next-bottom");
- $this->waitForElementPresent("xpath=//table[@id='option51']/tbody/tr[1]/td[4]/a[text()='merge']");
+ $this->waitForElementPresent("xpath=div[@id='DedupeFind']/div[2]/div/table/tbody/tr[1]/td[4]/a[text()='merge']");
$this->waitForElementPresent("xpath=//*[@id='DedupeFind']/a[3]/span[contains(text(),'Done')]");
$this->isElementPresent("xpath=//table[@id='option51']/tbody/tr/td[1]/a[text()='{$firstName} {$lastName}']/../td[2]/a[text()='{$fName} {$lName}']");
$this->click("xpath=//table[@id='option51']/tbody/tr[1]/td[4]/a[text()='merge']");
* @param string $lastName
* @param $subject
*/
- function addActivity($firstName, $lastName, $subject) {
+ public function addActivity($firstName, $lastName, $subject) {
$withContact = substr(sha1(rand()), 0, 7);
$this->webtestAddContact($withContact, "Anderson", $withContact . "@anderson.name");
// Now we're filling the "Assigned To" field.
// Typing contact's name into the field (using typeKeys(), not type()!)...
- $this->select2("assignee_contact_id", $firstName,TRUE,FALSE);
+ $this->select2("assignee_contact_id", $firstName, TRUE, FALSE);
// ...and verifying if the page contains properly formatted display name for chosen contact.
$this->assertTrue($this->isTextPresent("$lastName, " . $firstName), "Contact not found in line " . __LINE__);
$this->waitForText('crm-notification-container', "Activity '$subject' has been saved.", "Status message didn't show up after saving!");
}
- function testMergeTest() {
+ public function testMergeTest() {
$this->webtestLogin();
$this->openCiviPage("contact/add", "reset=1&ct=Individual");
$this->assertTrue($this->isElementPresent("xpath=//div[@id='phone-block']/div/div/div[3]/div[2][contains(text(), '9876543210')]"));
}
- function testBatchMerge(){
+ public function testBatchMerge() {
$this->webtestLogin();
// add contact1 and its duplicate
//first name
- $firstName = "Kerry".substr(sha1(rand()), 0, 7);
+ $firstName = "Kerry" . substr(sha1(rand()), 0, 7);
//last name
- $lastName = "King".substr(sha1(rand()), 0, 7);
- $this->_createContacts($firstName,$lastName);
+ $lastName = "King" . substr(sha1(rand()), 0, 7);
+ $this->_createContacts($firstName, $lastName);
//add contact2 and its duplicate
//These are the contacts with conflicts in communication preference.these contacts will be skipped during merge.
$this->openCiviPage("contact/add", "reset=1&ct=Individual");
//fill in first name
- $firstName1 = "Kurt".substr(sha1(rand()), 0, 7);
+ $firstName1 = "Kurt" . substr(sha1(rand()), 0, 7);
$this->type('first_name', $firstName1);
//fill in last name
- $lastName1 = "Cobain".substr(sha1(rand()), 0, 7);
+ $lastName1 = "Cobain" . substr(sha1(rand()), 0, 7);
$this->type('last_name', $lastName1);
//fill in email id
// add contact3 and its duplicate
//fill in first name
- $firstName2 = "David".substr(sha1(rand()), 0, 7);
+ $firstName2 = "David" . substr(sha1(rand()), 0, 7);
//fill in last name
- $lastName2 = "Gilmour".substr(sha1(rand()), 0, 7);
- $this->_createContacts($firstName2,$lastName2);
+ $lastName2 = "Gilmour" . substr(sha1(rand()), 0, 7);
+ $this->_createContacts($firstName2, $lastName2);
// add contact4 and its duplicate
//fill in first name
- $firstName3 = "Dave".substr(sha1(rand()), 0, 7);
+ $firstName3 = "Dave" . substr(sha1(rand()), 0, 7);
//fill in last name
- $lastName3 = "Mustaine".substr(sha1(rand()), 0, 7);
- $this->_createContacts($firstName3,$lastName3);
+ $lastName3 = "Mustaine" . substr(sha1(rand()), 0, 7);
+ $this->_createContacts($firstName3, $lastName3);
// Find and Merge Contacts with Supervised Rule
$this->openCiviPage("contact/dedupefind", "reset=1&rgid=1&action=renew", "css=#DedupeFind table.pagerDisplay tbody tr");
// Check confirmation alert.
$this->assertTrue(
- (bool)preg_match("/^This will run the batch merge process on the listed duplicates. The operation will run in safe mode - only records with no direct data conflicts will be merged. Click OK to proceed if you are sure you wish to run this operation./",
+ (bool) preg_match("/^This will run the batch merge process on the listed duplicates. The operation will run in safe mode - only records with no direct data conflicts will be merged. Click OK to proceed if you are sure you wish to run this operation./",
$this->getConfirmation()
));
$this->chooseOkOnNextConfirmation();
3 => "{$firstName3}.{$lastName3}@example.com"
);
- foreach($contactEmails as $key => $value) {
+ foreach ($contactEmails as $key => $value) {
$this->click('sort_name_navigation');
$this->type('css=input#sort_name_navigation', $value);
$this->typeKeys('css=input#sort_name_navigation', $value);
/**
* Helper FN
*/
- function _createContacts($firstName = NULL, $lastName = NULL, $organizationName = NULL, $contactType = 'Individual') {
+ public function _createContacts($firstName = NULL, $lastName = NULL, $organizationName = NULL, $contactType = 'Individual') {
if ($contactType == 'Individual') {
// add contact
$this->openCiviPage("contact/add", "reset=1&ct=Individual");
* Helper FN
* to create new membership type
*/
- function addMembershipType($membershipOrganization) {
+ public function addMembershipType($membershipOrganization) {
$this->openCiviPage("admin/member/membershipType", "reset=1&action=browse");
$this->click("link=Add Membership Type");
$this->waitForElementPresent('_qf_MembershipType_cancel-bottom');
$this->select2('member_of_contact_id', $membershipOrganization);
$this->type('minimum_fee', '1');
- $this->select( 'financial_type_id', 'value=2' );
+ $this->select('financial_type_id', 'value=2');
$this->type('duration_interval', 1);
$this->select('duration_unit', "label=year");
/**
* Test for CRM-12695 fix
*/
- function testMergeOrganizations() {
+ public function testMergeOrganizations() {
$this->webtestLogin();
// build organisation name
- $orgnaizationName = 'org_'.substr(sha1(rand()), 0, 7);
+ $orgnaizationName = 'org_' . substr(sha1(rand()), 0, 7);
$contactIds = array();
// create organization and its duplicate
$this->waitForElementPresent("xpath=//li[@id='tab_member']/a/em");
$this->verifyText("xpath=//li[@id='tab_member']/a/em", 1);
}
-}
+ /**
+ * Test for CRM-15658 fix
+ */
+ public function testMergeEmailAndAddress() {
+ $this->webtestLogin();
+ $this->openCiviPage("contact/add", "reset=1&ct=Individual");
+ $firstName = substr(sha1(rand()), 0, 7);
+ $this->type('first_name', $firstName);
+
+ //fill in last name
+ $lastName = substr(sha1(rand()), 0, 7);
+ $this->type('last_name', $lastName);
+
+ //fill in email id
+ $this->type('email_1_email', "{$firstName}.{$lastName}@example.com");
+
+ //address section
+ $this->click("addressBlock");
+ $this->waitForElementPresent("address_1_street_address");
+ $this->type("address_1_street_address", "902C El Camino Way SW");
+ $this->type("address_1_city", "Dumfries");
+ $this->type("address_1_postal_code", "1234");
+
+ // Clicking save.
+ $this->click("_qf_Contact_upload_view");
+ $this->waitForPageToLoad($this->getTimeoutMsec());
+ $this->waitForText('crm-notification-container', "Contact Saved");
+
+ //duplicate contact with same email id
+ $this->openCiviPage("contact/add", "reset=1&ct=Individual");
+ $firstName2 = substr(sha1(rand()), 0, 7);
+ $this->type('first_name', $firstName2);
+
+ //fill in last name
+ $lastName2 = substr(sha1(rand()), 0, 7);
+ $this->type('last_name', $lastName2);
+
+ //fill in email id
+ $this->type('email_1_email', "{$firstName}.{$lastName}@example.com");
+
+ //address section
+ $this->click("addressBlock");
+ $this->waitForElementPresent("address_1_street_address");
+ $this->type("address_1_street_address", "2782Y Dowlen Path W");
+ $this->type("address_1_city", "Birmingham");
+ $this->type("address_1_postal_code", "3456");
+
+ // Clicking save.
+ $this->click("_qf_Contact_upload_view");
+ $this->waitForPageToLoad($this->getTimeoutMsec());
+ $this->waitForText('crm-notification-container', "Contact Saved");
+
+ $this->openCiviPage("contact/dedupefind", "reset=1&action=update&rgid=4");
+ $this->click("xpath=//a/span[text()='Refresh Duplicates']");
+ $this->assertTrue((bool) preg_match("/This will refresh the duplicates list. Click OK to proceed./", $this->getConfirmation()));
+ $this->chooseOkOnNextConfirmation();
+ $this->waitForPageToLoad($this->getTimeoutMsec());
+ $this->waitForElementPresent("xpath=//a[text()='$firstName $lastName']/../../td[4]/a[text()='merge']");
+ $this->clickLink("xpath=//a[text()='$firstName $lastName']/../../td[4]/a[text()='merge']");
+
+ //merge without specifying any criteria
+ $this->click("_qf_Merge_next-bottom");
+ $this->waitForPageToLoad($this->getTimeoutMsec());
+
+ $this->assertTrue($this->isTextPresent('Contacts Merged'));
+ $this->assertTrue($this->isElementPresent("xpath=//div[@id='email-block']/div/div/div[2]/div[1][contains(text(), 'Home')]"));
+ $this->verifyElementNotPresent("xpath=//div[@id='email-block']/div/div/div[3]/div[1][contains(text(), 'Home')]");
+ $this->assertTrue($this->isElementPresent("xpath=//div[@id='email-block']/div/div/div[2]/div[2]/a[contains(text(), '{$firstName}.{$lastName}@example.com')]"));
+ $this->verifyElementNotPresent("xpath=//div[@id='email-block']/div/div/div[3]/div[2]/a[contains(text(), '{$firstName}.{$lastName}@example.com')]");
+
+ $this->assertElementContainsText('address-block-1', "902C El Camino Way SW");
+ $this->assertElementContainsText('address-block-1', "Dumfries");
+ $this->assertElementContainsText('address-block-1', "1234");
+
+ $this->assertElementNotContainsText("address-block-2", "2782Y Dowlen Path W");
+ $this->assertElementNotContainsText("address-block-2", "Birmingham");
+ $this->assertElementNotContainsText("address-block-2", "3456");
+ }
+}
projects / civicrm-core.git / blobdiff