Merge pull request #22820 from demeritcowboy/recurforms

[NFC] Rename RecurForms test class
civicrm · Feb 23, 2022 · dd1bb7a · dd1bb7a
2 parents 2107ac8 + 9bb5c4b
commit dd1bb7a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/tests/phpunit/CRM/Contribute/Form/CancelSubscriptionTest.php b/tests/phpunit/CRM/Contribute/Form/CancelSubscriptionTest.php
@@ -12,7 +12,9 @@
 /**
  * Class CRM_Contribute_Form_UpdateSubscriptionTest
  */
-class CRM_Contribute_Form_CancelSubscriptionTest extends CRM_Contribute_Form_RecurForms {
+class CRM_Contribute_Form_CancelSubscriptionTest extends CiviUnitTestCase {
+
+  use CRMTraits_Contribute_RecurFormsTrait;
 
   /**
    * Test the mail sent on update.

diff --git a/tests/phpunit/CRM/Contribute/Form/UpdateSubscriptionTest.php b/tests/phpunit/CRM/Contribute/Form/UpdateSubscriptionTest.php
@@ -12,7 +12,9 @@
 /**
  * Class CRM_Contribute_Form_UpdateSubscriptionTest
  */
-class CRM_Contribute_Form_UpdateSubscriptionTest extends CRM_Contribute_Form_RecurForms {
+class CRM_Contribute_Form_UpdateSubscriptionTest extends CiviUnitTestCase {
+
+  use CRMTraits_Contribute_RecurFormsTrait;
 
   /**
    * Test the mail sent on update.

diff --git a/...hpunit/CRM/Contribute/Form/RecurForms.php → .../CRMTraits/Contribute/RecurFormsTrait.php b/...hpunit/CRM/Contribute/Form/RecurForms.php → .../CRMTraits/Contribute/RecurFormsTrait.php
@@ -10,9 +10,9 @@
  */
 
 /**
- * Class CRM_Contribute_Form_UpdateSubscriptionTest
+ * Trait CRMTraits_Contribute_RecurFormsTrait
  */
-class CRM_Contribute_Form_RecurForms extends CiviUnitTestCase {
+trait CRMTraits_Contribute_RecurFormsTrait {
 
   /**
    * @var int