refs #41746, fixes tappay card notify testing

NETivism · Nov 20, 2024 · 46faaaf · 46faaaf
1 parent ae3ca50
commit 46faaaf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tests/phpunit/CRM/Core/Payment/TapPayTest.php b/tests/phpunit/CRM/Core/Payment/TapPayTest.php
@@ -779,7 +779,7 @@ function testUpdateExpiryDate() {
 }';
     $_SERVER['REQUEST_URI'] = '/civicrm/tappay/cardnotify';
     CRM_Core_Payment_TapPay::cardNotify(NULL, $notifyJson);
-    $contributionRecurID = CRM_Core_DAO::singleValueQuery("SELECT contribution_recur_id FROM civicrm_contribution_tappay WHERE card_token = %1 ORDER BY id DESC", array( 1 => array($this->_cardToken, 'String')));
+    $contributionRecurID = CRM_Core_DAO::singleValueQuery("SELECT contribution_recur_id FROM civicrm_contribution_tappay WHERE card_token = %1 AND contribution_id IS NOT NULL AND contribution_recur_id IS NOT NULL ORDER BY id DESC", array( 1 => array($this->_cardToken, 'String')));
     $contributionStatusId = CRM_Core_DAO::singleValueQuery("SELECT contribution_status_id FROM civicrm_contribution_recur WHERE id = %1", array( 1 => array($contributionRecurID, 'Integer')));
     $this->assertEquals('7', $contributionStatusId,  "In line " . __LINE__);
   }