whitespace - strip trailing spaces:
authorEileen McNaughton <eileen@fuzion.co.nz>
Wed, 29 Oct 2014 04:14:19 +0000 (17:14 +1300)
committerEileen McNaughton <eileen@fuzion.co.nz>
Wed, 29 Oct 2014 04:14:19 +0000 (17:14 +1300)
19 files changed:
templates/CRM/Contact/Form/Search/ResultTasks.tpl
templates/CRM/Contribute/Form/Search/Common.tpl
templates/CRM/Pledge/Form/Task.tpl
templates/CRM/Profile/Page/Dynamic.tpl
tests/phpunit/CRM/Core/PseudoConstantTest.php
tests/phpunit/CRM/Report/Form/Contribute/fixtures/report.csv
tests/phpunit/CiviTest/CiviSeleniumSettings.php.txt
tests/phpunit/WebTest/Admin/CustomAddTestSameField.php
tests/phpunit/WebTest/Campaign/SurveyUsageScenarioTest.php
tests/phpunit/WebTest/Case/AddCaseTest.php
tests/phpunit/WebTest/Contact/MergeContactsTest.php
tests/phpunit/WebTest/Contact/RelationshipAddTest.php
tests/phpunit/WebTest/Event/AddParticipationTest.php
tests/phpunit/WebTest/Pledge/ContactContextAddTest.php
tests/phpunit/WebTest/Pledge/ContactContextPledgePaymentAddTest.php
tools/bin/scripts/memcache.php
tools/bin/scripts/runCPSTest.sh
tools/extensions/org.civicrm.report.grant/info.xml
tools/scripts/phpunit.xml

index b5bee8ac79a99627aad566d8d5af262898f1fa86..b3210247294afe814da707507072c4e8c4108e70 100644 (file)
@@ -58,7 +58,7 @@
         {if $savedSearch.name}{$savedSearch.name} ({ts}smart group{/ts}) - {/if}
         {ts count=$pager->_totalItems plural='%count Contacts'}%count Contact{/ts}
     </td>
-    
+
     {* Search criteria are passed to tpl in the $qill array *}
     <td class="nowrap">
     {if $qill}
index 88523db260fb8965381ea9cf7d6c183da1c623fe..7399d271c1564c995a3bf2f9ddbd34873dea5c37 100644 (file)
@@ -62,7 +62,7 @@
     <div class="float-left" id="contribution_soft_credit_type_wrapper">
       {$form.contribution_soft_credit_type_id.label} <br />
       {$form.contribution_soft_credit_type_id.html|crmAddClass:twenty}
-    </div>  
+    </div>
   </td>
 </tr>
 <tr>
index d041f40560e8ce541cc3b678a1b77adc9c649db9..7cd0e3f93a331f11069c112f9f653a8e8de20892 100644 (file)
@@ -25,7 +25,7 @@
 *}
 {ts 1=$totalSelectedPledges}Number of selected pledges: %1{/ts}
 
-{if $rows } 
+{if $rows }
 <div class="crm-block crm-form-block crm-pledge-task-form-block">
 <table width="30%">
   <tr class="columnheader">
index 885d360972e45cfa9abfcb937dd8a15f30606937..050b339d4f9c79fdf5cdea58a9b3ef83448ac786 100644 (file)
@@ -23,7 +23,7 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
-{if ! empty( $row )} 
+{if ! empty( $row )}
 {* wrap in crm-container div so crm styles are used *}
     {if $overlayProfile }
         {include file="CRM/Profile/Page/Overlay.tpl"}
@@ -46,5 +46,5 @@
             </div>
         </div>
     {/if}
-{/if} 
+{/if}
 {* fields array is not empty *}
index 8a294f6528cc98f0cff4255524c05bde3a171419..04194b908e6be01694003c5f1539a23f0a3d8f0a 100644 (file)
@@ -127,7 +127,7 @@ class CRM_Core_PseudoConstantTest extends CiviUnitTestCase {
       'duration_interval' => 1,
     );
     $result = civicrm_api3('membership_type', 'create', $api_params);
