<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.5 |
+ | CiviCRM version 4.6 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
parent::setUp();
}
- function testSearchBuilderOptions() {
+ public function testSearchBuilderOptions() {
$this->webtestLogin();
$groupName = $this->WebtestAddGroup();
$this->waitForPageToLoad();
// We should get no results. But check the options are all still set
- $this->waitForTextPresent('No matches found');
+ $this->waitForTextPresent('No matches found for:');
foreach (array($groupName, 'United States', 'Male') as $i => $label) {
$this->waitForElementPresent("//span[@id='crm_search_value_1_$i']/select/option[2]");
$this->assertSelectedLabel("//span[@id='crm_search_value_1_$i']/select", $label);
}
}
- function testSearchBuilderRLIKE() {
+ public function testSearchBuilderRLIKE() {
$this->webtestLogin();
// Adding contact
/**
* @param null $firstName
*/
- function createDetailContact($firstName = NULL) {
+ public function createDetailContact($firstName = NULL) {
if (!$firstName) {
$firstName = substr(sha1(rand()), 0, 7);
$this->assertTrue($this->isTextPresent("$firstName adv$firstName"));
}
- function testSearchBuilderContacts() {
+ public function testSearchBuilderContacts() {
$this->webtestLogin();
//Individual
$this->click("_qf_Contact_upload_view");
$this->waitForPageToLoad($this->getTimeoutMsec());
$this->_searchBuilder('Email', NULL, NULL, 'IS NULL');
- $this->type("xpath=//*[@id='Builder-rows-per-page-select']", '100');
- $this->waitForElementPresent("xpath=//*[@id='Builder-rows-per-page-select']");
+ $this->type('CRM_Contact_Form_Search_Builder-rows-per-page-select', '100');
+ $this->waitForElementPresent('CRM_Contact_Form_Search_Builder-rows-per-page-select');
$names = array(
1 => $firstName1,
2 => $firstName2,
}
//searching contacts whose phone field is not empty
$this->_searchBuilder('Phone', NULL, $firstName, 'IS NOT EMPTY');
- $this->type("xpath=//*[@id='Builder-rows-per-page-select']", '100');
- $this->waitForElementPresent("xpath=//*[@id='Builder-rows-per-page-select']");
+ $this->type('CRM_Contact_Form_Search_Builder-rows-per-page-select', '100');
+ $this->waitForElementPresent('CRM_Contact_Form_Search_Builder-rows-per-page-select');
$this->assertTrue($this->isTextPresent($firstName));
$firstName4 = "AB" . substr(sha1(rand()), 0, 7);
* @param string $op
* @param null $count
*/
- function _searchBuilder($field, $fieldValue = NULL, $name = NULL, $op = '=', $count = NULL) {
+ public function _searchBuilder($field, $fieldValue = NULL, $name = NULL, $op = '=', $count = NULL) {
// search builder using contacts(not using contactType)
$this->openCiviPage("contact/search/builder", "reset=1");
$this->enterValues(1, 1, 'Contacts', $field, NULL, $op, "$fieldValue");
/**
* Enter form values in a Search Builder row
*/
- function enterValues($set, $row, $entity, $field, $loc, $op, $value = '') {
+ public function enterValues($set, $row, $entity, $field, $loc, $op, $value = '') {
if ($set > 1 && $row == 1) {
$this->click('addBlock');
}
* @param null $count
* @param $field
*/
- function _advancedSearch($fieldValue = NULL, $name = NULL, $contactType = NULL, $count = NULL, $field) {
+ public function _advancedSearch($fieldValue = NULL, $name = NULL, $contactType = NULL, $count = NULL, $field) {
//advanced search by selecting the contactType
$this->openCiviPage("contact/search/advanced", "reset=1");
if (isset($contactType)) {
}
else {
$this->click("location");
- $this->waitForElementPresent("xpath=//div[@id='location']/table/tbody/tr[2]/td/table/tbody/tr[4]/td[2]/select");
+ $this->waitForElementPresent("$field");
if ($contactType == 'Individual') {
$this->type("$field", $fieldValue);
}
/**
* @param $contactType
- * @param $name
+ * @param string $name
* @param $email
* @param null $streetName
* @param null $postalCode
*/
- function _createContact($contactType, $name, $email, $streetName = NULL, $postalCode = NULL) {
+ public function _createContact($contactType, $name, $email, $streetName = NULL, $postalCode = NULL) {
$this->openCiviPage('contact/add', array('reset' => 1, 'ct' => $contactType), '_qf_Contact_cancel');
if ($contactType == 'Individual') {
* Webtest for CRM-12148
*
*/
- function testSearchBuilderfinancialType() {
- // Logging in. Remember to wait for page to load. In most cases,
- // you can rely on 30000 as the value that allows your test to pass, however,
- // sometimes your test might fail because of this. In such cases, it's better to pick one element
- // somewhere at the end of page and use waitForElementPresent on it - this assures you, that whole
- // page contents loaded and you can continue your test execution.
+ public function testSearchBuilderfinancialType() {
$this->webtestLogin();
// add financial type
$financialType = $financialTypeName2;
}
// create new contact using dialog
- $firstName = substr(sha1(rand()), 0, 7);
- $this->webtestNewDialogContact($firstName, 'Contributor', $firstName . '@example.com');
+ $this->createDialogContact();
$this->select('financial_type_id', $financialType);
$this->type('total_amount', 100 * $i);
$this->clickLink('_qf_Contribution_upload_new', '_qf_Contribution_upload_new');
$this->openCiviPage("contact/search/builder", "reset=1", "_qf_Builder_refresh");
$this->enterValues(1, 1, 'Contribution', 'Financial Type', NULL, '=', array($financialTypeName1));
- $this->click('_qf_Builder_refresh');
- $this->waitForPageToLoad($this->getTimeoutMsec());
+ $this->clickLink('_qf_Builder_refresh');
$this->assertTrue($this->isTextPresent('3 Contacts'), 'Missing text: ' . '3 Contacts');
$this->click("xpath=//div[@class='crm-accordion-header crm-master-accordion-header']");
$this->enterValues(1, 1, 'Contribution', 'Financial Type', NULL, '=', array($financialTypeName2));
- $this->click('_qf_Builder_refresh');
- $this->waitForPageToLoad($this->getTimeoutMsec());
+ $this->clickLink('_qf_Builder_refresh');
+
$this->assertTrue($this->isTextPresent('3 Contacts'), 'Missing text: ' . '3 Contacts');
$this->click("xpath=//div[@class='crm-accordion-header crm-master-accordion-header']");
$financialTypeName1,
$financialTypeName2
));
- $this->click('_qf_Builder_refresh');
- $this->waitForPageToLoad($this->getTimeoutMsec());
+ $this->clickLink('_qf_Builder_refresh');
+
$this->assertTrue($this->isTextPresent('6 Contacts'), 'Missing text: ' . '6 Contacts');
}
* Webtest for CRM-12588
*
*/
- function testSearchBuilderMembershipType() {
+ public function testSearchBuilderMembershipType() {
$this->webtestLogin();
// create first contact
projects / civicrm-core.git / blobdiff