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

@@ -243,6 +243,7 @@ public static function &links(
         '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])) {

tests/phpunit/CRM/Core/Payment/AuthorizeNetIPNTest.php

@@ -34,7 +34,7 @@ public function setUp(): void {
       'receipt_from_name' => 'Pachamama',
       'is_email_receipt' => TRUE,
     ]);
-    $this->_contributionPageID = $contributionPage['id'];
+    $this->ids['ContributionPage'][0] = $contributionPage['id'];
   }
 
   public function tearDown(): void {
@@ -98,7 +98,7 @@ public function testIPNPaymentRecurNoReceipt(): void {
       'payment_processor_id' => $this->_paymentProcessorID,
       'currency' => 'USD',
       'source' => 'bob sled race',
-      'contribution_page_id' => $this->_contributionPageID,
+      'contribution_page_id' => $this->ids['ContributionPage'][0],
       'is_recur' => TRUE,
     ]);
     $form->buildForm();

tests/phpunit/CRM/Core/Payment/PayPalIPNTest.php

@@ -119,7 +119,7 @@ public function testInvoiceSentOnIPNPaymentSuccess(): void {
    * @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();

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;
 
   /**
@@ -267,7 +266,7 @@ public function getSubsequentPaypalExpressTransaction() {
       '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 @@ public function getPaypalExpressRecurSubscriptionConfirmation() {
       . '&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',

tests/phpunit/CRM/Export/BAO/ExportTest.php

@@ -427,7 +427,6 @@ public function setUpMembershipExportData(): void {
     $this->contactMembershipCreate(['contact_id' => $this->contactIDs[0]]);
 
     $this->_contactID = $this->contactIDs[0];
-    $this->_contributionPageID = NULL;
     $this->_paymentProcessorID = $this->paymentProcessorCreate();
     $this->setupMembershipRecurringPaymentProcessorTransaction();
 

tests/phpunit/CRM/Member/Selector/SearchTest.php

@@ -22,19 +22,18 @@ class CRM_Member_Selector_SearchTest extends CiviUnitTestCase {
    * @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' => '<a href="/index.php?q=civicrm/contact/view&amp;reset=1&amp;cid=' . $this->_contactID . '" data-tooltip-url="/index.php?q=civicrm/profile/view&amp;reset=1&amp;gid=7&amp;id=' . $this->_contactID . '&amp;snippet=4&amp;is_show_email_task=1" class="crm-summary-link"><i class="crm-i fa-fw fa-user" title=""></i></a>',
+      'contact_type' => '<a href="/index.php?q=civicrm/contact/view&amp;reset=1&amp;cid=' . $this->ids['Contact']['individual_0']. '" data-tooltip-url="/index.php?q=civicrm/profile/view&amp;reset=1&amp;gid=7&amp;id=' . $this->ids['Contact']['individual_0'] . '&amp;snippet=4&amp;is_show_email_task=1" class="crm-summary-link"><i class="crm-i fa-fw fa-user" title=""></i></a>',
       'sort_name' => 'Anderson, Anthony',
       'membership_type' => 'General',
       'membership_join_date' => date('Y-m-d'),
@@ -48,7 +47,7 @@ public function testSelectorGetRows(): void {
       'campaign' => NULL,
       'campaign_id' => NULL,
       'checkbox' => 'mark_x_1',
-      'action' => '<span><a href="/index.php?q=civicrm/contact/view/membership&amp;reset=1&amp;id=1&amp;cid=' . $this->_contactID . '&amp;action=view&amp;context=search&amp;selectedChild=member&amp;compContext=membership" class="action-item crm-hover-button" title=\'View Membership\' >View</a><a href="/index.php?q=civicrm/contact/view/membership&amp;reset=1&amp;action=update&amp;id=' . $membershipID . '&amp;cid=' . $this->_contactID . '&amp;context=search&amp;compContext=membership" class="action-item crm-hover-button" title=\'Edit Membership\' >Edit</a></span><span class=\'btn-slide crm-hover-button\'>Renew...<ul class=\'panel\'><li><a href="/index.php?q=civicrm/contact/view/membership&amp;reset=1&amp;action=delete&amp;id=' . $membershipID . '&amp;cid=' . $this->_contactID . '&amp;context=search&amp;compContext=membership" class="action-item crm-hover-button small-popup" title=\'Delete Membership\' >Delete</a></li><li><a href="/index.php?q=civicrm/contact/view/membership&amp;reset=1&amp;action=renew&amp;id=' . $membershipID . '&amp;cid=' . $this->_contactID . '&amp;context=search&amp;compContext=membership" class="action-item crm-hover-button" title=\'Renew Membership\' >Renew</a></li><li><a href="/index.php?q=civicrm/contribute/unsubscribe&amp;reset=1&amp;mid=' . $membershipID . '&amp;context=search&amp;compContext=membership" class="action-item crm-hover-button" title=\'Cancel Auto Renew Subscription\' >Cancel Auto-renewal</a></li></ul></span>',
+      'action' => '<span><a href="/index.php?q=civicrm/contact/view/membership&amp;reset=1&amp;id=1&amp;cid=' . $this->ids['Contact']['individual_0'] . '&amp;action=view&amp;context=search&amp;selectedChild=member&amp;compContext=membership" class="action-item crm-hover-button" title=\'View Membership\' >View</a><a href="/index.php?q=civicrm/contact/view/membership&amp;reset=1&amp;action=update&amp;id=' . $membershipID . '&amp;cid=' . $this->ids['Contact']['individual_0'] . '&amp;context=search&amp;compContext=membership" class="action-item crm-hover-button" title=\'Edit Membership\' >Edit</a></span><span class=\'btn-slide crm-hover-button\'>Renew...<ul class=\'panel\'><li><a href="/index.php?q=civicrm/contact/view/membership&amp;reset=1&amp;action=renew&amp;id=' . $membershipID . '&amp;cid=' . $this->ids['Contact']['individual_0'] . '&amp;context=search&amp;compContext=membership" class="action-item crm-hover-button" title=\'Renew Membership\' >Renew</a></li><li><a href="/index.php?q=civicrm/contribute/unsubscribe&amp;reset=1&amp;mid=' . $membershipID . '&amp;context=search&amp;compContext=membership" class="action-item crm-hover-button" title=\'Cancel Auto Renew Subscription\' >Cancel Auto-renewal</a></li><li><a href="/index.php?q=civicrm/contact/view/membership&amp;reset=1&amp;action=delete&amp;id=' . $membershipID . '&amp;cid=' . $this->ids['Contact']['individual_0'] . '&amp;context=search&amp;compContext=membership" class="action-item crm-hover-button small-popup" title=\'Delete Membership\' >Delete</a></li></ul></span>',
       'auto_renew' => 1,
     ], $rows[0]);
     $this->assertCount(1, $rows);

tests/phpunit/CRMTraits/Financial/OrderTrait.php

@@ -48,7 +48,7 @@ public function createRepeatMembershipOrder(): void {
       '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',

tests/phpunit/CiviTest/CiviUnitTestCase.php

@@ -2299,8 +2299,8 @@ public function setupRecurringPaymentProcessorTransaction(array $recurParams = [
       '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 @@ public function setupRecurringPaymentProcessorTransaction(array $recurParams = [
       '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 @@ public function setupRecurringPaymentProcessorTransaction(array $recurParams = [
       '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 @@ public function setupMembershipRecurringPaymentProcessorTransaction(array $param
     //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 @@ public function setupMembershipRecurringPaymentProcessorTransaction(array $param
             ],
           ],
           'params' => [
-            'contact_id' => $this->_contactID,
+            'contact_id' => $this->ids['Contact']['individual_0'],
             'membership_type_id' => $this->ids['membership_type'],
             'source' => 'Payment',
           ],