From 48b420d7c105b0057e2529380ac47ff9fc31df35 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 29 Oct 2014 17:14:19 +1300 Subject: [PATCH] whitespace - strip trailing spaces: --- templates/CRM/Contact/Form/Search/ResultTasks.tpl | 2 +- templates/CRM/Contribute/Form/Search/Common.tpl | 2 +- templates/CRM/Pledge/Form/Task.tpl | 2 +- templates/CRM/Profile/Page/Dynamic.tpl | 4 ++-- tests/phpunit/CRM/Core/PseudoConstantTest.php | 2 +- .../CRM/Report/Form/Contribute/fixtures/report.csv | 2 +- tests/phpunit/CiviTest/CiviSeleniumSettings.php.txt | 2 +- tests/phpunit/WebTest/Admin/CustomAddTestSameField.php | 4 ++-- .../WebTest/Campaign/SurveyUsageScenarioTest.php | 2 +- tests/phpunit/WebTest/Case/AddCaseTest.php | 8 ++++---- tests/phpunit/WebTest/Contact/MergeContactsTest.php | 2 +- tests/phpunit/WebTest/Contact/RelationshipAddTest.php | 6 +++--- tests/phpunit/WebTest/Event/AddParticipationTest.php | 4 ++-- tests/phpunit/WebTest/Pledge/ContactContextAddTest.php | 2 +- .../Pledge/ContactContextPledgePaymentAddTest.php | 2 +- tools/bin/scripts/memcache.php | 2 +- tools/bin/scripts/runCPSTest.sh | 10 +++++----- tools/extensions/org.civicrm.report.grant/info.xml | 2 +- tools/scripts/phpunit.xml | 2 +- 19 files changed, 31 insertions(+), 31 deletions(-) diff --git a/templates/CRM/Contact/Form/Search/ResultTasks.tpl b/templates/CRM/Contact/Form/Search/ResultTasks.tpl index b5bee8ac79..b321024729 100644 --- a/templates/CRM/Contact/Form/Search/ResultTasks.tpl +++ b/templates/CRM/Contact/Form/Search/ResultTasks.tpl @@ -58,7 +58,7 @@ {if $savedSearch.name}{$savedSearch.name} ({ts}smart group{/ts}) - {/if} {ts count=$pager->_totalItems plural='%count Contacts'}%count Contact{/ts} - + {* Search criteria are passed to tpl in the $qill array *} {if $qill} diff --git a/templates/CRM/Contribute/Form/Search/Common.tpl b/templates/CRM/Contribute/Form/Search/Common.tpl index 88523db260..7399d271c1 100644 --- a/templates/CRM/Contribute/Form/Search/Common.tpl +++ b/templates/CRM/Contribute/Form/Search/Common.tpl @@ -62,7 +62,7 @@
{$form.contribution_soft_credit_type_id.label}
{$form.contribution_soft_credit_type_id.html|crmAddClass:twenty} -
+ diff --git a/templates/CRM/Pledge/Form/Task.tpl b/templates/CRM/Pledge/Form/Task.tpl index d041f40560..7cd0e3f93a 100644 --- a/templates/CRM/Pledge/Form/Task.tpl +++ b/templates/CRM/Pledge/Form/Task.tpl @@ -25,7 +25,7 @@ *} {ts 1=$totalSelectedPledges}Number of selected pledges: %1{/ts} -{if $rows } +{if $rows }
diff --git a/templates/CRM/Profile/Page/Dynamic.tpl b/templates/CRM/Profile/Page/Dynamic.tpl index 885d360972..050b339d4f 100644 --- a/templates/CRM/Profile/Page/Dynamic.tpl +++ b/templates/CRM/Profile/Page/Dynamic.tpl @@ -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 @@ {/if} -{/if} +{/if} {* fields array is not empty *} diff --git a/tests/phpunit/CRM/Core/PseudoConstantTest.php b/tests/phpunit/CRM/Core/PseudoConstantTest.php index 8a294f6528..04194b908e 100644 --- a/tests/phpunit/CRM/Core/PseudoConstantTest.php +++ b/tests/phpunit/CRM/Core/PseudoConstantTest.php @@ -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( diff --git a/tests/phpunit/CRM/Report/Form/Contribute/fixtures/report.csv b/tests/phpunit/CRM/Report/Form/Contribute/fixtures/report.csv index e0309a1a09..504d5bcf8f 100644 --- a/tests/phpunit/CRM/Report/Form/Contribute/fixtures/report.csv +++ b/tests/phpunit/CRM/Report/Form/Contribute/fixtures/report.csv @@ -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" diff --git a/tests/phpunit/CiviTest/CiviSeleniumSettings.php.txt b/tests/phpunit/CiviTest/CiviSeleniumSettings.php.txt index b64c315888..37b868d487 100644 --- a/tests/phpunit/CiviTest/CiviSeleniumSettings.php.txt +++ b/tests/phpunit/CiviTest/CiviSeleniumSettings.php.txt @@ -25,7 +25,7 @@ class CiviSeleniumSettings { var $password = 'demo'; var $adminUsername = 'USERNAME'; - + var $adminPassword = 'PASSWORD'; var $adminApiKey = NULL; // civicrm_contact.api_key for admin diff --git a/tests/phpunit/WebTest/Admin/CustomAddTestSameField.php b/tests/phpunit/WebTest/Admin/CustomAddTestSameField.php index ff7b420877..c892cfe9fd 100644 --- a/tests/phpunit/WebTest/Admin/CustomAddTestSameField.php +++ b/tests/phpunit/WebTest/Admin/CustomAddTestSameField.php @@ -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'; diff --git a/tests/phpunit/WebTest/Campaign/SurveyUsageScenarioTest.php b/tests/phpunit/WebTest/Campaign/SurveyUsageScenarioTest.php index 1eef4875ca..dc5f8b36e4 100644 --- a/tests/phpunit/WebTest/Campaign/SurveyUsageScenarioTest.php +++ b/tests/phpunit/WebTest/Campaign/SurveyUsageScenarioTest.php @@ -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); diff --git a/tests/phpunit/WebTest/Case/AddCaseTest.php b/tests/phpunit/WebTest/Case/AddCaseTest.php index 88037739b9..5d3a681591 100644 --- a/tests/phpunit/WebTest/Case/AddCaseTest.php +++ b/tests/phpunit/WebTest/Case/AddCaseTest.php @@ -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}']"); diff --git a/tests/phpunit/WebTest/Contact/MergeContactsTest.php b/tests/phpunit/WebTest/Contact/MergeContactsTest.php index 38df43a806..3a56e44ebe 100644 --- a/tests/phpunit/WebTest/Contact/MergeContactsTest.php +++ b/tests/phpunit/WebTest/Contact/MergeContactsTest.php @@ -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); diff --git a/tests/phpunit/WebTest/Contact/RelationshipAddTest.php b/tests/phpunit/WebTest/Contact/RelationshipAddTest.php index fe7ae4a843..7232e434a7 100644 --- a/tests/phpunit/WebTest/Contact/RelationshipAddTest.php +++ b/tests/phpunit/WebTest/Contact/RelationshipAddTest.php @@ -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.'); diff --git a/tests/phpunit/WebTest/Event/AddParticipationTest.php b/tests/phpunit/WebTest/Event/AddParticipationTest.php index 836f203744..6e375e6fd5 100644 --- a/tests/phpunit/WebTest/Event/AddParticipationTest.php +++ b/tests/phpunit/WebTest/Event/AddParticipationTest.php @@ -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'); diff --git a/tests/phpunit/WebTest/Pledge/ContactContextAddTest.php b/tests/phpunit/WebTest/Pledge/ContactContextAddTest.php index ea0b623fc7..559f5e34ff 100644 --- a/tests/phpunit/WebTest/Pledge/ContactContextAddTest.php +++ b/tests/phpunit/WebTest/Pledge/ContactContextAddTest.php @@ -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']"); diff --git a/tests/phpunit/WebTest/Pledge/ContactContextPledgePaymentAddTest.php b/tests/phpunit/WebTest/Pledge/ContactContextPledgePaymentAddTest.php index f10e028b76..57a359c5ac 100644 --- a/tests/phpunit/WebTest/Pledge/ContactContextPledgePaymentAddTest.php +++ b/tests/phpunit/WebTest/Pledge/ContactContextPledgePaymentAddTest.php @@ -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); diff --git a/tools/bin/scripts/memcache.php b/tools/bin/scripts/memcache.php index 6a29cc494a..c341602256 100644 --- a/tools/bin/scripts/memcache.php +++ b/tools/bin/scripts/memcache.php @@ -1,5 +1,5 @@ For support, please contact project team on the forums. (http://forum.civicrm.org) grant/summary - CiviGrant + CiviGrant diff --git a/tools/scripts/phpunit.xml b/tools/scripts/phpunit.xml index d826fc31db..26e724b5d0 100644 --- a/tools/scripts/phpunit.xml +++ b/tools/scripts/phpunit.xml @@ -14,7 +14,7 @@ CRM CRM/Contact/Page/View/SMS.php - + -- 2.25.1