X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=tests%2Fphpunit%2FWebTest%2FContact%2FAdvancedSearchTest.php;h=3a470752fe1f3becc0385cad90222324589521b8;hb=c6e262c51134924a9cc023dcb0613238fd1d0451;hp=e77819b3fd0e1361a8e06e01ed9898d501146f33;hpb=ef10e0b52408ba266239a859756d757a10348228;p=civicrm-core.git diff --git a/tests/phpunit/WebTest/Contact/AdvancedSearchTest.php b/tests/phpunit/WebTest/Contact/AdvancedSearchTest.php index e77819b3fd..3a470752fe 100644 --- a/tests/phpunit/WebTest/Contact/AdvancedSearchTest.php +++ b/tests/phpunit/WebTest/Contact/AdvancedSearchTest.php @@ -107,6 +107,7 @@ class WebTest_Contact_AdvancedSearchTest extends CiviSeleniumTestCase { $this->select2("relationship_type_id", "Employee of"); $this->waitForElementPresent("xpath=//input[@id='related_contact_id'][@placeholder='- select organization -']"); $this->select2("related_contact_id", "Default", TRUE); + $this->waitForAjaxContent(); $this->webtestFillDate("start_date", "-1 day"); $this->webtestFillDate("end_date", "+1 day"); $this->clickAjaxLink('_qf_Relationship_upload-bottom', NULL); @@ -130,7 +131,10 @@ class WebTest_Contact_AdvancedSearchTest extends CiviSeleniumTestCase { 'CiviEvent' => array('participant_fee_amount_high', 'addParticipantSearchDetail'), 'CiviMember' => array('member_end_date_high', 'addMemberSearchDetail'), 'CiviPledge' => array('pledge_frequency_interval', 'addPledgeSearchDetail'), - 'relationship' => array("xpath=//div[@id='relationship']/table/tbody/tr//td/label[text()='Relationship Status']/../label[text()='All']", ''), + 'relationship' => array( + "xpath=//div[@id='relationship']/table/tbody/tr//td/label[text()='Relationship Status']/../label[text()='All']", + '' + ), ); foreach ($searchBlockValues as $block => $blockValues) { @@ -186,7 +190,7 @@ class WebTest_Contact_AdvancedSearchTest extends CiviSeleniumTestCase { $cal = $count / $perPageRow; $mod = $count % $perPageRow; $j = 1; - for ($i=1; $i<=$cal; $i++) { + for ($i = 1; $i <= $cal; $i++) { $subTotal = $i * $perPageRow; $lastPageSub = $subTotal + 1; @@ -217,6 +221,7 @@ class WebTest_Contact_AdvancedSearchTest extends CiviSeleniumTestCase { public function submitSearch($firstName) { $this->clickLink("_qf_Advanced_refresh"); // verify unique name + $this->waitForAjaxContent(); $this->waitForText("xpath=//div[@class='crm-search-results']/table/tbody", preg_quote("adv$firstName, $firstName")); // should give 1 result only as we are searching with unique name $this->waitForText("xpath=//div[@id='search-status']/table/tbody/tr/td", preg_quote("1 Contact")); @@ -234,14 +239,21 @@ class WebTest_Contact_AdvancedSearchTest extends CiviSeleniumTestCase { $this->select2("group", "Summer", TRUE); $this->select2("group", "Advisory", TRUE); $this->clickAjaxLink("location", 'country'); - $this->select2("country", "United States", False); + $this->select2("country", "United States", FALSE); $this->waitForElementPresent('state_province'); - $this->multiselect2("state_province", array("Ohio", "New York", "New Mexico", "Connecticut", "Georgia", "New Jersey", "Texas")); + $this->multiselect2("state_province", array( + "Ohio", + "New York", + "New Mexico", + "Connecticut", + "Georgia", + "New Jersey", + "Texas" + )); $this->clickLink("_qf_Advanced_refresh", "xpath=//div[@class='crm-search-results']//table/tbody/tr[1]/td[6]"); $stateBeforeSort = $this->getText("xpath=//div[@class='crm-search-results']//table/tbody/tr[1]/td[6]"); $this->clickAjaxLink("xpath=//div[@class='crm-search-results']//table/thead/tr//th/a[contains(text(),'State')]"); - $this->clickAjaxLink("xpath=//div[@class='crm-search-results']//table/thead/tr//th/a[contains(text(),'State')]"); $this->waitForElementPresent("xpath=//div[@class='crm-search-results']//table/thead/tr//th/a[contains(text(),'State')]"); $this->assertElementNotContainsText("xpath=//div[@class='crm-search-results']//table/tbody/tr[1]/td[6]", $stateBeforeSort); } @@ -305,7 +317,7 @@ class WebTest_Contact_AdvancedSearchTest extends CiviSeleniumTestCase { $this->click("xpath=//div[@id='activity']/table/tbody/tr[2]/td[1]/div[1]//div/label[text()=\"$labels\"]"); } // fill date range - $this->select("activity_date_relative","value=0"); + $this->select("activity_date_relative", "value=0"); $this->webtestFillDate("activity_date_low", "-1 day"); $this->webtestFillDate("activity_date_high", "+1 day"); $this->type("activity_subject", "Student - membership source$firstName - Status: New"); @@ -318,12 +330,12 @@ class WebTest_Contact_AdvancedSearchTest extends CiviSeleniumTestCase { // function to fill demographic search details public function addDemographicSearchDetail() { // fill birth date range - $this->select("birth_date_relative","value=0"); + $this->select("birth_date_relative", "value=0"); $this->webtestFillDate("birth_date_low", "-3 year"); $this->webtestFillDate("birth_date_high", "now"); // fill deceased date range $this->click("xpath=//div[@id='demographics']/table/tbody//tr/td/label[text()='Deceased']/../label[text()='Yes']"); - $this->select("deceased_date_relative","value=0"); + $this->select("deceased_date_relative", "value=0"); $this->webtestFillDate("deceased_date_low", "-1 month"); $this->webtestFillDate("deceased_date_high", "+1 month"); // fill gender (male) @@ -336,7 +348,7 @@ class WebTest_Contact_AdvancedSearchTest extends CiviSeleniumTestCase { */ public function addContributionSearchDetail($firstName) { // fill contribution date range - $this->select("contribution_date_relative","value=0"); + $this->select("contribution_date_relative", "value=0"); $this->webtestFillDate("contribution_date_low", "-1 day"); $this->webtestFillDate("contribution_date_high", "+1 day"); // fill amount range @@ -349,8 +361,8 @@ class WebTest_Contact_AdvancedSearchTest extends CiviSeleniumTestCase { $this->type("contribution_check_number", "chqNo$firstName"); // fill transaction id $this->type("contribution_transaction_id", "trid$firstName"); - // fill financial type - $this->select("financial_type_id", "Event Fee"); + // fill financial type + $this->select("financial_type_id", "Event Fee"); // fill currency type $this->select("contribution_currency_type", "USD"); } @@ -386,15 +398,15 @@ class WebTest_Contact_AdvancedSearchTest extends CiviSeleniumTestCase { // check to search primary member $this->click("xpath=//div[@id='memberForm']/table/tbody/tr[2]/td[2]/p/input"); // add join date range - $this->select("member_join_date_relative","value=0"); + $this->select("member_join_date_relative", "value=0"); $this->webtestFillDate("member_join_date_low", "-1 day"); $this->webtestFillDate("member_join_date_high", "+1 day"); // add start date range - $this->select("member_start_date_relative","value=0"); + $this->select("member_start_date_relative", "value=0"); $this->webtestFillDate("member_start_date_low", "-1 day"); $this->webtestFillDate("member_start_date_high", "+1 day"); // add end date range - $this->select("member_end_date_relative","value=0"); + $this->select("member_end_date_relative", "value=0"); $this->webtestFillDate("member_end_date_low", "-1 year"); $this->webtestFillDate("member_end_date_high", "+2 year"); } @@ -405,7 +417,7 @@ class WebTest_Contact_AdvancedSearchTest extends CiviSeleniumTestCase { */ public function addPledgeSearchDetail($firstName) { // fill pledge schedule date range - $this->select("pledge_payment_date_relative","value=0"); + $this->select("pledge_payment_date_relative", "value=0"); $this->webtestFillDate("pledge_payment_date_low", "-1 day"); $this->webtestFillDate("pledge_payment_date_high", "+1 day"); // fill Pledge payment status