Merge pull request #16172 from eileenmcnaughton/happy_new_year

2020 test fixes.
civicrm · Jan 1, 2020 · 392f716 · 392f716
2 parents c323e9e + 90530b8
commit 392f716
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/CRM/Core/Payment/Dummy.php b/CRM/Core/Payment/Dummy.php
@@ -96,8 +96,7 @@ public function doDirectPayment(&$params) {
     // be more complete.
     if (!empty($params['credit_card_exp_date']['Y']) && date('Y') >
       CRM_Core_Payment_Form::getCreditCardExpirationYear($params)) {
-      $error = new CRM_Core_Error(ts('transaction failed'));
-      return $error;
+      throw new PaymentProcessorException(ts('Invalid expiry date'));
     }
     //end of hook invocation
     if (!empty($this->_doDirectPaymentResult)) {

diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php
@@ -477,6 +477,7 @@ public function postProcess() {
    * This function is also accessed by a unit test.
    *
    * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    */
   protected function submit() {
     $this->storeContactFields($this->_params);

diff --git a/tests/phpunit/CRM/Event/Form/Registration/ConfirmTest.php b/tests/phpunit/CRM/Event/Form/Registration/ConfirmTest.php
@@ -124,7 +124,7 @@ public function testPaidSubmit($thousandSeparator) {
           'cvv2' => '123',
           'credit_card_exp_date' => [
             'M' => '1',
-            'Y' => '2019',
+            'Y' => date('Y') + 1,
           ],
           'credit_card_type' => 'Visa',
           'billing_first_name' => 'p',
@@ -207,7 +207,7 @@ public function testPaidSubmit($thousandSeparator) {
     ], $entityFinancialTrxns[2], ['id', 'entity_id']);
     $mut->checkMailLog([
       'Event Information and Location', 'Registration Confirmation - Annual CiviCRM meet',
-      'Expires: January 2019',
+      'Expires: January ' . (date('Y') + 1),
       'Visa',
       '************1111',
       'This is a confirmation that your registration has been received and your status has been updated to <strong> Registered</strong>',

diff --git a/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php b/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php
@@ -234,8 +234,7 @@ public function testSubmitRecur() {
       'cvv2' => '123',
       'credit_card_exp_date' => [
         'M' => '9',
-        // TODO: Future proof
-        'Y' => '2019',
+        'Y' => date('Y') + 1,
       ],
       'credit_card_type' => 'Visa',
       'billing_first_name' => 'Test',
@@ -357,6 +356,9 @@ public function testSubmitRecurCompleteInstant() {
    * @param string $thousandSeparator
    *
    * @dataProvider getThousandSeparators
+   *
+   * @throws \CiviCRM_API3_Exception
+   * @throws \CRM_Core_Exception
    */
   public function testSubmitRecurCompleteInstantWithMail($thousandSeparator) {
     $this->setCurrencySeparators($thousandSeparator);
@@ -614,8 +616,7 @@ protected function getBaseSubmitParams() {
       'cvv2' => '123',
       'credit_card_exp_date' => [
         'M' => '9',
-        // TODO: Future proof
-        'Y' => '2019',
+        'Y' => date('Y') + 1,
       ],
       'credit_card_type' => 'Visa',
       'billing_first_name' => 'Test',

diff --git a/tests/phpunit/CRM/Member/Form/MembershipTest.php b/tests/phpunit/CRM/Member/Form/MembershipTest.php
@@ -1195,8 +1195,7 @@ protected function getBaseSubmitParams() {
       'cvv2' => '123',
       'credit_card_exp_date' => [
         'M' => '9',
-        // TODO: Future proof
-        'Y' => '2019',
+        'Y' => date('Y') + 1,
       ],
       'credit_card_type' => 'Visa',
       'billing_first_name' => 'Test',