From b25541554922bfd9b46bd7ec2dcc7e8e2525bb95 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 17 May 2023 16:53:15 +1200 Subject: [PATCH] Fix test to expect delete last Also has some fixes to get away from undeclared property issues on touched test & helpers --- CRM/Member/Selector/Search.php | 1 + .../CRM/Core/Payment/AuthorizeNetIPNTest.php | 2 +- tests/phpunit/CRM/Core/Payment/PayPalIPNTest.php | 2 +- .../phpunit/CRM/Core/Payment/PayPalProIPNTest.php | 7 +++---- tests/phpunit/CRM/Export/BAO/ExportTest.php | 11 +++++------ tests/phpunit/CRM/Member/Selector/SearchTest.php | 15 ++++++--------- tests/phpunit/CRMTraits/Financial/OrderTrait.php | 2 +- tests/phpunit/CiviTest/CiviUnitTestCase.php | 12 ++++++------ 8 files changed, 24 insertions(+), 28 deletions(-) diff --git a/CRM/Member/Selector/Search.php b/CRM/Member/Selector/Search.php index cfdd03aabe..100f78ea02 100644 --- a/CRM/Member/Selector/Search.php +++ b/CRM/Member/Selector/Search.php @@ -243,6 +243,7 @@ class CRM_Member_Selector_Search extends CRM_Core_Selector_Base implements CRM_C 'url' => 'civicrm/contribute/unsubscribe', 'qs' => 'reset=1&mid=%%id%%&context=%%cxt%%' . $extraParams, 'title' => ts('Cancel Auto Renew Subscription'), + 'weight' => 40, ]; } elseif (isset(self::$_links['all'][CRM_Core_Action::DISABLE])) { diff --git a/tests/phpunit/CRM/Core/Payment/AuthorizeNetIPNTest.php b/tests/phpunit/CRM/Core/Payment/AuthorizeNetIPNTest.php index 0a9bfbc779..d15269881e 100644 --- a/tests/phpunit/CRM/Core/Payment/AuthorizeNetIPNTest.php +++ b/tests/phpunit/CRM/Core/Payment/AuthorizeNetIPNTest.php @@ -34,7 +34,7 @@ class CRM_Core_Payment_AuthorizeNetIPNTest extends CiviUnitTestCase { 'receipt_from_name' => 'Pachamama', 'is_email_receipt' => TRUE, ]); - $this->_contributionPageID = $contributionPage['id']; + $this->_contributionPageID = $this->ids['ContributionPage'][0] = $contributionPage['id']; } public function tearDown(): void { diff --git a/tests/phpunit/CRM/Core/Payment/PayPalIPNTest.php b/tests/phpunit/CRM/Core/Payment/PayPalIPNTest.php index e34000819b..5ebb55ad36 100644 --- a/tests/phpunit/CRM/Core/Payment/PayPalIPNTest.php +++ b/tests/phpunit/CRM/Core/Payment/PayPalIPNTest.php @@ -119,7 +119,7 @@ class CRM_Core_Payment_PayPalIPNTest extends CiviUnitTestCase { * @throws \Civi\API\Exception\UnauthorizedException */ public function testIPNPaymentRecurSuccess(): void { - $this->setupRecurringPaymentProcessorTransaction([], ['total_amount' => '15.00', 'contribution_page_id' => $this->_contributionPageID]); + $this->setupRecurringPaymentProcessorTransaction([], ['total_amount' => '15.00', 'contribution_page_id' => $this->ids['ContributionPage'][0] ?? NULL]); $mut = new CiviMailUtils($this, TRUE); $paypalIPN = new CRM_Core_Payment_PayPalIPN($this->getPaypalRecurTransaction()); $paypalIPN->main(); diff --git a/tests/phpunit/CRM/Core/Payment/PayPalProIPNTest.php b/tests/phpunit/CRM/Core/Payment/PayPalProIPNTest.php index 4161f267f7..a486dba31e 100644 --- a/tests/phpunit/CRM/Core/Payment/PayPalProIPNTest.php +++ b/tests/phpunit/CRM/Core/Payment/PayPalProIPNTest.php @@ -21,7 +21,6 @@ class CRM_Core_Payment_PayPalProIPNTest extends CiviUnitTestCase { protected $_financialTypeID = 1; protected $_contactID; protected $_contributionRecurID; - protected $_contributionPageID; protected $_paymentProcessorID; /** @@ -37,7 +36,7 @@ class CRM_Core_Payment_PayPalProIPNTest extends CiviUnitTestCase { 'currency' => 'USD', 'payment_processor' => $this->_paymentProcessorID, ]); - $this->_contributionPageID = $contributionPage['id']; + $this->ids['ContributionPage'][0] = $contributionPage['id']; } /** @@ -267,7 +266,7 @@ class CRM_Core_Payment_PayPalProIPNTest extends CiviUnitTestCase { 'payment_status' => 'Completed', 'product_name' => '5 Per 1 month', 'charset' => 'windows-1252', - 'rp_invoice_id' => 'i=xyz&m=&c=&r=&b=&p=' . $this->_contributionPageID, + 'rp_invoice_id' => 'i=xyz&m=&c=&r=&b=&p=' . $this->ids['ContributionPage'][0], 'recurring_payment_id' => 'I-3EEUC094KYQW', 'address_zip' => '90210', 'first_name' => 'Alanna', @@ -392,7 +391,7 @@ class CRM_Core_Payment_PayPalProIPNTest extends CiviUnitTestCase { . '&m=&c=' . $this->_contributionID . '&r=' . $this->_contributionRecurID . '&b=' . $this->_contactID - . '&p=' . $this->_contributionPageID, + . '&p=' . $this->ids['ContributionPage'][0], 'currency_code' => 'GBP', 'time_created' => '12:39:01 May 09, 2018 PDT', 'verify_sign' => 'AUg223oCjn4HgJXKkrICawXQ3fyUA2gAd1.f1IPJ4r.9sln-nWcB-EJG', diff --git a/tests/phpunit/CRM/Export/BAO/ExportTest.php b/tests/phpunit/CRM/Export/BAO/ExportTest.php index a05ad2e32c..2322353c04 100644 --- a/tests/phpunit/CRM/Export/BAO/ExportTest.php +++ b/tests/phpunit/CRM/Export/BAO/ExportTest.php @@ -220,7 +220,7 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase { $row = $this->csv->fetchOne(); $expected = [ - 'Contact ID' => $this->contactIDs[0], + 'Contact ID' => $membership['contact_id'], 'Contact Type' => 'Individual', 'Contact Subtype' => '', 'Do Not Email' => '', @@ -427,7 +427,6 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase { $this->contactMembershipCreate(['contact_id' => $this->contactIDs[0]]); $this->_contactID = $this->contactIDs[0]; - $this->_contributionPageID = NULL; $this->_paymentProcessorID = $this->paymentProcessorCreate(); $this->setupMembershipRecurringPaymentProcessorTransaction(); @@ -495,7 +494,7 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase { $params['is_primary'] = 0; $params['location_type_id'] = 'Work'; $this->callAPISuccess('address', 'create', $params); - $this->contactIDs[] = $contactB = $this->individualCreate(); + $this->contactIDs[] = $contactB = $this->individualCreate([], 1); $this->callAPISuccess('address', 'create', [ 'contact_id' => $contactB, @@ -2988,12 +2987,12 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase { 'Home-email' => 'home@example.com', ], [ - 'first_name' => 'Anthony', - 'last_name' => 'Anderson', + 'first_name' => 'Joe', + 'last_name' => 'Miller', 'Home-street_address' => '', 'Home-city' => '', 'Home-country' => '', - 'Home-email' => 'anthony_anderson@civicrm.org', + 'Home-email' => 'joe_miller@civicrm.org', ], ], $result); } diff --git a/tests/phpunit/CRM/Member/Selector/SearchTest.php b/tests/phpunit/CRM/Member/Selector/SearchTest.php index 86e435af1d..750e911d79 100644 --- a/tests/phpunit/CRM/Member/Selector/SearchTest.php +++ b/tests/phpunit/CRM/Member/Selector/SearchTest.php @@ -18,23 +18,20 @@ class CRM_Member_Selector_SearchTest extends CiviUnitTestCase { /** * Test results from getRows. - * - * @throws \CRM_Core_Exception */ public function testSelectorGetRows(): void { - $this->_contactID = $this->individualCreate(); - $this->_contributionPageID = NULL; + $contactID = $this->individualCreate(); $this->_paymentProcessorID = $this->paymentProcessorCreate(); $this->setupMembershipRecurringPaymentProcessorTransaction(); - $membership = $this->callAPISuccessGetSingle('Membership', ['contact_id' => $this->_contactID]); - $membershipID = $membership['id']; + $membership = $this->callAPISuccessGetSingle('Membership', ['contact_id' => $contactID]); + $membershipID = (int) $membership['id']; $params = []; $selector = new CRM_Member_Selector_Search($params); $rows = $selector->getRows(CRM_Core_Permission::VIEW, 0, 25, NULL); $this->assertEquals([ - 'contact_id' => $this->_contactID, + 'contact_id' => $contactID, 'membership_id' => $membershipID, - 'contact_type' => '', + 'contact_type' => '', 'sort_name' => 'Anderson, Anthony', 'membership_type' => 'General', 'membership_join_date' => date('Y-m-d'), @@ -48,7 +45,7 @@ class CRM_Member_Selector_SearchTest extends CiviUnitTestCase { 'campaign' => NULL, 'campaign_id' => NULL, 'checkbox' => 'mark_x_1', - 'action' => 'ViewEditRenew...', + 'action' => 'ViewEditRenew...', 'auto_renew' => 1, ], $rows[0]); $this->assertCount(1, $rows); diff --git a/tests/phpunit/CRMTraits/Financial/OrderTrait.php b/tests/phpunit/CRMTraits/Financial/OrderTrait.php index 93eb95ffea..1745f00a63 100644 --- a/tests/phpunit/CRMTraits/Financial/OrderTrait.php +++ b/tests/phpunit/CRMTraits/Financial/OrderTrait.php @@ -48,7 +48,7 @@ trait CRMTraits_Financial_OrderTrait { 'financial_type_id' => 'Donation', 'source' => 'Online Contribution: form payment', 'contact_id' => $this->_contactID, - 'contribution_page_id' => $this->_contributionPageID, + 'contribution_page_id' => $this->ids['ContributionPage'][0] ?? NULL, 'payment_processor_id' => $this->_paymentProcessorID, 'is_test' => 0, 'receive_date' => '2019-07-25 07:34:23', diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php index 55acc4f835..8f327ee4ea 100644 --- a/tests/phpunit/CiviTest/CiviUnitTestCase.php +++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php @@ -2299,8 +2299,8 @@ class CiviUnitTestCase extends PHPUnit\Framework\TestCase { 'total_amount' => '200', 'invoice_id' => 'xyz', 'financial_type_id' => 'Donation', - 'contact_id' => $this->_contactID, - 'contribution_page_id' => $this->_contributionPageID, + 'contact_id' => $this->ids['Contact']['individual_0'], + 'contribution_page_id' => $this->ids['ContributionPage'][0] ?? NULL, 'payment_processor_id' => $this->_paymentProcessorID, 'receive_date' => '2019-07-25 07:34:23', 'skipCleanMoney' => TRUE, @@ -2309,7 +2309,7 @@ class CiviUnitTestCase extends PHPUnit\Framework\TestCase { 'source' => 'Online Contribution: Page name', ], $contributionParams); $contributionRecur = $this->callAPISuccess('contribution_recur', 'create', array_merge([ - 'contact_id' => $this->_contactID, + 'contact_id' => $this->ids['Contact']['individual_0'], 'amount' => 1000, 'sequential' => 1, 'installments' => 5, @@ -2319,7 +2319,7 @@ class CiviUnitTestCase extends PHPUnit\Framework\TestCase { 'invoice_id' => $contributionParams['invoice_id'], 'payment_processor_id' => $this->_paymentProcessorID, // processor provided ID - use contact ID as proxy. - 'processor_id' => $this->_contactID, + 'processor_id' => $this->ids['Contact']['individual_0'], 'api.Order.create' => $contributionParams, ], $recurParams))['values'][0]; $this->_contributionRecurID = $contributionRecur['id']; @@ -2349,7 +2349,7 @@ class CiviUnitTestCase extends PHPUnit\Framework\TestCase { //create a contribution so our membership & contribution don't both have id = 1 if ($this->callAPISuccess('Contribution', 'getcount', []) === 0) { $this->contributionCreate([ - 'contact_id' => $this->_contactID, + 'contact_id' => $this->ids['Contact']['individual_0'], 'is_test' => 1, 'financial_type_id' => 1, 'invoice_id' => 'abcd', @@ -2372,7 +2372,7 @@ class CiviUnitTestCase extends PHPUnit\Framework\TestCase { ], ], 'params' => [ - 'contact_id' => $this->_contactID, + 'contact_id' => $this->ids['Contact']['individual_0'], 'membership_type_id' => $this->ids['membership_type'], 'source' => 'Payment', ], -- 2.25.1