Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[NFC] Remove all the places where tests unnecessarily pass to Membership::create #17088

Merged
merged 1 commit into from
Apr 17, 2020
Merged

[NFC] Remove all the places where tests unnecessarily pass to Membership::create #17088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 20 additions & 24 deletions tests/phpunit/CRM/Member/BAO/MembershipTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ public function testCreate() {

// Now call create() to modify an existing Membership
$params = [
'id' => $membershipId,
'contact_id' => $contactId,
'membership_type_id' => $this->_membershipTypeID,
'join_date' => date('Ymd', strtotime('2006-01-21')),
Expand All @@ -140,10 +141,7 @@ public function testCreate() {
'is_override' => 1,
'status_id' => $this->_membershipStatusID,
];
$ids = [
'membership' => $membershipId,
];
CRM_Member_BAO_Membership::create($params, $ids);
CRM_Member_BAO_Membership::create($params);

$membershipTypeId = $this->assertDBNotNull('CRM_Member_BAO_Membership', $contactId,
'membership_type_id', 'contact_id',
Expand Down Expand Up @@ -176,8 +174,7 @@ public function testGetValues() {
'status_id' => $this->_membershipStatusID,
];

$ids = [];
CRM_Member_BAO_Membership::create($params, $ids);
CRM_Member_BAO_Membership::create($params);

$membershipId1 = $this->assertDBNotNull('CRM_Member_BAO_Membership', $contactId, 'id',
'contact_id', 'Database check for created membership.'
Expand All @@ -193,8 +190,8 @@ public function testGetValues() {
'is_override' => 0,
'status_id' => $this->_membershipStatusID,
];
$ids = [];
CRM_Member_BAO_Membership::create($params, $ids);

CRM_Member_BAO_Membership::create($params);

$membershipId2 = $this->assertDBNotNull('CRM_Member_BAO_Membership', 'source123', 'id',
'source', 'Database check for created membership.'
Expand Down Expand Up @@ -237,8 +234,8 @@ public function testActiveMembers() {
'is_override' => 1,
'status_id' => $this->_membershipStatusID,
];
$ids = [];
CRM_Member_BAO_Membership::create($params, $ids);

CRM_Member_BAO_Membership::create($params);

$membershipId1 = $this->assertDBNotNull('CRM_Member_BAO_Membership', $contactId, 'id',
'contact_id', 'Database check for created membership.'
Expand All @@ -259,8 +256,8 @@ public function testActiveMembers() {
'is_override' => 1,
'status_id' => $this->_membershipStatusID,
];
$ids = [];
CRM_Member_BAO_Membership::create($params, $ids);

CRM_Member_BAO_Membership::create($params);

$membershipId2 = $this->assertDBNotNull('CRM_Member_BAO_Membership', 'PaySource', 'id',
'source', 'Database check for created membership.'
Expand Down Expand Up @@ -410,8 +407,8 @@ public function testRenewMembership() {
'is_override' => 1,
'status_id' => $this->_membershipStatusID,
];
$ids = [];
$membership = CRM_Member_BAO_Membership::create($params, $ids);

$membership = CRM_Member_BAO_Membership::create($params);
$membershipId = $this->assertDBNotNull('CRM_Member_BAO_Membership', $contactId, 'id',
'contact_id', 'Database check for created membership.'
);
Expand Down Expand Up @@ -480,8 +477,7 @@ public function testStaleMembership() {
'status_id' => $statusId,
];

$ids = [];
$membership = CRM_Member_BAO_Membership::create($params, $ids);
$membership = CRM_Member_BAO_Membership::create($params);

$membershipId = $this->assertDBNotNull('CRM_Member_BAO_Membership', $contactId, 'id',
'contact_id', 'Database check for created membership.'
Expand Down Expand Up @@ -551,8 +547,8 @@ public function testUpdateAllMembershipStatusConvertExpiredOverriddenStatusToNor
'status_override_end_date' => date('Ymd', strtotime('-1 day')),
'status_id' => $this->_membershipStatusID,
];
$ids = [];
$createdMembership = CRM_Member_BAO_Membership::create($params, $ids);

$createdMembership = CRM_Member_BAO_Membership::create($params);

CRM_Member_BAO_Membership::updateAllMembershipStatus();

Expand All @@ -579,8 +575,8 @@ public function testUpdateAllMembershipStatusHandleOverriddenWithEndOverrideDate
'status_override_end_date' => date('Ymd', time()),
'status_id' => $this->_membershipStatusID,
];
$ids = [];
$createdMembership = CRM_Member_BAO_Membership::create($params, $ids);

$createdMembership = CRM_Member_BAO_Membership::create($params);

CRM_Member_BAO_Membership::updateAllMembershipStatus();

Expand All @@ -606,8 +602,8 @@ public function testUpdateAllMembershipStatusDoesNotConvertOverridenMembershipWi
'is_override' => 1,
'status_id' => $this->_membershipStatusID,
];
$ids = [];
$createdMembership = CRM_Member_BAO_Membership::create($params, $ids);

$createdMembership = CRM_Member_BAO_Membership::create($params);

CRM_Member_BAO_Membership::updateAllMembershipStatus();

Expand Down Expand Up @@ -821,8 +817,8 @@ protected function setupMembership(): array {
'is_override' => 1,
'status_id' => $this->_membershipStatusID,
];
$ids = [];
CRM_Member_BAO_Membership::create($params, $ids);

CRM_Member_BAO_Membership::create($params);

$membershipId = $this->assertDBNotNull('CRM_Member_BAO_Membership', $contactId, 'id',
'contact_id', 'Database check for created membership.'
Expand Down
4 changes: 2 additions & 2 deletions tests/phpunit/CRM/Member/BAO/MembershipTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,8 @@ public function testGetRenewalDatesForMembershipType() {
'is_override' => 1,
'status_id' => $this->_membershipStatusID,
];
$ids = [];
$membership = CRM_Member_BAO_Membership::create($params, $ids);

$membership = CRM_Member_BAO_Membership::create($params);

$membershipRenewDates = CRM_Member_BAO_MembershipType::getRenewalDatesForMembershipType($membership->id);

Expand Down
6 changes: 3 additions & 3 deletions tests/phpunit/api/v3/MembershipTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,6 +1169,8 @@ public function testEmptyStartEndDateFixedMultiYear() {

/**
* CRM-18503 - Test membership join date is correctly set for fixed memberships.
*
* @throws \CRM_Core_Exception
*/
public function testMembershipJoinDateFixed() {
$memStatus = CRM_Member_PseudoConstant::membershipStatus();
Expand All @@ -1185,9 +1187,7 @@ public function testMembershipJoinDateFixed() {
'skipStatusCal' => 1,
'is_for_organization' => 1,
];
// @todo stop passing empty $ids
$ids = [];
$membership = CRM_Member_BAO_Membership::create($params, $ids);
$membership = CRM_Member_BAO_Membership::create($params);

// Update membership to 'Completed' and check the dates.
$memParams = [
Expand Down