-    
+
     // Create a contribution page for testing.
     $contribution_page = md5(microtime());
     $api_params = array(
index e0309a1a09ea1319404187c85bdea428035ada98..504d5bcf8f49270aed5be52aef8fa2c5d66092d1 100644 (file)
@@ -6,4 +6,4 @@
 "Grant, Megan","Megan","grantm@fishmail.net","$ 500.00"
 "merriechowski95@notmail.info", ,"merrie@testmail.co.nz","$ 125.00"
 "Müller, Billy","Billy","mller.billy30@example.org","$ 50.00"
-"Smith, Errol","Errol","errols@sample.com","$ 500.00" 
+"Smith, Errol","Errol","errols@sample.com","$ 500.00"
index b64c315888aac8bccf1d8b041ec5f2a0ab38c7ce..37b868d4875c0f9cb22c6328aba6eca20fcd111c 100644 (file)
@@ -25,7 +25,7 @@ class CiviSeleniumSettings {
   var $password = 'demo';
 
   var $adminUsername = 'USERNAME';
-  
+
   var $adminPassword = 'PASSWORD';
 
   var $adminApiKey = NULL; // civicrm_contact.api_key for admin
index ff7b420877bef26cd96761f21775c86b2a2b148c..c892cfe9fdfd7669ad4a912ddf3621c125bf1055 100644 (file)
@@ -62,9 +62,9 @@ class WebTest_Admin_CustomAddTestSameField extends CiviSeleniumTestCase {
 
     //Is custom group created?
     $this->waitForText('crm-notification-container', "Your custom field set '$customGroupTitle' has been added. You can add custom fields now.");
-    
+
     $gid = $this->urlArg('gid');
-    
+
     //add custom field - alphanumeric text
     $this->openCiviPage('admin/custom/group/field/add', "reset=1&action=add&gid=$gid");
     $textFieldLabel = 'test_text_field';
index 1eef4875ca03a8e59edcb9d8957ef845dd2828a4..dc5f8b36e4e0d10cfb8bf9ab9634b8734851ba7a 100644 (file)
@@ -545,7 +545,7 @@ class WebTest_Campaign_SurveyUsageScenarioTest extends CiviSeleniumTestCase {
     $this->select('task', "Record Survey Responses");
     $this->waitForElementPresent('_qf_Interview_cancel_interview');
 
-    $this->waitForElementPresent("xpath=//div[@class='dataTables_wrapper no-footer']/table/tbody/tr[@id='row_{$id1}']/td[6]/input[@type='text']");    
+    $this->waitForElementPresent("xpath=//div[@class='dataTables_wrapper no-footer']/table/tbody/tr[@id='row_{$id1}']/td[6]/input[@type='text']");
 
     $this->type("field_{$id1}_phone-Primary-1", 9876543210);
 
index 88037739b9a128e44e8cb6e6827d91e5d7e453b1..5d3a681591b5e27ab12fd280a4233f89804a9f2a 100644 (file)
@@ -269,16 +269,16 @@ class WebTest_Case_AddCaseTest extends CiviSeleniumTestCase {
     $this->clickLink("_qf_Advanced_refresh");
     $this->assertElementContainsText('Advanced', "$lastName, $firstName");
   }
-  
+
   /**
    * @param $firstName
    * @param $lastName
    * @param $caseTypeLabel
-   * 
-   * test for assign case to another client 
+   *
+   * test for assign case to another client
    */
    function _testAssignToClient($firstName, $lastName, $caseTypeLabel) {
-    $this->openCiviPage('case/search', 'reset=1', '_qf_Search_refresh-bottom'); 
+    $this->openCiviPage('case/search', 'reset=1', '_qf_Search_refresh-bottom');
     $this->type('sort_name', $firstName);
     $this->clickLink('_qf_Search_refresh-bottom');
     $this->waitForElementPresent("xpath=//table[@class='caseSelector']/tbody//tr/td[3]/a[text()='{$lastName}, {$firstName}']");
index 38df43a806a8a25debcc29b4f4c56ff8078b8fd9..3a56e44ebe5ef008dd7d31c857b1849e56000464 100644 (file)
@@ -206,7 +206,7 @@ class WebTest_Contact_MergeContactsTest extends CiviSeleniumTestCase {
     //fill in first name
     $firstName = "Anderson".substr(sha1(rand()), 0, 4);
     $this->type('first_name', $firstName);
-    
+
     //fill in last name
     $lastName = substr(sha1(rand()), 0, 4);
     $this->type('last_name', $lastName);
index fe7ae4a84361fa7894d4ac74fdac984606ac55e5..7232e434a7f7d036dd85fe56e54782737d36daaa 100644 (file)
@@ -335,14 +335,14 @@ class WebTest_Contact_RelationshipAddTest extends CiviSeleniumTestCase {
     //save the relationship
     //$this->click("_qf_Relationship_upload");
     $this->click("_qf_Relationship_upload-bottom");
-    
+
 
     //check the status message
     $this->waitForText('crm-notification-container', 'Relationship created.');
 
     $this->waitForElementPresent("xpath=//table[@id='DataTables_Table_2']/tbody/tr/td[9]/span/a[1][text()='View']");
     $this->click("xpath=//table[@id='DataTables_Table_2']/tbody/tr[1]/td[9]/span/a[1][text()='View']");
+
     $this->webtestVerifyTabularData(
       array(
         'Description' => $description,
@@ -415,7 +415,7 @@ class WebTest_Contact_RelationshipAddTest extends CiviSeleniumTestCase {
     //save the relationship
     //$this->click("_qf_Relationship_upload");
     $this->click('_qf_Relationship_upload-bottom');
-    
+
     //check the status message
     $this->waitForText('crm-notification-container', 'Relationship created.');
 
index 836f203744a4f8d7ae47a8887406d553e9a4c417..6e375e6fd55b48937c6186cbc328aa34f91b0380 100644 (file)
@@ -83,10 +83,10 @@ class WebTest_Event_AddParticipationTest extends CiviSeleniumTestCase {
 
     // go for the chicken combo (obviously)
     //      $this->click('CIVICRM_QFID_chicken_Chicken');
-    
+
     $this->waitForElementPresent('send_receipt');
     $this->assertTrue($this->isChecked("send_receipt"), 'Send Confirmation and Receipt checkbox should be checked by default but is not checked.');
-    
+
     // Clicking save.
     $this->clickLink('_qf_Participant_upload-bottom');
 
index ea0b623fc793b107f4f0f7551f317c56c58e089f..559f5e34ff48655ac7a89671327e4e27b294368e 100644 (file)
@@ -110,7 +110,7 @@ class WebTest_Pledge_ContactContextAddTest extends CiviSeleniumTestCase {
     }
 
     $this->clickLink("_qf_PledgeView_next-bottom", "xpath=//div[@class='view-content']//table//tbody/tr[1]/td[10]/span[1]/a[text()='View']", FALSE);
-    
+
     $this->waitForElementPresent("xpath=//div[@class='view-content']//table[@class='selector row-highlight']//tbody/tr[1]/td[1]/span/a");
     $this->click("xpath=//div[@class='view-content']//table[@class='selector row-highlight']//tbody/tr[1]/td[1]/span/a");
     $this->waitForElementPresent("xpath=//div[@class='view-content']//table//tbody//tr//td[2]/table/tbody/tr[2]/td[8]/a[text()='Record Payment']");
index f10e028b76634ec6ced2cb95b50fc917a8ce960b..57a359c5ac704e995fb9b68d327c522146bd94ce 100644 (file)
@@ -42,7 +42,7 @@ class WebTest_Pledge_ContactContextPledgePaymentAddTest extends CiviSeleniumTest
     $this->click("add");
     $this->click("_qf_Localization_next-bottom");
     $this->waitForPageToLoad($this->getTimeoutMsec());
-    
+
     // Disable pop-ups for this test. Running test w/ pop-ups causes a spurious failure. dgg
     $this->enableDisablePopups(FALSE);
 
index 6a29cc494a9e5da3b6fe0d6d8ceabffaebc5b1ff..c341602256666a4e033c91fc674a29457784118a 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-require_once '../civicrm.config.php'; 
+require_once '../civicrm.config.php';
 require_once 'CRM/Core/Config.php';
 require_once 'CRM/Utils/Cache.php';
 
index 988c2ef8e265d9bfb0ce32604f41661f673700bf..40d01136431a3f8dd606379a5517036d07cacdac 100755 (executable)
@@ -20,10 +20,10 @@ logCPS=CPSTestResult
 create_log()
 {
     cd $ORIGPWD/../test/
-    
-    PATH4LOG=`pwd` 
-    
-    if [ ! -d "Result" ] ; then 
+
+    PATH4LOG=`pwd`
+
+    if [ ! -d "Result" ] ; then
        mkdir Result
     fi
 }
@@ -41,7 +41,7 @@ run_cpsTest()
 {
     cd $ORIGPWD/../test/selenium-ruby/CPS
     # Running Selenium (ruby) Tests
-    ruby test_cps_personal.rb 
+    ruby test_cps_personal.rb
 }
 ###########################################################
 ##
index 600600308aaabaa6823c38cd4729f03cb1b3aae2..0484ec195738a22696ad2707d312228d468a99dc 100644 (file)
@@ -22,6 +22,6 @@
   <comments>For support, please contact project team on the forums. (http://forum.civicrm.org)</comments>
   <typeInfo>
     <reportUrl>grant/summary</reportUrl>
-    <component>CiviGrant</component>      
+    <component>CiviGrant</component>
   </typeInfo>
 </extension>
index d826fc31db16ec4c3276c4b18d576bc1c5ae3111..26e724b5d0ed47363c6d0ec868ed0566f50507f0 100644 (file)
@@ -14,7 +14,7 @@
       <directory>CRM</directory>
       <exclude>
         <file>CRM/Contact/Page/View/SMS.php</file>
-      </exclude>  
+      </exclude>
     </whitelist>
   </filter>
   <logging>