Webtest Fix

diff --git a/CRM/Contact/Form/Search/Advanced.php b/CRM/Contact/Form/Search/Advanced.php
index f73ebd4a9cb27d4e3b454a1bc3ed0b1f65b70619..8b8768187a6bf8ef8c8f34fd784c35ba6bc9c1d5 100644 (file)
--- a/CRM/Contact/Form/Search/Advanced.php
+++ b/CRM/Contact/Form/Search/Advanced.php
@@ -370,6 +370,9 @@ class CRM_Contact_Form_Search_Advanced extends CRM_Contact_Form_Search {
       'contribution_status',
       'contribution_status_id',
       'contribution_source',
+      'membership_type_id',
+      'membership_status_id',
+      'participant_status_id',
       'contribution_trxn_id',
       'activity_type_id',
       'status_id',

diff --git a/CRM/Member/BAO/Query.php b/CRM/Member/BAO/Query.php
index 8c35a1fd6c12143aa2ef2e7467c4427ffd44d1b3..097f9da1021639ca330b7e82d0fd1719f5ab0a7d 100644 (file)
--- a/CRM/Member/BAO/Query.php
+++ b/CRM/Member/BAO/Query.php
@@ -88,7 +88,7 @@ class CRM_Member_BAO_Query {
         $query->_whereTables['civicrm_membership_status'] = 1;
       }
 
-      if (!empty($query->_returnProperties['status_id'])) {
+      if (!empty($query->_returnProperties['membership_status_id'])) {
         $query->_select['status_id'] = "civicrm_membership_status.id as status_id";
         $query->_element['status_id'] = 1;
         $query->_tables['civicrm_membership_status'] = 1;
@@ -203,6 +203,7 @@ class CRM_Member_BAO_Query {
 
       case 'membership_status':
       case 'member_status_id':
+      case 'membership_status_id':
       case 'membership_type':
       case 'membership_type_id':
       case 'member_id':
@@ -390,8 +391,9 @@ class CRM_Member_BAO_Query {
    * @param CRM_Core_Form $form
    */
   public static function buildSearchForm(&$form) {
-    $form->addSelect('status_id',
-      array('entity' => 'membership', 'multiple' => 'multiple', 'label' => ts('Memebership Status(s)'), 'option_url' => NULL, 'placeholder' => ts('- any -'))
+    $membershipStatus = CRM_Member_PseudoConstant::membershipStatus();
+    $form->add('select', 'membership_status_id', ts('Memebership Status(s)'), $membershipStatus, FALSE,
+      array('id' => 'membership_status_id', 'multiple' => 'multiple', 'class' => 'crm-select2')
     );
 
     $form->addSelect('membership_type_id',

diff --git a/CRM/Member/Form/Search.php b/CRM/Member/Form/Search.php
index 6d1bfa9b8d983c78706612fb4f8b48e419e18789..66c36566085e6ce376b40b8ad307bff0cb63f83f 100644 (file)
--- a/CRM/Member/Form/Search.php
+++ b/CRM/Member/Form/Search.php
@@ -210,7 +210,7 @@ class CRM_Member_Form_Search extends CRM_Core_Form_Search {
     }
 
     $specialParams = array(
-      'status_id',
+      'membership_status_id',
       'membership_type_id',
     );
     foreach ($specialParams as $element) {

diff --git a/templates/CRM/Member/Form/Search/Common.tpl b/templates/CRM/Member/Form/Search/Common.tpl
index 638472ec39bb455b89086e2943c44d6beef20975..29bf40776bdf91170f4e53c3c036d1efae67b804 100644 (file)
--- a/templates/CRM/Member/Form/Search/Common.tpl
+++ b/templates/CRM/Member/Form/Search/Common.tpl
@@ -27,8 +27,8 @@
   <td><label>{$form.membership_type_id.label}</label><br />
       {$form.membership_type_id.html|crmAddClass:twenty}
   </td>
-  <td><label>{$form.status_id.label}</label><br />
-      {$form.status_id.html|crmAddClass:twenty}
+  <td><label>{$form.membership_status_id.label}</label><br />
+      {$form.membership_status_id.html}
   </td>
 </tr>
 

diff --git a/tests/phpunit/WebTest/Contact/AdvanceSearchPaneTest.php b/tests/phpunit/WebTest/Contact/AdvanceSearchPaneTest.php
index aa06e308ebf8ec4a76314dd1d842628d49866b2c..5b4b71bcd6e34e7078ad1f5ded8bccc655bcebfc 100644 (file)
--- a/tests/phpunit/WebTest/Contact/AdvanceSearchPaneTest.php
+++ b/tests/phpunit/WebTest/Contact/AdvanceSearchPaneTest.php
@@ -327,12 +327,14 @@ class WebTest_Contact_AdvanceSearchPaneTest extends CiviSeleniumTestCase {
           'title' => 'Memberships',
           'fields' => array(
             'Membership Type' => array(
-              'type' => 'checkbox',
-              'values' => array('member_membership_type_id[1]', 'member_membership_type_id[2]'),
+              'type' => 'multiselect2',
+              'locator' => 'membership_type_id',
+              'values' => array(array('General', 'Student')),
             ),
             'Membership Status' => array(
-              'type' => 'checkbox',
-              'values' => array('member_status_id[1]', 'member_status_id[2]'),
+              'type' => 'multiselect2',
+              'locator' => 'membership_status_id',
+              'values' => array(array('New', 'Current')),
             ),
           ),
         ),

diff --git a/tests/phpunit/WebTest/Contact/SearchBuilderTest.php b/tests/phpunit/WebTest/Contact/SearchBuilderTest.php
index 6ccb1be70aaca48db7146d71bc785d85abd5a874..a7c080cdc020acf8a275d4a5da8a599febbe0261 100644 (file)
--- a/tests/phpunit/WebTest/Contact/SearchBuilderTest.php
+++ b/tests/phpunit/WebTest/Contact/SearchBuilderTest.php
@@ -528,14 +528,14 @@ class WebTest_Contact_SearchBuilderTest extends CiviSeleniumTestCase {
     $this->waitForText('search-status', "2 Results");
 
     $this->click("xpath=//div[@class='crm-accordion-header crm-master-accordion-header']");
-    $this->multiselect2("status_id", array("New", "Grace"));
+    $this->multiselect2("membership_status_id", array("New", "Grace"));
     $this->clickLink('_qf_Search_refresh');
     $this->waitForText('search-status', "2 Results");
 
     $this->openCiviPage("member/search", "reset=1", "_qf_Search_refresh");
     $this->click("xpath=//div[@class='crm-accordion-header crm-master-accordion-header']");
     $this->multiselect2("membership_type_id", array($membershipTypes['membership_type']));
-    $this->multiselect2("status_id", array("New"));
+    $this->multiselect2("membership_status_id", array("New"));
     $this->clickLink('_qf_Search_refresh');
     $this->waitForText('search-status', "1 Result");
   }

diff --git a/tests/phpunit/WebTest/Contribute/PCPAddTest.php b/tests/phpunit/WebTest/Contribute/PCPAddTest.php
index 46d1d97023103faf1a00909e7096486b77f483eb..9b4abc55eadf5b9c05fcfd15b36b30533cb2a4c0 100755 (executable)
--- a/tests/phpunit/WebTest/Contribute/PCPAddTest.php
+++ b/tests/phpunit/WebTest/Contribute/PCPAddTest.php
@@ -176,7 +176,7 @@ class WebTest_Contribute_PCPAddTest extends CiviSeleniumTestCase {
     //Find Contribution
     $this->openCiviPage("contribute/search", "reset=1", "contribution_date_low");
     $this->waitForElementPresent('contribution_pcp_made_through_id');
-    $this->select('contribution_pcp_made_through_id', "label={$pcpTitle}");
+    $this->select2('pcp_made_through_id', $lastName.', '.$firstName);
 
     $this->clickLink("_qf_Search_refresh", "xpath=//table[@class='selector row-highlight']/tbody/tr[1]/td[11]/span/a[1][text()='View']");
     $this->click("xpath=//table[@class='selector row-highlight']/tbody/tr[1]/td[11]/span/a[1][text()='View']");