Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: civicrm/civicrm-core
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 945d65928d0889260f7ed4cad9d689f99b5d7b23
Choose a base ref
..
head repository: civicrm/civicrm-core
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e0fa713325241c1c251bd03c2fb95ebf6816b181
Choose a head ref
Showing with 4 additions and 4 deletions.
  1. +2 −2 tests/phpunit/CRM/Member/Form/MembershipTest.php
  2. +2 −2 tests/phpunit/CRMTraits/Financial/PriceSetTrait.php
4 changes: 2 additions & 2 deletions tests/phpunit/CRM/Member/Form/MembershipTest.php
Original file line number Diff line number Diff line change
@@ -825,7 +825,7 @@ public function testSubmitRecurTwoRows() {
* @throws \CRM_Core_Exception
* @throws \CiviCRM_API3_Exception
*/
public function testFinancialEntiriesOnCancelledContribution(): void {
public function testFinancialEntriesOnCancelledContribution(): void {
// Create two memberships for individual $this->_individualId, via a price set in the back end.
$this->createTwoMembershipsViaPriceSetInBackEnd($this->_individualId);

@@ -855,8 +855,8 @@ public function testFinancialEntiriesOnCancelledContribution(): void {
]);
// compare the reversed amounts of respective memberships after cancelling contribution
$cancelledMembershipAmounts = [
-259.00,
-20.00,
-10.00,
];
$count = 0;
foreach ($result['values'] as $record) {
4 changes: 2 additions & 2 deletions tests/phpunit/CRMTraits/Financial/PriceSetTrait.php
Original file line number Diff line number Diff line change
@@ -113,8 +113,8 @@ protected function createMembershipPriceSet(): array {
])['id'];
}
return [
$this->ids['PriceFieldValue']['AnnualRollingOrg2'] => 1,
$this->ids['PriceFieldValue']['AnnualRolling'] => 1,
$this->ids['PriceFieldValue']['AnnualRollingOrg2'] => 1,
$this->ids['PriceFieldValue']['AnnualRolling'] => 1,
];
}