initial fixes

diff --git a/.gitignore b/.gitignore
index 0fe370577c16b887fb70a2c263634d7fe782f8eb..194ac8e4e688d47cfcd335265cc2921ab689ad0b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -138,5 +138,6 @@ joomla
 packages/
 tests/phpunit/CiviTest/civicrm.settings.local.php
 l10n
-
 vendor
+civicrm.settings.php
+sql/dummy_processor.mysql
\ No newline at end of file

diff --git a/templates/CRM/Price/Form/Set.tpl b/templates/CRM/Price/Form/Set.tpl
index 01d4391232f5d4fb3feb4ad4b6ee76b3c5de9af0..dc327c1c95e771a0fe3461c089abb9129028d69a 100644 (file)
--- a/templates/CRM/Price/Form/Set.tpl
+++ b/templates/CRM/Price/Form/Set.tpl
@@ -52,7 +52,7 @@
           {/if}
           </td>
         </tr>
-       <tr id="financial_type_id" class="crm-price-set-form-block-contribution_type_id crm-price-set-form-block-financial_type_id">
+       <tr id="financial_type_id_row" class="crm-price-set-form-block-contribution_type_id crm-price-set-form-block-financial_type_id">
           <td class="label">{$form.financial_type_id.label}</td>
            <td>{$form.financial_type_id.html}</td>
            <td>&nbsp;</td>

diff --git a/tests/phpunit/WebTest/Contribute/AddPricesetTest.php b/tests/phpunit/WebTest/Contribute/AddPricesetTest.php
index 6c6eead48ca1a3e2cf4caa03f1e3b3424ca88390..109b0362d532046a91810346aa292833ed3026ce 100644 (file)
--- a/tests/phpunit/WebTest/Contribute/AddPricesetTest.php
+++ b/tests/phpunit/WebTest/Contribute/AddPricesetTest.php
@@ -86,7 +86,7 @@ class WebTest_Contribute_AddPricesetTest extends CiviSeleniumTestCase {
     }
 
     if ($financialType) {
-      $this->select("css=select.form-select", "label={$financialType}");
+      $this->select("financial_type_id", "label={$financialType}");
     }
     $this->type('help_pre', $setHelp);
 
@@ -385,7 +385,7 @@ class WebTest_Contribute_AddPricesetTest extends CiviSeleniumTestCase {
 
     //add financial type of account type expense
     $financialType = $this->_testAddFinancialType();
-    
+
     $setTitle = 'Conference Fees - ' . substr(sha1(rand()), 0, 7);
     $usedFor  = 'Contribution';
     $setHelp  = 'Select your conference options.';
@@ -516,7 +516,7 @@ class WebTest_Contribute_AddPricesetTest extends CiviSeleniumTestCase {
       8 => 'Completed',
     );
     foreach($expected as $label => $value) {
-      $this->verifyText("xpath=//form[@id='ContributionView']/div[2]/table/tbody/tr[$label]/td[2]", preg_quote($value));
+      $this->verifyText("xpath=//form[@id='ContributionView']/div[2]/table/tbody/tr[$label]/td[2]", preg_quote($value), "On line __LINE__");
     }
   }