', $section[ 'class' ]);
@@ -289,10 +291,13 @@ public function getReceiptDetails($donationId)
return $receipt;
}
+ /**
+ * @since 3.14.0 Use sumIntendedAmount() and getDonationCount() methods to retrieve the proper values for the raised amount and donations count
+ */
public function getFormGoalStats(Give_Donate_Form $form)
{
$goalStats = give_goal_progress_stats($form->get_ID());
- $raisedRaw = $form->get_earnings();
+ $raisedRaw = (new DonationQuery())->form($form->ID)->sumIntendedAmount();
// Setup default raised value
$raised = give_currency_filter(
@@ -306,7 +311,7 @@ public function getFormGoalStats(Give_Donate_Form $form)
);
// Setup default count value
- $count = $form->get_sales();
+ $count = (new ProgressBarModal(['ids' => [$form->get_ID()]]))->getDonationCount();
// Setup default count label
$countLabel = _n('donation', 'donations', $count, 'give');
diff --git a/src/Views/Form/Templates/Sequoia/sections/income-stats.php b/src/Views/Form/Templates/Sequoia/sections/income-stats.php
index f4f09841f5..78396ac557 100644
--- a/src/Views/Form/Templates/Sequoia/sections/income-stats.php
+++ b/src/Views/Form/Templates/Sequoia/sections/income-stats.php
@@ -3,6 +3,13 @@
/**
* @var int $formId
*/
+
+use Give\DonationForms\DonationQuery;
+use Give\MultiFormGoals\ProgressBar\Model as ProgressBarModal;
+
+/**
+ * @since 3.14.0 Use sumIntendedAmount() and getDonationCount() methods to retrieve the proper values for the raised amount and donations count
+ */
if ($form->has_goal()) : ?>
get_earnings(),
+ (new DonationQuery())->form($formId)->sumIntendedAmount(),
[
'sanitize' => false,
'decimal' => false,
@@ -19,7 +26,7 @@
);
// Setup default count value
- $count = $form->get_sales();
+ $count = (new ProgressBarModal(['ids' => [$formId]]))->getDonationCount();;
// Setup default count label
$countLabel = _n('donation', 'donations', $count, 'give');
diff --git a/templates/shortcode-donor-wall.php b/templates/shortcode-donor-wall.php
index b54a5a4c37..7b360a17f8 100644
--- a/templates/shortcode-donor-wall.php
+++ b/templates/shortcode-donor-wall.php
@@ -38,6 +38,17 @@
";
+ } elseif (($avatar = $donor->get_meta('_give_donor_avatar_id', true))) {
+ // Donor has an avatar
+ $imageUrl = wp_get_attachment_image_url($avatar, 'thumbnail');
+ $alt = __('Donor Avatar', 'give');
+
+ echo "
+
+
+
- get_sales(), ['decimal' => false]) ?>
+ get_sales(), $form_id) ?>
__('Subscribe to our newsletter?'),
- 'give_activecampaign_lists' => ['1', '2'],
- 'give_activecampaign_tags' => ['tag 1', 'tag 2'],
+ // Arrange
+ $options = [
+ 'give_activecampaign_globally_enabled' => 'on',
+ 'give_activecampaign_label' => __('Subscribe to our newsletter?'),
+ 'give_activecampaign_lists' => ['1', '2'],
+ 'give_activecampaign_tags' => ['tag 1', 'tag 2'],
'give_activecampaign_checkbox_default' => true,
];
+ foreach ($options as $key => $value) {
+ give_update_option($key, $value);
+ }
+ $meta = ['activecampaign_per_form_options' => 'global'];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
- $formV2 = $this->createSimpleDonationForm(['meta' => $meta]);
-
- $payload = FormMigrationPayload::fromFormV2($formV2);
-
- $mailchimp = new ActiveCampaign($payload);
-
- $mailchimp->process();
-
- $block = $payload->formV3->blocks->findByName('give-activecampaign/activecampaign');
+ // Act
+ $v3Form = $this->migrateForm($v2Form, ActiveCampaign::class);
- $this->assertSame($meta['give_activecampaign_label'], $block->getAttribute('label'));
- $this->assertSame($meta['give_activecampaign_lists'], $block->getAttribute('selectedLists'));
- $this->assertSame($meta['give_activecampaign_tags'], $block->getAttribute('selectedTags'));
+ // Assert
+ $block = $v3Form->blocks->findByName('give-activecampaign/activecampaign');
+ $this->assertSame($options['give_activecampaign_label'], $block->getAttribute('label'));
+ $this->assertSame($options['give_activecampaign_lists'], $block->getAttribute('selectedLists'));
+ $this->assertSame($options['give_activecampaign_tags'], $block->getAttribute('selectedTags'));
$this->assertTrue(true, $block->getAttribute('defaultChecked'));
}
/**
- * @since 3.10.0
+ * @since 3.16.0
*/
- public function testProcessShouldUpdateActiveCampaignBlockAttributesFromGlobalSettings(): void
+ public function testFormConfiguredToUseGlobalActiveCampaignSettingsIsMigratedWithoutActiveCampaignBlockWhenNotGloballyEnabled()
{
- $meta = [
- 'give_activecampaign_label' => __('Subscribe to our newsletter?'),
- 'give_activecampaign_lists' => ['1', '2'],
- 'give_activecampaign_tags' => ['tag 1', 'tag 2'],
- 'give_activecampaign_checkbox_default' => true,
- ];
-
- foreach ($meta as $key => $value) {
- give_update_option($key, $value);
- }
-
- $formV2 = $this->createSimpleDonationForm(['meta' => $meta]);
+ // Arrange
+ give_update_option('give_activecampaign_globally_enabled', 'off');
+ $meta = ['activecampaign_per_form_options' => 'global'];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
- $payload = FormMigrationPayload::fromFormV2($formV2);
+ // Act
+ $v3Form = $this->migrateForm($v2Form, ActiveCampaign::class);
- $mailchimp = new ActiveCampaign($payload);
-
- $mailchimp->process();
-
- $block = $payload->formV3->blocks->findByName('give-activecampaign/activecampaign');
-
- $this->assertSame($meta['give_activecampaign_label'], $block->getAttribute('label'));
- $this->assertSame($meta['give_activecampaign_lists'], $block->getAttribute('selectedLists'));
- $this->assertSame($meta['give_activecampaign_tags'], $block->getAttribute('selectedTags'));
- $this->assertTrue(true, $block->getAttribute('defaultChecked'));
+ // Assert
+ $block = $v3Form->blocks->findByName('give-activecampaign/activecampaign');
+ $this->assertNull($block);
}
/**
- * @since 3.10.0
+ * @since 3.16.0
*/
- public function testProcessShouldUpdateActiveCampaignBlockAttributesWhenNoMeta(): void
+ public function testFormConfiguredToDisableActiveCampaignIsMigratedWithoutActiveCampaignBlock()
{
- $formV2 = $this->createSimpleDonationForm();
+ // Arrange
+ $meta = ['activecampaign_per_form_options' => 'disabled'];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
- $payload = FormMigrationPayload::fromFormV2($formV2);
+ // Act
+ $v3Form = $this->migrateForm($v2Form, ActiveCampaign::class);
- $mailchimp = new ActiveCampaign($payload);
+ // Assert
+ $block = $v3Form->blocks->findByName('give-activecampaign/activecampaign');
+ $this->assertNull($block);
+ }
- $mailchimp->process();
+ /**
+ * @since 3.16.0
+ */
+ public function testFormConfiguredToUseCustomizedActiveCampaignSettingsIsMigrated()
+ {
+ // Arrange
+ $meta = [
+ 'activecampaign_per_form_options' => 'customized',
+ 'give_activecampaign_label' => __('Subscribe to our newsletter?'),
+ 'give_activecampaign_lists' => ['1', '2'],
+ 'give_activecampaign_tags' => ['tag 1', 'tag 2'],
+ 'give_activecampaign_checkbox_default' => true,
+ ];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
- $block = $payload->formV3->blocks->findByName('give-activecampaign/activecampaign');
+ // Act
+ $v3Form = $this->migrateForm($v2Form, ActiveCampaign::class);
- $this->assertSame(__('Subscribe to our newsletter?'), $block->getAttribute('label'));
- $this->assertSame([], $block->getAttribute('selectedLists'));
- $this->assertNull(null, $block->getAttribute('selectedTags'));
+ // Assert
+ $block = $v3Form->blocks->findByName('give-activecampaign/activecampaign');
+ $this->assertSame($meta['give_activecampaign_label'], $block->getAttribute('label'));
+ $this->assertSame($meta['give_activecampaign_lists'], $block->getAttribute('selectedLists'));
+ $this->assertSame($meta['give_activecampaign_tags'], $block->getAttribute('selectedTags'));
$this->assertTrue(true, $block->getAttribute('defaultChecked'));
}
}
diff --git a/tests/Feature/FormMigration/Steps/TestConstantContact.php b/tests/Feature/FormMigration/Steps/TestConstantContact.php
index 52369f1d0c..ab133a52d5 100644
--- a/tests/Feature/FormMigration/Steps/TestConstantContact.php
+++ b/tests/Feature/FormMigration/Steps/TestConstantContact.php
@@ -2,94 +2,91 @@
namespace Give\Tests\Feature\FormMigration\Steps;
-use Give\FormMigration\DataTransferObjects\FormMigrationPayload;
use Give\FormMigration\Steps\ConstantContact;
use Give\Tests\TestCase;
use Give\Tests\TestTraits\RefreshDatabase;
use Give\Tests\Unit\DonationForms\TestTraits\LegacyDonationFormAdapter;
+use Give\Tests\Unit\FormMigration\TestTraits\FormMigrationProcessor;
/**
+ * @since 3.16.0 Update to use FormMigrationProcessor trait
* @since 3.7.0
- *
- * @covers \Give\FormMigration\Steps\DonationGoal
*/
class TestConstantContact extends TestCase
{
- use RefreshDatabase, LegacyDonationFormAdapter;
+ use FormMigrationProcessor;
+ use LegacyDonationFormAdapter;
+ use RefreshDatabase;
/**
+ * @since 3.16.0 Update test to use FormMigrationProcessor::migrateForm method
* @since 3.7.0
*/
- public function testProcessShouldUpdateConstantContactBlockAttributesWithV2FormMeta(): void
+ public function testFormMigratesUsingGlobalSettingsWhenGloballyEnabled(): void
{
- $meta = [
- '_give_constant_contact_custom_label' => 'Subscribe to our newsletter?',
- '_give_constant_contact_checked_default' => 'on',
- '_give_constant_contact' => ['1928414891'],
+ // Arrange
+ $options = [
+ 'givewp_constant_contact_show_checkout_signup' => 'on',
+ 'givewp_constant_contact_label' => 'Subscribe to our newsletter?',
+ 'givewp_constant_contact_checked_default' => 'on',
+ 'givewp_constant_contact_list' => ['1928414891'],
];
+ foreach ($options as $key => $value) {
+ give_update_option($key, $value);
+ }
+ $meta = ['_give_constant_contact_disabled' => 'false'];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
- $formV2 = $this->createSimpleDonationForm(['meta' => $meta]);
-
- $payload = FormMigrationPayload::fromFormV2($formV2);
-
- $constantContact = new ConstantContact($payload);
-
- $constantContact->process();
-
- $block = $payload->formV3->blocks->findByName('givewp/constantcontact');
+ // Act
+ $v3Form = $this->migrateForm($v2Form, ConstantContact::class);
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp/constantcontact');
$this->assertTrue(true, $block->getAttribute('checked' === 'on'));
- $this->assertSame($meta['_give_constant_contact_custom_label'], $block->getAttribute('label'));
- $this->assertSame($meta['_give_constant_contact'], $block->getAttribute('selectedEmailLists'));
+ $this->assertSame($options['givewp_constant_contact_label'], $block->getAttribute('label'));
+ $this->assertSame($options['givewp_constant_contact_list'], $block->getAttribute('selectedEmailLists'));
}
/**
- * @since 3.7.0
+ * @since 3.16.0
*/
- public function testProcessShouldUpdateConstantContactBlockAttributesWithGlobalSettings(): void
+ public function testFormConfiguredToDisableConstantContactIsMigratedWithoutConstantContactBlock()
{
- $meta = [
- 'give_constant_contact_label' => 'Subscribe to our newsletter?',
- 'give_constant_contact_checked_default' => 'on',
- 'give_constant_contact_list' => ['1928414891'],
- ];
-
- $formV2 = $this->createSimpleDonationForm(['meta' => $meta]);
+ // Arrange
+ give_update_option('givewp_constant_contact_show_checkout_signup', 'on');
+ $meta = ['_give_constant_contact_disable' => 'true'];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
- $payload = FormMigrationPayload::fromFormV2($formV2);
+ // Act
+ $v3Form = $this->migrateForm($v2Form, ConstantContact::class);
- foreach ($meta as $key => $value) {
- give_update_option($key, $value);
- }
-
- $constantContact = new ConstantContact($payload);
-
- $constantContact->process();
-
- $block = $payload->formV3->blocks->findByName('givewp/constantcontact');
-
- $this->assertTrue(true, $block->getAttribute('checked' === 'on'));
- $this->assertSame($meta['give_constant_contact_label'], $block->getAttribute('label'));
- $this->assertSame($meta['give_constant_contact_list'], $block->getAttribute('selectedEmailLists'));
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp/constantcontact');
+ $this->assertNull($block);
}
/**
+ * @since 3.16.0 Update test to use FormMigrationProcessor::migrateForm method
* @since 3.7.0
*/
- public function testProcessShouldUpdateConstantContactBlockAttributesWhenNoMeta(): void
+ public function testFormConfiguredToUseCustomizedConstantContactSettingsIsMigrated(): void
{
- $formV2 = $this->createSimpleDonationForm();
-
- $payload = FormMigrationPayload::fromFormV2($formV2);
-
- $constantContact = new ConstantContact($payload);
-
- $constantContact->process();
+ // Arrange
+ $meta = [
+ '_give_constant_contact_enable' => 'true',
+ '_give_constant_contact_custom_label' => 'Subscribe to our newsletter?',
+ '_give_constant_contact_checked_default' => 'on',
+ '_give_constant_contact' => ['1928414891'],
+ ];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
- $block = $payload->formV3->blocks->findByName('givewp/constantcontact');
+ // Act
+ $v3Form = $this->migrateForm($v2Form, ConstantContact::class);
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp/constantcontact');
$this->assertTrue(true, $block->getAttribute('checked' === 'on'));
- $this->assertSame('Subscribe to our newsletter?', $block->getAttribute('label'));
- $this->assertNull(null, $block->getAttribute('selectedEmailLists'));
+ $this->assertSame($meta['_give_constant_contact_custom_label'], $block->getAttribute('label'));
+ $this->assertSame($meta['_give_constant_contact'], $block->getAttribute('selectedEmailLists'));
}
}
diff --git a/tests/Feature/FormMigration/Steps/TestConvertKit.php b/tests/Feature/FormMigration/Steps/TestConvertKit.php
index 9c51256eb2..9832d66858 100644
--- a/tests/Feature/FormMigration/Steps/TestConvertKit.php
+++ b/tests/Feature/FormMigration/Steps/TestConvertKit.php
@@ -4,94 +4,108 @@
namespace Give\Tests\Feature\FormMigration\Steps;
-use Give\FormMigration\DataTransferObjects\FormMigrationPayload;
use Give\FormMigration\Steps\ConvertKit;
use Give\Tests\TestCase;
use Give\Tests\TestTraits\RefreshDatabase;
use Give\Tests\Unit\DonationForms\TestTraits\LegacyDonationFormAdapter;
+use Give\Tests\Unit\FormMigration\TestTraits\FormMigrationProcessor;
class TestConvertKit extends TestCase
{
- use RefreshDatabase, LegacyDonationFormAdapter;
+ use FormMigrationProcessor;
+ use LegacyDonationFormAdapter;
+ use RefreshDatabase;
/**
+ * @since 3.16.0 Update test to use FormMigrationProcessor::migrateForm method
* @since 3.11.0
*/
- public function testProcessShouldUpdateConvertkitBlockAttributesFromV2FormMeta(): void
+ public function testFormConfiguredToUseGlobalConvertKitSettingsMigratesUsingGlobalSettingsWhenGloballyEnabled()
{
- $meta = [
- '_give_convertkit_custom_label' => __('Subscribe to newsletter?' , 'give'),
- '_give_convertkit' => '6352843',
- '_give_convertkit_tags' => ['4619079', '4619080'],
- '_give_convertkit_checked_default' => true,
+ // Arrange
+ $options = [
+ 'give_convertkit_show_subscribe_checkbox' => 'enabled',
+ 'give_convertkit_label' => __('Subscribe to newsletter?', 'give'),
+ 'give_convertkit_list' => '6352843',
+ '_give_convertkit_tags' => ['4619079', '4619080'],
+ 'give_convertkit_checked_default' => true,
];
+ foreach ($options as $key => $value) {
+ give_update_option($key, $value);
+ }
+ $meta = ['_give_convertkit_override_option' => 'default'];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
- $formV2 = $this->createSimpleDonationForm(['meta' => $meta]);
-
- $payload = FormMigrationPayload::fromFormV2($formV2);
-
- $convertkit = new ConvertKit($payload);
-
- $convertkit->process();
-
- $block = $payload->formV3->blocks->findByName('givewp-convertkit/convertkit');
+ // Act
+ $v3Form = $this->migrateForm($v2Form, ConvertKit::class);
- $this->assertSame($meta['_give_convertkit_custom_label'], $block->getAttribute('label'));
- $this->assertSame($meta['_give_convertkit_tags'], $block->getAttribute('tagSubscribers'));
- $this->assertSame($meta['_give_convertkit'], $block->getAttribute('selectedForm'));
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp-convertkit/convertkit');
+ $this->assertSame($options['give_convertkit_label'], $block->getAttribute('label'));
+ $this->assertSame($options['give_convertkit_list'], $block->getAttribute('selectedForm'));
+ $this->assertSame($options['_give_convertkit_tags'], $block->getAttribute('tagSubscribers'));
$this->assertTrue(true, $block->getAttribute('defaultChecked'));
}
/**
- * @since 3.11.0
+ * @since 3.16.0
*/
- public function testProcessShouldUpdateConvertkitBlockAttributesFromGlobalSettings(): void
+ public function testFormConfiguredToUseGlobalConvertKitSettingsIsMigratedWithoutConvertKitBlockWhenNotGloballyEnabled()
{
- $meta = [
- 'give_convertkit_label' => __('Subscribe to newsletter?', 'give'),
- 'give_convertkit_list' => '6352843',
- '_give_convertkit_tags' => ['4619079', '4619080'],
- 'give_convertkit_checked_default' => true,
- ];
+ // Arrange
+ give_update_option('give_convertkit_show_subscribe_checkbox', 'disabled');
+ $meta = ['_give_convertkit_override_option' => 'default'];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
- foreach ($meta as $key => $value) {
- give_update_option($key, $value);
- }
+ // Act
+ $v3Form = $this->migrateForm($v2Form, ConvertKit::class);
- $formV2 = $this->createSimpleDonationForm(['meta' => $meta]);
-
- $payload = FormMigrationPayload::fromFormV2($formV2);
-
- $convertkit = new ConvertKit($payload);
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp-convertkit/convertkit');
+ $this->assertNull($block);
+ }
- $convertkit->process();
+ /**
+ * @since 3.16.0
+ */
+ public function testFormConfiguredToDisableConvertKitIsMigratedWithoutConvertKitBlock()
+ {
+ // Arrange
+ $meta = ['_give_convertkit_override_option' => 'disabled'];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
- $block = $payload->formV3->blocks->findByName('givewp-convertkit/convertkit');
+ // Act
+ $v3Form = $this->migrateForm($v2Form, ConvertKit::class);
- $this->assertSame($meta['give_convertkit_label'], $block->getAttribute('label'));
- $this->assertSame($meta['give_convertkit_list'], $block->getAttribute('selectedForm'));
- $this->assertSame($meta['_give_convertkit_tags'], $block->getAttribute('tagSubscribers'));
- $this->assertTrue(true, $block->getAttribute('defaultChecked'));
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp-convertkit/convertkit');
+ $this->assertNull($block);
}
/**
+ * @since 3.16.0 Update test to use FormMigrationProcessor::migrateForm method
* @since 3.11.0
*/
- public function testProcessShouldUpdateConvertkitBlockAttributesWhenNoMeta(): void
+ public function testFormConfiguredToUseCustomizedConvertKitSettingsIsMigrated()
{
- $formV2 = $this->createSimpleDonationForm();
-
- $payload = FormMigrationPayload::fromFormV2($formV2);
-
- $convertkit = new ConvertKit($payload);
-
- $convertkit->process();
+ // Arrange
+ $meta = [
+ '_give_convertkit_override_option' => 'customize',
+ '_give_convertkit_custom_label' => __('Subscribe to newsletter?' , 'give'),
+ '_give_convertkit' => '6352843',
+ '_give_convertkit_tags' => ['4619079', '4619080'],
+ '_give_convertkit_checked_default' => true,
+ ];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
- $block = $payload->formV3->blocks->findByName('givewp-convertkit/convertkit');
+ // Act
+ $v3Form = $this->migrateForm($v2Form, ConvertKit::class);
- $this->assertSame(__('Subscribe to newsletter?', 'give'), $block->getAttribute('label'));
- $this->assertSame('', $block->getAttribute('selectedForm'));
- $this->assertNull(null, $block->getAttribute('tagSubscribers'));
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp-convertkit/convertkit');
+ $this->assertSame($meta['_give_convertkit_custom_label'], $block->getAttribute('label'));
+ $this->assertSame($meta['_give_convertkit_tags'], $block->getAttribute('tagSubscribers'));
+ $this->assertSame($meta['_give_convertkit'], $block->getAttribute('selectedForm'));
$this->assertTrue(true, $block->getAttribute('defaultChecked'));
}
}
diff --git a/tests/Feature/FormMigration/Steps/TestCurrencySwitcher.php b/tests/Feature/FormMigration/Steps/TestCurrencySwitcher.php
index 0c3cf497a9..8483475e92 100644
--- a/tests/Feature/FormMigration/Steps/TestCurrencySwitcher.php
+++ b/tests/Feature/FormMigration/Steps/TestCurrencySwitcher.php
@@ -17,7 +17,7 @@ class TestCurrencySwitcher extends TestCase
use LegacyDonationFormAdapter;
/**
- * @unreleased
+ * @since 3.13.0
*/
public function testFormWithoutCurrencySwitcherSettingsMigratesUsingGlobalSettings(): void
{
@@ -35,7 +35,7 @@ public function testFormWithoutCurrencySwitcherSettingsMigratesUsingGlobalSettin
}
/**
- * @unreleased
+ * @since 3.13.0
*/
public function testFormConfiguredToUseGlobalCurrencySwitcherSettingsIsMigrated(): void
{
@@ -56,7 +56,7 @@ public function testFormConfiguredToUseGlobalCurrencySwitcherSettingsIsMigrated(
}
/**
- * @unreleased
+ * @since 3.13.0
*/
public function testFormConfiguredToDisableCurrencySwitcherIsMigrated(): void
{
@@ -77,7 +77,7 @@ public function testFormConfiguredToDisableCurrencySwitcherIsMigrated(): void
}
/**
- * @unreleased
+ * @since 3.13.0
*/
public function testFormConfiguredToUseLocalCurrencySwitcherIsMigrated(): void
{
@@ -111,7 +111,7 @@ public function testFormConfiguredToUseLocalCurrencySwitcherIsMigrated(): void
* Sets up and returns a v2 donation form configured with the
* given attributes being set to the Currency Switcher settings.
*
- * @unreleased
+ * @since 3.13.0
*
* @throws Exception
*/
@@ -127,7 +127,7 @@ private function setUpDonationForm(array $attributes = []): V2DonationForm
}
/**
- * @unreleased
+ * @since 3.13.0
*/
private function migrateForm(V2DonationForm $form): DonationForm
{
diff --git a/tests/Feature/FormMigration/Steps/TestDonationGoal.php b/tests/Feature/FormMigration/Steps/TestDonationGoal.php
index 5628134dd9..12d9794487 100644
--- a/tests/Feature/FormMigration/Steps/TestDonationGoal.php
+++ b/tests/Feature/FormMigration/Steps/TestDonationGoal.php
@@ -2,26 +2,31 @@
namespace Give\Tests\Feature\FormMigration\Steps;
-use Give\FormMigration\DataTransferObjects\FormMigrationPayload;
use Give\FormMigration\Steps\DonationGoal;
use Give\Tests\TestCase;
use Give\Tests\TestTraits\RefreshDatabase;
use Give\Tests\Unit\DonationForms\TestTraits\LegacyDonationFormAdapter;
+use Give\Tests\Unit\FormMigration\TestTraits\FormMigrationProcessor;
/**
+ * @since 3.16.0 Update to use FormMigrationProcessor trait
* @since 3.4.0
*
* @covers \Give\FormMigration\Steps\DonationGoal
*/
class TestDonationGoal extends TestCase
{
- use RefreshDatabase, LegacyDonationFormAdapter;
+ use FormMigrationProcessor;
+ use LegacyDonationFormAdapter;
+ use RefreshDatabase;
/**
+ * @since 3.16.0 Update test to use FormMigrationProcessor::migrateForm method
* @since 3.4.0
*/
public function testProcessShouldUpdateDonationFormDonationGoalSettings(): void
{
+ // Arrange
$meta = [
'_give_goal_option' => 'enabled',
'_give_goal_setting' => 'enabled',
@@ -30,17 +35,13 @@ public function testProcessShouldUpdateDonationFormDonationGoalSettings(): void
'_give_close_form_when_goal_achieved' => 'enabled',
'_give_form_goal_achieved_message' => __( 'Thank you to all our donors, we have met our fundraising goal.', 'give' ),
];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
- $formV2 = $this->createSimpleDonationForm(['meta' => $meta]);
-
- $payload = FormMigrationPayload::fromFormV2($formV2);
-
- $donationGoal = new DonationGoal($payload);
-
- $donationGoal->process();
-
- $settings = $payload->formV3->settings;
+ // Act
+ $v3Form = $this->migrateForm($v2Form, DonationGoal::class);
+ // Assert
+ $settings = $v3Form->settings;
$this->assertTrue(true, $settings->enableDonationGoal);
$this->assertTrue($settings->goalType->isAmount());
$this->assertSame((string)$meta['_give_set_goal'], $settings->goalAmount);
diff --git a/tests/Feature/FormMigration/Steps/TestDonationOptions.php b/tests/Feature/FormMigration/Steps/TestDonationOptions.php
index 3c4d0240b4..8ab4ce1274 100644
--- a/tests/Feature/FormMigration/Steps/TestDonationOptions.php
+++ b/tests/Feature/FormMigration/Steps/TestDonationOptions.php
@@ -2,11 +2,11 @@
namespace Give\Tests\Feature\FormMigration\Steps;
-use Give\FormMigration\DataTransferObjects\FormMigrationPayload;
use Give\FormMigration\Steps\DonationOptions;
use Give\Tests\TestCase;
use Give\Tests\TestTraits\RefreshDatabase;
use Give\Tests\Unit\DonationForms\TestTraits\LegacyDonationFormAdapter;
+use Give\Tests\Unit\FormMigration\TestTraits\FormMigrationProcessor;
/**
* @since 3.4.0
@@ -14,13 +14,17 @@
* @covers \Give\FormMigration\Steps\DonationOptions
*/
class TestDonationOptions extends TestCase {
- use RefreshDatabase, LegacyDonationFormAdapter;
+ use FormMigrationProcessor;
+ use LegacyDonationFormAdapter;
+ use RefreshDatabase;
/**
+ * @since 3.16.0 Update test to use FormMigrationProcessor::migrateForm method
* @since 3.4.0
*/
public function testProcessShouldUpdateDonationAmountBlockAttributes(): void
{
+ // Arrange
$meta = [
'_give_price_option' => 'set',
'_give_set_price' => '100',
@@ -28,17 +32,13 @@ public function testProcessShouldUpdateDonationAmountBlockAttributes(): void
'_give_custom_amount_range_minimum' => '1',
'_give_custom_amount_range_maximum' => '1000',
];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
- $formV2 = $this->createSimpleDonationForm(['meta' => $meta]);
-
- $payload = FormMigrationPayload::fromFormV2($formV2);
-
- $donationOptions = new DonationOptions($payload);
-
- $donationOptions->process();
-
- $block = $payload->formV3->blocks->findByName('givewp/donation-amount');
+ // Act
+ $v3Form = $this->migrateForm($v2Form, DonationOptions::class);
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp/donation-amount');
$this->assertSame($meta['_give_price_option'], $block->getAttribute('priceOption'));
$this->assertSame($meta['_give_set_price'], $block->getAttribute('setPrice'));
$this->assertTrue($block->getAttribute('customAmount'));
@@ -47,27 +47,25 @@ public function testProcessShouldUpdateDonationAmountBlockAttributes(): void
}
/**
+ * @since 3.16.0 Update test to use FormMigrationProcessor::migrateForm method
* @since 3.12.0 Updated test to include donation levels with descriptions
* @since 3.4.0
*/
public function testProcessShouldUpdateDonationAmountBlockAttributesWithDonationLevels(): void
{
+ //Arrange
$meta = [
'_give_custom_amount' => 'enabled',
'_give_custom_amount_range_minimum' => '1',
'_give_custom_amount_range_maximum' => '1000',
];
+ $v2Form = $this->createMultiLevelDonationForm(['meta' => $meta]);
- $formV2 = $this->createMultiLevelDonationForm(['meta' => $meta]);
-
- $payload = FormMigrationPayload::fromFormV2($formV2);
-
- $donationOptions = new DonationOptions($payload);
-
- $donationOptions->process();
-
- $block = $payload->formV3->blocks->findByName('givewp/donation-amount');
+ // Act
+ $v3Form = $this->migrateForm($v2Form, DonationOptions::class);
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp/donation-amount');
$expectedLevels = [
[
'value' => 10.00,
diff --git a/tests/Feature/FormMigration/Steps/TestDoubleTheDonation.php b/tests/Feature/FormMigration/Steps/TestDoubleTheDonation.php
index 89f94a1b72..7a9df4f7ce 100644
--- a/tests/Feature/FormMigration/Steps/TestDoubleTheDonation.php
+++ b/tests/Feature/FormMigration/Steps/TestDoubleTheDonation.php
@@ -2,41 +2,43 @@
namespace Give\Tests\Feature\FormMigration\Steps;
-use Give\FormMigration\DataTransferObjects\FormMigrationPayload;
use Give\FormMigration\Steps\DoubleTheDonation;
use Give\Tests\TestCase;
use Give\Tests\TestTraits\RefreshDatabase;
use Give\Tests\Unit\DonationForms\TestTraits\LegacyDonationFormAdapter;
+use Give\Tests\Unit\FormMigration\TestTraits\FormMigrationProcessor;
/**
+ * @since 3.16.0 Update to use FormMigrationProcessor trait
* @since 3.8.0
*
* @covers \Give\FormMigration\Steps\DoubleTheDonation
*/
class TestDoubleTheDonation extends TestCase
{
- use RefreshDatabase, LegacyDonationFormAdapter;
+ use FormMigrationProcessor;
+ use LegacyDonationFormAdapter;
+ use RefreshDatabase;
public function testProcessShouldUpdateDoubleTheDonationBlockAttributes(): void
{
+ // Arrange
$meta = [
'give_dtd_label' => 'DTD Label',
+ 'dtd_enable_disable' => 'enabled',
];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
+ // Act
+ $v3Form = $this->migrateForm($v2Form, DoubleTheDonation::class);
+
+ // Assert
$company = [
'company_id' => '',
'company_name' => '',
'entered_text' => '',
];
-
- $formV2 = $this->createSimpleDonationForm(['meta' => $meta]);
- $payload = FormMigrationPayload::fromFormV2($formV2);
-
- $dtd = new DoubleTheDonation($payload);
- $dtd->process();
-
- $block = $payload->formV3->blocks->findByName('givewp/dtd');
-
+ $block = $v3Form->blocks->findByName('givewp/dtd');
$this->assertSame($meta['give_dtd_label'], $block->getAttribute('label'));
$this->assertEqualsIgnoringCase($company, $block->getAttribute('company'));
}
diff --git a/tests/Feature/FormMigration/Steps/TestEmailSettings.php b/tests/Feature/FormMigration/Steps/TestEmailSettings.php
new file mode 100644
index 0000000000..5e2e904fa8
--- /dev/null
+++ b/tests/Feature/FormMigration/Steps/TestEmailSettings.php
@@ -0,0 +1,91 @@
+ 'enabled',
+ '_give_email_template' => 'default',
+ '_give_email_logo' => 'logo.png',
+ '_give_from_name' => 'Charity Org',
+ '_give_from_email' => 'email@example.org',
+ ];
+
+ $notifications = Give_Email_Notifications::get_instance()->get_email_notifications();
+ foreach ($notifications as $notification) {
+ add_filter("give_{$notification->config['id']}_get_recipients", [$this, 'getNotificationRecipients'], 1, 3);
+
+ $prefix = '_give_' . $notification->config['id'];
+ $notificationMeta = [
+ $prefix . '_notification' => 'enabled',
+ $prefix . '_email_subject' => $notification->config['label'],
+ $prefix . '_email_header' => 'Header for: ' . $notification->config['label'],
+ $prefix . '_email_message' => 'Message for: ' . $notification->config['label'],
+ $prefix . '_email_content_type' => 'text/html',
+ ];
+
+ if ($notification->config['has_recipient_field']) {
+ $notificationMeta[$prefix . '_recipient'] = [['email' => 'donor@charity.org']];
+ }
+ $meta = array_merge($meta, $notificationMeta);
+ }
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, EmailSettings::class);
+
+ // Assert
+ $this->assertSame($meta['_give_email_options'], $v3Form->settings->emailOptionsStatus);
+ $this->assertSame($meta['_give_email_template'], $v3Form->settings->emailTemplate);
+ $this->assertSame($meta['_give_email_logo'], $v3Form->settings->emailLogo);
+ $this->assertSame($meta['_give_from_name'], $v3Form->settings->emailFromName);
+ $this->assertSame($meta['_give_from_email'], $v3Form->settings->emailFromEmail);
+
+ foreach ($notifications as $notification) {
+ $configId = $notification->config['id'];
+ $this->assertSame('enabled', $v3Form->settings->emailTemplateOptions[$configId]['status']);
+ $this->assertSame($notification->config['label'], $v3Form->settings->emailTemplateOptions[$configId]['email_subject']);
+ $this->assertSame('Header for: ' . $notification->config['label'], $v3Form->settings->emailTemplateOptions[$configId]['email_header']);
+ $this->assertSame('Message for: ' . $notification->config['label'], $v3Form->settings->emailTemplateOptions[$configId]['email_message']);
+ $this->assertSame('text/html', $v3Form->settings->emailTemplateOptions[$configId]['email_content_type']);
+
+ if ($notification->config['has_recipient_field']) {
+ $this->assertSame(['donor@charity.org'],
+ $v3Form->settings->emailTemplateOptions[$configId]['recipient']);
+ }
+
+ remove_filter("give_{$notification->config['id']}_get_recipients", [$this, 'getNotificationRecipients'], 1);
+ }
+ }
+
+ public function getNotificationRecipients($recipientEmail, $instance, $formId)
+ {
+ return Give_Email_Notification_Util::get_value(
+ $instance,
+ Give_Email_Setting_Field::get_prefix( $instance, $formId ) . 'recipient',
+ $formId
+ );
+ }
+}
diff --git a/tests/Feature/FormMigration/Steps/TestFeeRecovery.php b/tests/Feature/FormMigration/Steps/TestFeeRecovery.php
new file mode 100644
index 0000000000..eb378184f2
--- /dev/null
+++ b/tests/Feature/FormMigration/Steps/TestFeeRecovery.php
@@ -0,0 +1,114 @@
+ 'enabled',
+ 'give_fee_configuration' => 'all_gateways',
+ 'give_fee_percentage' => 5,
+ 'give_fee_base_amount' => 0.50,
+ 'give_fee_maximum_fee_amount' => 20.00,
+ 'give_fee_breakdown' => 'enabled',
+ 'give_fee_mode' => 'donor_opt_in',
+ 'give_fee_checkbox_label' => 'Fee Recovery checkbox label',
+ 'give_fee_explanation' => 'Message for fee recovery',
+ ];
+ foreach ($options as $key => $value) {
+ give_update_option($key, $value);
+ }
+ $meta = ['_form_give_fee_recovery' => 'global'];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, FeeRecovery::class);
+
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp-fee-recovery/fee-recovery');
+ $this->assertSame(true, $block->getAttribute('useGlobalSettings'));
+ $this->assertSame(true, $block->getAttribute('feeSupportForAllGateways'));
+ $this->assertSame([], $block->getAttribute('perGatewaySettings'));
+ $this->assertSame(5.0, $block->getAttribute('feePercentage'));
+ $this->assertSame(0.5, $block->getAttribute('feeBaseAmount'));
+ $this->assertSame(20.0, $block->getAttribute('maxFeeAmount'));
+ $this->assertSame(true, $block->getAttribute('includeInDonationSummary'));
+ $this->assertSame(true, $block->getAttribute('donorOptIn'));
+ $this->assertSame('Fee Recovery checkbox label', $block->getAttribute('feeCheckboxLabel'));
+ $this->assertSame('Message for fee recovery', $block->getAttribute('feeMessage'));
+ }
+
+ /**
+ * @since 3.16.0
+ */
+ public function testFeeRecoveryProcessWithPerFormSettings(): void
+ {
+ // Arrange
+ $meta = [
+ '_form_give_fee_recovery' => 'enabled',
+ '_form_give_fee_configuration' => 'all_gateways',
+ '_form_give_fee_percentage' => 5,
+ '_form_give_fee_base_amount' => 0.50,
+ '_form_give_fee_maximum_fee_amount' => 20.00,
+ '_form_breakdown' => 'enabled',
+ '_form_give_fee_mode' => 'donor_opt_in',
+ '_form_give_fee_checkbox_label' => 'Fee Recovery checkbox label',
+ '_form_give_fee_explanation' => 'Message for fee recovery',
+ ];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, FeeRecovery::class);
+
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp-fee-recovery/fee-recovery');
+ $this->assertSame(false, $block->getAttribute('useGlobalSettings'));
+ $this->assertSame(true, $block->getAttribute('feeSupportForAllGateways'));
+ $this->assertSame(5.0, $block->getAttribute('feePercentage'));
+ $this->assertSame(0.5, $block->getAttribute('feeBaseAmount'));
+ $this->assertSame(20.0, $block->getAttribute('maxFeeAmount'));
+ $this->assertSame(true, $block->getAttribute('includeInDonationSummary'));
+ $this->assertSame(true, $block->getAttribute('donorOptIn'));
+ $this->assertSame('Fee Recovery checkbox label', $block->getAttribute('feeCheckboxLabel'));
+ $this->assertSame('Message for fee recovery', $block->getAttribute('feeMessage'));
+ }
+
+ /**
+ * @since 3.16.0
+ */
+ public function testFeeRecoveryProcessWithGlobalSettingsDisabled(): void
+ {
+ // Arrange
+ give_update_option('give_fee_recovery', 'disabled');
+ $meta = ['_form_give_fee_recovery' => 'global'];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, FeeRecovery::class);
+
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp-fee-recovery/fee-recovery');
+ $this->assertNull($block);
+ }
+}
diff --git a/tests/Feature/FormMigration/Steps/TestFormExcerpt.php b/tests/Feature/FormMigration/Steps/TestFormExcerpt.php
new file mode 100644
index 0000000000..b994a3a55b
--- /dev/null
+++ b/tests/Feature/FormMigration/Steps/TestFormExcerpt.php
@@ -0,0 +1,39 @@
+ 'This is a test excerpt',
+ ];
+ $v2Form = $this->createSimpleDonationForm(['form' => $form]);
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, FormExcerpt::class);
+
+ // Assert
+ $this->assertSame($form['post_excerpt'], $v3Form->settings->formExcerpt);
+ }
+}
diff --git a/tests/Feature/FormMigration/Steps/TestFormFeaturedImage.php b/tests/Feature/FormMigration/Steps/TestFormFeaturedImage.php
new file mode 100644
index 0000000000..0d1e3d0970
--- /dev/null
+++ b/tests/Feature/FormMigration/Steps/TestFormFeaturedImage.php
@@ -0,0 +1,106 @@
+ 'sequoia',
+ '_give_sequoia_form_template_settings' => [
+ 'introduction' => [
+ 'image' => 'https://example.com/image.jpg',
+ ],
+ ],
+ ];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, FormFeaturedImage::class);
+
+ // Assert
+ $this->assertSame('https://example.com/image.jpg', $v3Form->settings->designSettingsImageUrl);
+ $this->assertSame('center', $v3Form->settings->designSettingsImageStyle);
+ }
+
+ /**
+ * @since 3.16.0
+ */
+ public function testClassicTemplateHeaderBackgroundImageIsMigratedCorrectly(): void
+ {
+ // Arrange
+ $meta = [
+ '_give_form_template' => 'classic',
+ '_give_classic_form_template_settings' => [
+ 'visual_appearance' => [
+ 'header_background_image' => 'https://example.com/image.jpg',
+ ],
+ ],
+ ];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, FormFeaturedImage::class);
+
+ // Assert
+ $this->assertSame('https://example.com/image.jpg', $v3Form->settings->designSettingsImageUrl);
+ }
+
+ /**
+ * @since 3.16.0
+ */
+ public function testFallbackImageIsMigratedWhenFeaturedImageIsMissing(): void
+ {
+ // Arrange
+ $v2Form = $this->createSimpleDonationForm();
+ update_post_meta($v2Form->id, '_thumbnail_id', '1');
+ add_filter('wp_get_attachment_image_src', function ($image, $attachmentId) {
+ if ($attachmentId === 1) {
+ return ['https://example.com/image.jpg', 100, 100, false];
+ }
+
+ return $image;
+ }, 10, 2);
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, FormFeaturedImage::class);
+
+ // Assert
+ $this->assertSame('https://example.com/image.jpg', $v3Form->settings->designSettingsImageUrl);
+ }
+
+ /**
+ * @since 3.16.0
+ */
+ public function testNoImageIsMigratedWhenNoImageExists ()
+ {
+ // Arrange
+ $v2Form = $this->createSimpleDonationForm();
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, FormFeaturedImage::class);
+
+ // Assert
+ $this->assertEmpty($v3Form->settings->designSettingsImageUrl);
+ }
+}
diff --git a/tests/Feature/FormMigration/Steps/TestFormFields.php b/tests/Feature/FormMigration/Steps/TestFormFields.php
new file mode 100644
index 0000000000..103fc82a17
--- /dev/null
+++ b/tests/Feature/FormMigration/Steps/TestFormFields.php
@@ -0,0 +1,88 @@
+ ['Mr.', 'Mrs.', 'Ms.', 'Dr.'],
+ ];
+ foreach ($options as $key => $value) {
+ give_update_option($key, $value);
+ }
+ $meta = [
+ '_give_name_title_prefix' => 'required',
+ '_give_title_prefixes' => ['Mr.', 'Mrs.', 'Ms.', 'Dr.'],
+ '_give_last_name_field_required' => 'required',
+ ];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, FormFields::class);
+
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp/donor-name');
+ $this->assertTrue($block->getAttribute('showHonorific'));
+ $this->assertEquals($options['title_prefixes'], $block->getAttribute('honorifics'));
+ $this->assertTrue($block->getAttribute('requireLastName'));
+ }
+
+ /**
+ * @since 3.16.0
+ */
+ public function testDonorCommentsFormFieldProcess()
+ {
+ // Arrange
+ $meta = [
+ '_give_donor_comment' => 'enabled',
+ ];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, FormFields::class);
+
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp/donor-comments');
+ $this->assertNotNull($block);
+ }
+
+ /**
+ * @since 3.16.0
+ */
+ public function testAnonymousDonationsFormFieldProcess()
+ {
+ // Arrange
+ $meta = [
+ '_give_anonymous_donation' => 'enabled',
+ ];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, FormFields::class);
+
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp/anonymous');
+ $this->assertNotNull($block);
+ }
+}
diff --git a/tests/Feature/FormMigration/Steps/TestFormGrid.php b/tests/Feature/FormMigration/Steps/TestFormGrid.php
new file mode 100644
index 0000000000..f662f65ffb
--- /dev/null
+++ b/tests/Feature/FormMigration/Steps/TestFormGrid.php
@@ -0,0 +1,45 @@
+ 'custom',
+ '_give_form_grid_redirect_url' => 'https://example.com',
+ '_give_form_grid_donate_button_text' => 'Donate Now',
+ ];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, FormGrid::class);
+
+ // Assert
+ $this->assertTrue($v3Form->settings->formGridCustomize);
+ $this->assertEquals('https://example.com', $v3Form->settings->formGridRedirectUrl);
+ $this->assertEquals('Donate Now', $v3Form->settings->formGridDonateButtonText);
+ $this->assertTrue($v3Form->settings->formGridHideDocumentationLink);
+
+ }
+}
diff --git a/tests/Feature/FormMigration/Steps/TestFormMeta.php b/tests/Feature/FormMigration/Steps/TestFormMeta.php
new file mode 100644
index 0000000000..619fe363bd
--- /dev/null
+++ b/tests/Feature/FormMigration/Steps/TestFormMeta.php
@@ -0,0 +1,43 @@
+ true,
+ '_string_legacy_meta' => 'string',
+ '_array_legacy_meta' => ['key' => 'value'],
+ ];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, FormMeta::class);
+
+ // Assert
+ $this->assertTrue((bool) give_get_meta($v3Form->id, '_boolean_legacy_meta', true));
+ $this->assertSame('string', give_get_meta($v3Form->id, '_string_legacy_meta', true));
+ $this->assertSame(['key' => 'value'], give_get_meta($v3Form->id, '_array_legacy_meta', true));
+ }
+}
diff --git a/tests/Feature/FormMigration/Steps/TestFormTitle.php b/tests/Feature/FormMigration/Steps/TestFormTitle.php
new file mode 100644
index 0000000000..7eae07a3fe
--- /dev/null
+++ b/tests/Feature/FormMigration/Steps/TestFormTitle.php
@@ -0,0 +1,40 @@
+ 'Form Title',
+ ];
+ $v2Form = $this->createSimpleDonationForm(['form' => $form]);
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, FormTitle::class);
+
+ // Assert
+ $this->assertSame($form['post_title'], $v3Form->title);
+ $this->assertSame($form['post_title'], $v3Form->settings->formTitle);
+ }
+}
diff --git a/tests/Feature/FormMigration/Steps/TestMailchimp.php b/tests/Feature/FormMigration/Steps/TestMailchimp.php
index 7c9e9be78c..02bcfd4b0a 100644
--- a/tests/Feature/FormMigration/Steps/TestMailchimp.php
+++ b/tests/Feature/FormMigration/Steps/TestMailchimp.php
@@ -4,106 +4,115 @@
namespace Give\Tests\Feature\FormMigration\Steps;
-use Give\FormMigration\DataTransferObjects\FormMigrationPayload;
use Give\FormMigration\Steps\Mailchimp;
use Give\Tests\TestCase;
use Give\Tests\TestTraits\RefreshDatabase;
use Give\Tests\Unit\DonationForms\TestTraits\LegacyDonationFormAdapter;
+use Give\Tests\Unit\FormMigration\TestTraits\FormMigrationProcessor;
class TestMailchimp extends TestCase
{
- use RefreshDatabase, LegacyDonationFormAdapter;
+ use FormMigrationProcessor;
+ use LegacyDonationFormAdapter;
+ use RefreshDatabase;
/**
- * @since 3.7.0
+ * @since 3.16.0
*/
- public function testProcessShouldUpdateMailchimpBlockAttributesFromV2FormMeta(): void
+ public function testMailchimpSettingsAreMigratedWhenGloballyEnabledAndNotDisabledForSpecificFormUsingGlobalSettings(): void
{
- $meta = [
- '_give_mailchimp_custom_label' => __('Subscribe to newsletter?'),
- '_give_mailchimp_tags' => ['Animal-Rescue-Campaign', 'Housing-And-Shelter-Campaign'],
- '_give_mailchimp' => ['de73f3f82f'],
- '_give_mailchimp_checked_default' => true,
- '_give_mailchimp_send_donation_data' => true,
- '_give_mailchimp_send_ffm' => true,
+ // Arrange
+ $options = [
+ 'give_mailchimp_show_checkout_signup' => 'on',
+ 'give_mailchimp_label' => __('Subscribe to newsletter?'),
+ 'give_mailchimp_list' => ['de73f3f82f'],
+ 'give_mailchimp_checked_default' => true,
+ 'give_mailchimp_double_opt_in' => true,
+ 'give_mailchimp_donation_data' => true,
+ 'give_mailchimp_ffm_pass_field' => true,
];
+ foreach ($options as $key => $value) {
+ give_update_option($key, $value);
+ }
+ $v2Form = $this->createSimpleDonationForm();
- $formV2 = $this->createSimpleDonationForm(['meta' => $meta]);
-
- $payload = FormMigrationPayload::fromFormV2($formV2);
-
- $mailchimp = new Mailchimp($payload);
-
- $mailchimp->process();
-
- $block = $payload->formV3->blocks->findByName('givewp/mailchimp');
+ // Act
+ $v3Form = $this->migrateForm($v2Form, Mailchimp::class);
- $this->assertSame($meta['_give_mailchimp_custom_label'], $block->getAttribute('label'));
- $this->assertSame($meta['_give_mailchimp_tags'], $block->getAttribute('subscriberTags'));
- $this->assertSame($meta['_give_mailchimp'], $block->getAttribute('defaultAudiences'));
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp/mailchimp');
+ $this->assertSame($options['give_mailchimp_label'], $block->getAttribute('label'));
+ $this->assertSame($options['give_mailchimp_list'], $block->getAttribute('defaultAudiences'));
+ $this->assertNull(null, $block->getAttribute('subscriberTags'));
$this->assertTrue(true, $block->getAttribute('checked'));
+ $this->assertTrue(true, $block->getAttribute('doubleOptIn'));
$this->assertTrue(true, $block->getAttribute('sendDonationData'));
$this->assertTrue(true, $block->getAttribute('sendFFMData'));
}
/**
- * @since 3.7.0
+ * @since 3.16.0
*/
- public function testProcessShouldUpdateMailchimpBlockAttributesFromGlobalSettings(): void
+ public function testMailchimpSettingsAreMigratedWhenGloballyEnabledAndNotDisabledForSpecificFormUsingFormSettings(): void
{
+ // Arrange
+ give_update_option('give_mailchimp_show_checkout_signup', 'on');
$meta = [
- 'give_mailchimp_label' => __('Subscribe to newsletter?'),
- 'give_mailchimp_list' => ['de73f3f82f'],
- 'give_mailchimp_checked_default' => true,
- 'give_mailchimp_double_opt_in' => true,
- 'give_mailchimp_donation_data' => true,
- 'give_mailchimp_ffm_pass_field' => true,
+ '_give_mailchimp_custom_label' => __('Subscribe to newsletter?'),
+ '_give_mailchimp_tags' => ['Animal-Rescue-Campaign', 'Housing-And-Shelter-Campaign'],
+ '_give_mailchimp' => ['de73f3f82f'],
+ '_give_mailchimp_checked_default' => true,
+ '_give_mailchimp_send_donation_data' => true,
+ '_give_mailchimp_send_ffm' => true,
];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
- foreach ($meta as $key => $value) {
- give_update_option($key, $value);
- }
-
- $formV2 = $this->createSimpleDonationForm(['meta' => $meta]);
+ // Act
+ $v3Form = $this->migrateForm($v2Form, Mailchimp::class);
- $payload = FormMigrationPayload::fromFormV2($formV2);
-
- $mailchimp = new Mailchimp($payload);
-
- $mailchimp->process();
-
- $block = $payload->formV3->blocks->findByName('givewp/mailchimp');
-
- $this->assertSame($meta['give_mailchimp_label'], $block->getAttribute('label'));
- $this->assertSame($meta['give_mailchimp_list'], $block->getAttribute('defaultAudiences'));
- $this->assertNull(null, $block->getAttribute('subscriberTags'));
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp/mailchimp');
+ $this->assertSame($meta['_give_mailchimp_custom_label'], $block->getAttribute('label'));
+ $this->assertSame($meta['_give_mailchimp_tags'], $block->getAttribute('subscriberTags'));
+ $this->assertSame($meta['_give_mailchimp'], $block->getAttribute('defaultAudiences'));
$this->assertTrue(true, $block->getAttribute('checked'));
- $this->assertTrue(true, $block->getAttribute('doubleOptIn'));
$this->assertTrue(true, $block->getAttribute('sendDonationData'));
$this->assertTrue(true, $block->getAttribute('sendFFMData'));
}
/**
- * @since 3.7.0
+ * @since 3.16.0
*/
- public function testProcessShouldUpdateMailchimpBlockAttributesWhenNoMeta(): void
+ public function testMailchimpSettingsAreNotMigratedWhenNotGloballyEnabledOrEnabledPerForm()
{
- $formV2 = $this->createSimpleDonationForm();
+ // Arrange
+ give_update_option('give_mailchimp_show_checkout_signup', 'off');
+ $meta = ['_give_mailchimp_enable' => 'false'];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
- $payload = FormMigrationPayload::fromFormV2($formV2);
+ // Act
+ $v3Form = $this->migrateForm($v2Form, Mailchimp::class);
- $mailchimp = new Mailchimp($payload);
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp/mailchimp');
+ $this->assertNull($block);
+ }
- $mailchimp->process();
+ /**
+ * @since 3.16.0
+ */
+ public function testMailchimpSettingsAreNotMigratedWhenGloballyEnabledButDisabledForSpecificForm()
+ {
+ // Arrange
+ give_update_option('give_mailchimp_show_checkout_signup', 'off');
+ $meta = ['_give_mailchimp_disable' => 'false'];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
- $block = $payload->formV3->blocks->findByName('givewp/mailchimp');
+ // Act
+ $v3Form = $this->migrateForm($v2Form, Mailchimp::class);
- $this->assertSame(__('Subscribe to newsletter?'), $block->getAttribute('label'));
- $this->assertNull(null, $block->getAttribute('subscriberTags'));
- $this->assertSame([''], $block->getAttribute('defaultAudiences'));
- $this->assertTrue(true, $block->getAttribute('checked'));
- $this->assertTrue(true, $block->getAttribute('doubleOptIn'));
- $this->assertTrue(true, $block->getAttribute('sendDonationData'));
- $this->assertTrue(true, $block->getAttribute('sendFFMData'));
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp/mailchimp');
+ $this->assertNull($block);
}
}
diff --git a/tests/Feature/FormMigration/Steps/TestMigrateMeta.php b/tests/Feature/FormMigration/Steps/TestMigrateMeta.php
new file mode 100644
index 0000000000..2237593e0c
--- /dev/null
+++ b/tests/Feature/FormMigration/Steps/TestMigrateMeta.php
@@ -0,0 +1,36 @@
+createSimpleDonationForm();
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, MigrateMeta::class);
+
+ // Assert
+ $this->assertSame($v2Form->id, (int) give_get_meta($v3Form->id, 'migratedFormId', true));
+ }
+}
diff --git a/tests/Feature/FormMigration/Steps/TestOfflineDonations.php b/tests/Feature/FormMigration/Steps/TestOfflineDonations.php
new file mode 100644
index 0000000000..85b707cbda
--- /dev/null
+++ b/tests/Feature/FormMigration/Steps/TestOfflineDonations.php
@@ -0,0 +1,61 @@
+ 'custom',
+ '_give_offline_donation_enable_billing_fields_single' => 'enabled',
+ ];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, OfflineDonations::class);
+
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp/billing-address');
+ $this->assertNotNull($block);
+ }
+
+ /**
+ * @since 3.16.0
+ */
+ public function testOfflineDonationsProcessMigratesNotes(): void
+ {
+ // Arrange
+ $instructions = 'Please send a check to 123 Main St.';
+ $meta = [
+ '_give_customize_offline_donations' => 'custom',
+ '_give_offline_checkout_notes' => $instructions,
+ ];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, OfflineDonations::class);
+
+ // Assert
+ $this->assertEquals($instructions, $v3Form->settings->offlineDonationInstructions);
+ }
+}
diff --git a/tests/Feature/FormMigration/Steps/TestPaymentGateways.php b/tests/Feature/FormMigration/Steps/TestPaymentGateways.php
new file mode 100644
index 0000000000..22f820ce03
--- /dev/null
+++ b/tests/Feature/FormMigration/Steps/TestPaymentGateways.php
@@ -0,0 +1,47 @@
+ 'enabled',
+ '_give_stripe_default_account' => 'acct_1',
+ '_give_customize_offline_donations' => 'enabled',
+ '_give_offline_checkout_notes' => 'Offline checkout notes',
+ ];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, PaymentGateways::class);
+
+ // Assert
+ $block = $v3Form->blocks->findByName('givewp/payment-gateways');
+ $this->assertFalse($block->getAttribute('stripeUseGlobalDefault'));
+ $this->assertSame('acct_1', $block->getAttribute('accountId'));
+ $this->assertTrue($block->getAttribute('offlineEnabled'));
+ $this->assertFalse($block->getAttribute('offlineUseGlobalInstructions'));
+ $this->assertSame('Offline checkout notes', $block->getAttribute('offlineDonationInstructions'));
+ }
+}
diff --git a/tests/Feature/FormMigration/Steps/TestPdfSettings.php b/tests/Feature/FormMigration/Steps/TestPdfSettings.php
new file mode 100644
index 0000000000..fbca731b03
--- /dev/null
+++ b/tests/Feature/FormMigration/Steps/TestPdfSettings.php
@@ -0,0 +1,73 @@
+ 'enabled',
+ 'give_pdf_generation_method' => 'auto',
+ 'give_pdf_colorpicker' => '#FF5733',
+ 'give_pdf_templates' => 'custom_template',
+ 'give_pdf_logo_upload' => 'logo.png',
+ 'give_pdf_company_name' => 'My Company',
+ 'give_pdf_address_line1' => '123 Main St',
+ 'give_pdf_address_line2' => 'Apt 4B',
+ 'give_pdf_address_city_state_zip' => 'New York, NY 10001',
+ 'give_pdf_url' => 'https://example.com',
+ 'give_pdf_email_address' => 'info@example.com',
+ 'give_pdf_header_message' => 'Thank you for your donation!',
+ 'give_pdf_footer_message' => 'Footer message here.',
+ 'give_pdf_additional_notes' => 'Additional notes...',
+ 'give_pdf_receipt_template' => 'custom_template',
+ 'give_pdf_receipt_template_name' => 'Custom Template Name',
+ 'give_pdf_builder_page_size' => 'A4',
+ 'give_pdf_builder' => 'custom_builder',
+ ];
+ $v2Form = $this->createSimpleDonationForm(['meta' => $meta]);
+
+ // Act
+ $v3Form = $this->migrateForm($v2Form, PdfSettings::class);
+
+ // Assert
+ $this->assertEquals($meta['give_pdf_receipts_enable_disable'], $v3Form->settings->pdfSettings['enable']);
+ $this->assertEquals($meta['give_pdf_generation_method'], $v3Form->settings->pdfSettings['generationMethod']);
+ $this->assertEquals($meta['give_pdf_colorpicker'], $v3Form->settings->pdfSettings['colorPicker']);
+ $this->assertEquals($meta['give_pdf_templates'], $v3Form->settings->pdfSettings['templateId']);
+ $this->assertEquals($meta['give_pdf_logo_upload'], $v3Form->settings->pdfSettings['logoUpload']);
+ $this->assertEquals($meta['give_pdf_company_name'], $v3Form->settings->pdfSettings['name']);
+ $this->assertEquals($meta['give_pdf_address_line1'], $v3Form->settings->pdfSettings['addressLine1']);
+ $this->assertEquals($meta['give_pdf_address_line2'], $v3Form->settings->pdfSettings['addressLine2']);
+ $this->assertEquals($meta['give_pdf_address_city_state_zip'], $v3Form->settings->pdfSettings['cityStateZip']);
+ $this->assertEquals($meta['give_pdf_url'], $v3Form->settings->pdfSettings['displayWebsiteUrl']);
+ $this->assertEquals($meta['give_pdf_email_address'], $v3Form->settings->pdfSettings['emailAddress']);
+ $this->assertEquals($meta['give_pdf_header_message'], $v3Form->settings->pdfSettings['headerMessage']);
+ $this->assertEquals($meta['give_pdf_footer_message'], $v3Form->settings->pdfSettings['footerMessage']);
+ $this->assertEquals($meta['give_pdf_additional_notes'], $v3Form->settings->pdfSettings['additionalNotes']);
+ $this->assertEquals($meta['give_pdf_receipt_template'], $v3Form->settings->pdfSettings['customTemplateId']);
+ $this->assertEquals($meta['give_pdf_receipt_template_name'], $v3Form->settings->pdfSettings['customTemplateName']);
+ $this->assertEquals($meta['give_pdf_builder_page_size'], $v3Form->settings->pdfSettings['customPageSize']);
+ $this->assertEquals($meta['give_pdf_builder'], $v3Form->settings->pdfSettings['customPdfBuilder']);
+ }
+}
diff --git a/tests/Feature/FormMigration/Steps/TestRazorpayPerFormSettings.php b/tests/Feature/FormMigration/Steps/TestRazorpayPerFormSettings.php
new file mode 100644
index 0000000000..97e2934e41
--- /dev/null
+++ b/tests/Feature/FormMigration/Steps/TestRazorpayPerFormSettings.php
@@ -0,0 +1,82 @@
+ 'global',
+ ];
+ $formV2 = $this->createSimpleDonationForm(['meta' => $meta]);
+ $payload = FormMigrationPayload::fromFormV2($formV2);
+ $razorpayPerFormSettings = new RazorpayPerFormSettings($payload);
+
+ $this->assertNotTrue($razorpayPerFormSettings->canHandle());
+ }
+
+ /**
+ * @since 3.14.0
+ */
+ public function testCanHandleShouldReturnTrue()
+ {
+ $meta = [
+ 'razorpay_per_form_account_options' => 'enabled',
+ ];
+ $formV2 = $this->createSimpleDonationForm(['meta' => $meta]);
+ $payload = FormMigrationPayload::fromFormV2($formV2);
+ $razorpayPerFormSettings = new RazorpayPerFormSettings($payload);
+
+ $this->assertTrue($razorpayPerFormSettings->canHandle());
+ }
+
+ /**
+ * @since 3.14.0
+ */
+ public function testProcessShouldUpdatePaymentGatewaysBlockAttributes(): void
+ {
+ $liveKeyId = 'live_12304567890';
+ $liveSecretKey = 'live_0123456789';
+ $testKeyId = 'test_12304567890';
+ $testSecretKey = 'test_0123456789';
+
+ $meta = [
+ 'razorpay_per_form_account_options' => 'enabled',
+ 'razorpay_per_form_live_merchant_key_id' => $liveKeyId,
+ 'razorpay_per_form_live_merchant_secret_key' => $liveSecretKey,
+ 'razorpay_per_form_test_merchant_key_id' => $testKeyId,
+ 'razorpay_per_form_test_merchant_secret_key' => $testSecretKey,
+ ];
+
+ $formV2 = $this->createSimpleDonationForm(['meta' => $meta]);
+
+ $payload = FormMigrationPayload::fromFormV2($formV2);
+
+ $razorpayPerFormSettings = new RazorpayPerFormSettings($payload);
+ $razorpayPerFormSettings->process();
+
+ $paymentGatewaysBlock = $payload->formV3->blocks->findByName('givewp/payment-gateways');
+
+ $this->assertSame(false, $paymentGatewaysBlock->getAttribute('razorpayUseGlobalSettings'));
+ $this->assertSame($liveKeyId, $paymentGatewaysBlock->getAttribute('razorpayLiveKeyId'));
+ $this->assertSame($liveSecretKey, $paymentGatewaysBlock->getAttribute('razorpayLiveSecretKey'));
+ $this->assertSame($testKeyId, $paymentGatewaysBlock->getAttribute('razorpayTestKeyId'));
+ $this->assertSame($testSecretKey, $paymentGatewaysBlock->getAttribute('razorpayTestSecretKey'));
+ }
+}
+
diff --git a/tests/Feature/FormMigration/TestFormMetaDecorator.php b/tests/Feature/FormMigration/TestFormMetaDecorator.php
index 8fb2ccc352..4bd5c340e2 100644
--- a/tests/Feature/FormMigration/TestFormMetaDecorator.php
+++ b/tests/Feature/FormMigration/TestFormMetaDecorator.php
@@ -333,7 +333,7 @@ public function testIsDoubleTheDonationLabelSetShouldReturnTrue(): void
}
/**
- * @unreleased
+ * @since 3.13.0
*/
public function testGetCurrencySwitcherStatus(): void
{
@@ -356,7 +356,7 @@ public function testGetCurrencySwitcherStatus(): void
}
/**
- * @unreleased
+ * @since 3.13.0
*/
public function testGetCurrencySwitcherMessage(): void
{
@@ -385,7 +385,7 @@ public function testGetCurrencySwitcherMessage(): void
}
/**
- * @unreleased
+ * @since 3.13.0
*/
public function testGetCurrencySwitcherDefaultCurrency(): void
{
@@ -408,7 +408,7 @@ public function testGetCurrencySwitcherDefaultCurrency(): void
}
/**
- * @unreleased
+ * @since 3.13.0
*/
public function testGetCurrencySwitcherSupportedCurrencies(): void
{
diff --git a/tests/Framework/Support/ValueObjects/Enum/EnumConflict.php b/tests/Framework/Support/ValueObjects/Enum/EnumConflict.php
new file mode 100644
index 0000000000..41ca8d9791
--- /dev/null
+++ b/tests/Framework/Support/ValueObjects/Enum/EnumConflict.php
@@ -0,0 +1,21 @@
+
+ * @author Mirosław Filip
+ */
+class EnumConflict extends Enum
+{
+ const FOO = "foo";
+ const BAR = "bar";
+}
diff --git a/tests/Framework/Support/ValueObjects/Enum/EnumFixture.php b/tests/Framework/Support/ValueObjects/Enum/EnumFixture.php
new file mode 100644
index 0000000000..8c75071ec1
--- /dev/null
+++ b/tests/Framework/Support/ValueObjects/Enum/EnumFixture.php
@@ -0,0 +1,36 @@
+
+ * @author Mirosław Filip
+ */
+class EnumFixture extends Enum
+{
+ const FOO = "foo";
+ const BAR = "bar";
+ const NUMBER = 42;
+
+ /**
+ * Values that are known to cause problems when used with soft typing
+ */
+ const PROBLEMATIC_NUMBER = 0;
+ const PROBLEMATIC_NULL = null;
+ const PROBLEMATIC_EMPTY_STRING = '';
+ const PROBLEMATIC_BOOLEAN_FALSE = false;
+}
diff --git a/tests/Framework/Support/ValueObjects/Enum/InheritedEnumFixture.php b/tests/Framework/Support/ValueObjects/Enum/InheritedEnumFixture.php
new file mode 100644
index 0000000000..7bd1ed64c2
--- /dev/null
+++ b/tests/Framework/Support/ValueObjects/Enum/InheritedEnumFixture.php
@@ -0,0 +1,15 @@
+assertEquals(EnumFixture::FOO, $value->getValue());
+
+ $value = new EnumFixture(EnumFixture::BAR);
+ $this->assertEquals(EnumFixture::BAR, $value->getValue());
+
+ $value = new EnumFixture(EnumFixture::NUMBER);
+ $this->assertEquals(EnumFixture::NUMBER, $value->getValue());
+ }
+
+ /**
+ * getKey()
+ */
+ public function testGetKey()
+ {
+ $value = new EnumFixture(EnumFixture::FOO);
+ $this->assertEquals('FOO', $value->getKey());
+ $this->assertNotEquals('BA', $value->getKey());
+ }
+
+ /** @dataProvider invalidValueProvider */
+ public function testCreatingEnumWithInvalidValue($value)
+ {
+ $this->expectException(\UnexpectedValueException::class);
+ $this->expectExceptionMessage('is not part of the enum ' . EnumFixture::class);
+
+ new EnumFixture($value);
+ }
+
+ /**
+ * @dataProvider invalidValueProvider
+ * @param mixed $value
+ */
+ public function testFailToCreateEnumWithInvalidValueThroughNamedConstructor($value): void
+ {
+ $this->expectException(\UnexpectedValueException::class);
+
+ EnumFixture::from($value);
+ }
+
+ public function testFailToCreateEnumWithEnumItselfThroughNamedConstructor(): void
+ {
+ $this->expectException(\UnexpectedValueException::class);
+
+ EnumFixture::from(EnumFixture::FOO());
+ }
+
+ /**
+ * Contains values not existing in EnumFixture
+ * @return array
+ */
+ public function invalidValueProvider()
+ {
+ return array(
+ "string" => array('test'),
+ "int" => array(1234),
+ );
+ }
+
+ /**
+ * __toString()
+ * @dataProvider toStringProvider
+ */
+ public function testToString($expected, $enumObject)
+ {
+ $this->assertSame($expected, (string) $enumObject);
+ }
+
+ public function toStringProvider()
+ {
+ return array(
+ array(EnumFixture::FOO, new EnumFixture(EnumFixture::FOO)),
+ array(EnumFixture::BAR, new EnumFixture(EnumFixture::BAR)),
+ array((string) EnumFixture::NUMBER, new EnumFixture(EnumFixture::NUMBER)),
+ );
+ }
+
+ /**
+ * keys()
+ */
+ public function testKeys()
+ {
+ $values = EnumFixture::keys();
+ $expectedValues = array(
+ "FOO",
+ "BAR",
+ "NUMBER",
+ "PROBLEMATIC_NUMBER",
+ "PROBLEMATIC_NULL",
+ "PROBLEMATIC_EMPTY_STRING",
+ "PROBLEMATIC_BOOLEAN_FALSE",
+ );
+
+ $this->assertSame($expectedValues, $values);
+ }
+
+ /**
+ * values()
+ */
+ public function testValues()
+ {
+ $values = EnumFixture::values();
+ $expectedValues = array(
+ "FOO" => new EnumFixture(EnumFixture::FOO),
+ "BAR" => new EnumFixture(EnumFixture::BAR),
+ "NUMBER" => new EnumFixture(EnumFixture::NUMBER),
+ "PROBLEMATIC_NUMBER" => new EnumFixture(EnumFixture::PROBLEMATIC_NUMBER),
+ "PROBLEMATIC_NULL" => new EnumFixture(EnumFixture::PROBLEMATIC_NULL),
+ "PROBLEMATIC_EMPTY_STRING" => new EnumFixture(EnumFixture::PROBLEMATIC_EMPTY_STRING),
+ "PROBLEMATIC_BOOLEAN_FALSE" => new EnumFixture(EnumFixture::PROBLEMATIC_BOOLEAN_FALSE),
+ );
+
+ $this->assertEquals($expectedValues, $values);
+ }
+
+ /**
+ * toArray()
+ */
+ public function testToArray()
+ {
+ $values = EnumFixture::toArray();
+ $expectedValues = array(
+ "FOO" => EnumFixture::FOO,
+ "BAR" => EnumFixture::BAR,
+ "NUMBER" => EnumFixture::NUMBER,
+ "PROBLEMATIC_NUMBER" => EnumFixture::PROBLEMATIC_NUMBER,
+ "PROBLEMATIC_NULL" => EnumFixture::PROBLEMATIC_NULL,
+ "PROBLEMATIC_EMPTY_STRING" => EnumFixture::PROBLEMATIC_EMPTY_STRING,
+ "PROBLEMATIC_BOOLEAN_FALSE" => EnumFixture::PROBLEMATIC_BOOLEAN_FALSE,
+ );
+
+ $this->assertSame($expectedValues, $values);
+ }
+
+ /**
+ * __callStatic()
+ */
+ public function testStaticAccess()
+ {
+ $this->assertEquals(new EnumFixture(EnumFixture::FOO), EnumFixture::FOO());
+ $this->assertEquals(new EnumFixture(EnumFixture::BAR), EnumFixture::BAR());
+ $this->assertEquals(new EnumFixture(EnumFixture::NUMBER), EnumFixture::NUMBER());
+ $this->assertNotSame(EnumFixture::NUMBER(), EnumFixture::NUMBER());
+ }
+
+ public function testBadStaticAccess()
+ {
+ $this->expectException(\BadMethodCallException::class);
+ $this->expectExceptionMessage('No static method or enum constant \'UNKNOWN\' in class ' . EnumFixture::class);
+
+ EnumFixture::UNKNOWN();
+ }
+
+ /**
+ * isValid()
+ * @dataProvider isValidProvider
+ */
+ public function testIsValid($value, $isValid)
+ {
+ $this->assertSame($isValid, EnumFixture::isValid($value));
+ }
+
+ public function isValidProvider()
+ {
+ return [
+ /**
+ * Valid values
+ */
+ ['foo', true],
+ [42, true],
+ [null, true],
+ [0, true],
+ ['', true],
+ [false, true],
+ /**
+ * Invalid values
+ */
+ ['baz', false]
+ ];
+ }
+
+ /**
+ * isValidKey()
+ */
+ public function testIsValidKey()
+ {
+ $this->assertTrue(EnumFixture::isValidKey('FOO'));
+ $this->assertFalse(EnumFixture::isValidKey('BAZ'));
+ $this->assertTrue(EnumFixture::isValidKey('PROBLEMATIC_NULL'));
+ }
+
+ /**
+ * search()
+ * @see https://github.com/myclabs/php-enum/issues/13
+ * @dataProvider searchProvider
+ */
+ public function testSearch($value, $expected)
+ {
+ $this->assertSame($expected, EnumFixture::search($value));
+ }
+
+ public function searchProvider()
+ {
+ return array(
+ array('foo', 'FOO'),
+ array(0, 'PROBLEMATIC_NUMBER'),
+ array(null, 'PROBLEMATIC_NULL'),
+ array('', 'PROBLEMATIC_EMPTY_STRING'),
+ array(false, 'PROBLEMATIC_BOOLEAN_FALSE'),
+ array('bar I do not exist', false),
+ array(array(), false),
+ );
+ }
+
+ /**
+ * equals()
+ */
+ public function testEquals()
+ {
+ $foo = new EnumFixture(EnumFixture::FOO);
+ $number = new EnumFixture(EnumFixture::NUMBER);
+ $anotherFoo = new EnumFixture(EnumFixture::FOO);
+ $objectOfDifferentClass = new \stdClass();
+ $notAnObject = 'foo';
+
+ $this->assertTrue($foo->equals($foo));
+ $this->assertFalse($foo->equals($number));
+ $this->assertTrue($foo->equals($anotherFoo));
+ $this->assertFalse($foo->equals(null));
+ $this->assertFalse($foo->equals($objectOfDifferentClass));
+ $this->assertFalse($foo->equals($notAnObject));
+ }
+
+ /**
+ * equals()
+ */
+ public function testEqualsComparesProblematicValuesProperly()
+ {
+ $false = new EnumFixture(EnumFixture::PROBLEMATIC_BOOLEAN_FALSE);
+ $emptyString = new EnumFixture(EnumFixture::PROBLEMATIC_EMPTY_STRING);
+ $null = new EnumFixture(EnumFixture::PROBLEMATIC_NULL);
+
+ $this->assertTrue($false->equals($false));
+ $this->assertFalse($false->equals($emptyString));
+ $this->assertFalse($emptyString->equals($null));
+ $this->assertFalse($null->equals($false));
+ }
+
+ /**
+ * equals()
+ */
+ public function testEqualsConflictValues()
+ {
+ $this->assertFalse(EnumFixture::FOO()->equals(EnumConflict::FOO()));
+ }
+
+ /**
+ * jsonSerialize()
+ */
+ public function testJsonSerialize()
+ {
+ $this->assertJsonEqualsJson('"foo"', json_encode(new EnumFixture(EnumFixture::FOO)));
+ $this->assertJsonEqualsJson('"bar"', json_encode(new EnumFixture(EnumFixture::BAR)));
+ $this->assertJsonEqualsJson('42', json_encode(new EnumFixture(EnumFixture::NUMBER)));
+ $this->assertJsonEqualsJson('0', json_encode(new EnumFixture(EnumFixture::PROBLEMATIC_NUMBER)));
+ $this->assertJsonEqualsJson('null', json_encode(new EnumFixture(EnumFixture::PROBLEMATIC_NULL)));
+ $this->assertJsonEqualsJson('""', json_encode(new EnumFixture(EnumFixture::PROBLEMATIC_EMPTY_STRING)));
+ $this->assertJsonEqualsJson('false', json_encode(new EnumFixture(EnumFixture::PROBLEMATIC_BOOLEAN_FALSE)));
+ }
+
+ public function testNullableEnum()
+ {
+ $this->assertNull(EnumFixture::PROBLEMATIC_NULL()->getValue());
+ $this->assertNull((new EnumFixture(EnumFixture::PROBLEMATIC_NULL))->getValue());
+ $this->assertNull((new EnumFixture(EnumFixture::PROBLEMATIC_NULL))->jsonSerialize());
+ }
+
+ public function testBooleanEnum()
+ {
+ $this->assertFalse(EnumFixture::PROBLEMATIC_BOOLEAN_FALSE()->getValue());
+ $this->assertFalse((new EnumFixture(EnumFixture::PROBLEMATIC_BOOLEAN_FALSE))->jsonSerialize());
+ }
+
+ public function testConstructWithSameEnumArgument()
+ {
+ $enum = new EnumFixture(EnumFixture::FOO);
+
+ $enveloped = new EnumFixture($enum);
+
+ $this->assertEquals($enum, $enveloped);
+ }
+
+ private function assertJsonEqualsJson($json1, $json2)
+ {
+ $this->assertJsonStringEqualsJsonString($json1, $json2);
+ }
+
+ public function testSerialize()
+ {
+ $bin = bin2hex(serialize(EnumFixture::FOO()));
+
+ $this->assertEquals($bin, bin2hex(serialize(EnumFixture::FOO())));
+ }
+
+ public function testUnserializeVersionWithoutKey()
+ {
+ $bin = bin2hex(serialize(EnumFixture::FOO()));
+
+ /* @var $value EnumFixture */
+ $value = unserialize(pack('H*', $bin));
+
+ $this->assertEquals(EnumFixture::FOO, $value->getValue());
+ $this->assertTrue(EnumFixture::FOO()->equals($value));
+ $this->assertTrue(EnumFixture::FOO() == $value);
+ }
+
+ public function testUnserialize()
+ {
+ $bin = bin2hex(serialize(EnumFixture::FOO()));
+
+ /* @var $value EnumFixture */
+ $value = unserialize(pack('H*', $bin));
+
+ $this->assertEquals(EnumFixture::FOO, $value->getValue());
+ $this->assertTrue(EnumFixture::FOO()->equals($value));
+ $this->assertTrue(EnumFixture::FOO() == $value);
+ }
+
+ /**
+ * @see https://github.com/myclabs/php-enum/issues/95
+ */
+ public function testEnumValuesInheritance()
+ {
+ $this->expectException(\UnexpectedValueException::class);
+ $inheritedEnumFixture = InheritedEnumFixture::VALUE();
+ new EnumFixture($inheritedEnumFixture);
+ }
+
+ /**
+ * @dataProvider isValidProvider
+ */
+ public function testAssertValidValue($value, $isValid): void
+ {
+ if (!$isValid) {
+ $this->expectException(\UnexpectedValueException::class);
+ $this->expectExceptionMessage("Value '$value' is not part of the enum " . EnumFixture::class);
+ }
+
+ EnumFixture::assertValidValue($value);
+
+ self::assertTrue(EnumFixture::isValid($value));
+ }
+}
diff --git a/tests/Unit/DataTransferObjects/DonateFormDataTest.php b/tests/Unit/DataTransferObjects/DonateFormDataTest.php
index 6e325cef5a..f8616e0b52 100644
--- a/tests/Unit/DataTransferObjects/DonateFormDataTest.php
+++ b/tests/Unit/DataTransferObjects/DonateFormDataTest.php
@@ -26,6 +26,7 @@ class DonateFormDataTest extends TestCase
use RefreshDatabase;
/**
+ * @since 3.17.0 updated to ignore honeypot field
* @since 3.0.0
*
* @return void
@@ -44,6 +45,8 @@ public function testShouldTransformToDonationModel()
return TestGateway::id();
});
+ add_filter("givewp_donation_forms_honeypot_enabled", "__return_false");
+
$data = (object)[
'gatewayId' => TestGateway::id(),
'amount' => 50,
diff --git a/tests/Unit/DataTransferObjects/DonateFormRouteDataTest.php b/tests/Unit/DataTransferObjects/DonateFormRouteDataTest.php
index c7466ef474..8e8133328b 100644
--- a/tests/Unit/DataTransferObjects/DonateFormRouteDataTest.php
+++ b/tests/Unit/DataTransferObjects/DonateFormRouteDataTest.php
@@ -2,9 +2,13 @@
namespace TestsNextGen\Unit\DataTransferObjects;
+use Exception;
use Give\DonationForms\DataTransferObjects\DonateControllerData;
use Give\DonationForms\DataTransferObjects\DonateFormRouteData;
+use Give\DonationForms\Exceptions\DonationFormFieldErrorsException;
+use Give\DonationForms\Exceptions\DonationFormForbidden;
use Give\DonationForms\Models\DonationForm;
+use Give\DonationForms\ValueObjects\DonationFormStatus;
use Give\Donations\ValueObjects\DonationType;
use Give\Framework\Blocks\BlockCollection;
use Give\Framework\Blocks\BlockModel;
@@ -19,6 +23,7 @@ class DonateFormRouteDataTest extends TestCase
{
/**
+ * @since 3.17.0 updated to ignore honeypot field
* @since 3.0.0
*/
public function testValidatedShouldReturnValidatedData()
@@ -34,6 +39,8 @@ public function testValidatedShouldReturnValidatedData()
return TestGateway::id();
});
+ add_filter("givewp_donation_forms_honeypot_enabled", "__return_false");
+
$customFieldBlockModel = BlockModel::make([
'name' => 'givewp/section',
'attributes' => ['title' => '', 'description' => ''],
@@ -92,6 +99,7 @@ public function testValidatedShouldReturnValidatedData()
}
/**
+ * @since 3.17.0 updated to ignore honeypot field
* @since 3.0.0
*/
public function testValidatedShouldReturnValidatedDataWithSubscriptionData()
@@ -107,6 +115,8 @@ public function testValidatedShouldReturnValidatedDataWithSubscriptionData()
return TestGateway::id();
});
+ add_filter("givewp_donation_forms_honeypot_enabled", "__return_false");
+
$customFieldBlockModel = BlockModel::make([
'name' => 'givewp/section',
'attributes' => ['title' => '', 'description' => ''],
@@ -226,4 +236,154 @@ public function testValidatedShouldReturnValidatedDataWithSubscriptionData()
$this->assertEquals($validData, $data);
}
+
+ /**
+ * @since 3.14.0
+ * @dataProvider donationFormStatusProvider
+ * @throws Exception
+ */
+ public function testValidatedShouldThrowExceptionDonationFormForbidden(DonationFormStatus $formStatus): void
+ {
+ $this->expectException(DonationFormForbidden::class);
+
+ /** @var DonationForm $form */
+ $form = DonationForm::factory()->create(['status' => $formStatus]);
+
+ add_filter('give_get_option_gateways', static function ($gateways) {
+ return array_merge($gateways, [TestGateway::id() => true]);
+ });
+
+ add_filter('give_default_gateway', static function () {
+ return TestGateway::id();
+ });
+
+ $form->save();
+
+ $form = DonationForm::find($form->id);
+
+ $data = new DonateControllerData();
+
+ $data->gatewayId = TestGateway::id();
+ $data->amount = 100;
+ $data->currency = "USD";
+ $data->firstName = "Bill";
+ $data->lastName = "Murray";
+ $data->email = "billmurray@givewp.com";
+ $data->formId = $form->id;
+ $data->formTitle = $form->title;
+ $data->company = null;
+ $data->wpUserId = 0;
+ $data->honorific = null;
+ $data->donationType = DonationType::SINGLE();
+ $data->subscriptionFrequency = null;
+ $data->subscriptionPeriod = null;
+ $data->subscriptionInstallments = null;
+ $data->country = null;
+ $data->address1 = null;
+ $data->address2 = null;
+ $data->city = null;
+ $data->state = null;
+ $data->zip = null;
+
+ $request = array_merge(get_object_vars($data), [
+ 'donationType' => $data->donationType->getValue(),
+ ]);
+
+ $formData = DonateFormRouteData::fromRequest($request);
+
+ $formData->validated();
+ }
+
+ /**
+ * @since 3.14.0
+ * @throws Exception
+ */
+ public function testValidatedShouldThrowExceptionDonationFormFieldErrorsException(): void
+ {
+
+ $this->expectException(DonationFormFieldErrorsException::class);
+
+ /** @var DonationForm $form */
+ $form = DonationForm::factory()->create();
+
+ add_filter('give_get_option_gateways', static function ($gateways) {
+ return array_merge($gateways, [TestGateway::id() => true]);
+ });
+
+ add_filter('give_default_gateway', static function () {
+ return TestGateway::id();
+ });
+
+ $customFieldBlockModel = BlockModel::make([
+ 'name' => 'givewp/section',
+ 'attributes' => ['title' => '', 'description' => ''],
+ 'innerBlocks' => [
+ [
+ 'name' => 'givewp/text',
+ 'attributes' => [
+ 'fieldName' => 'text_block_meta',
+ 'title' => 'Custom Text Field',
+ 'description' => '',
+ 'isRequired' => true
+ ],
+ ]
+ ]
+ ]);
+
+ $form->blocks = BlockCollection::make(
+ array_merge([$customFieldBlockModel], $form->blocks->getBlocks())
+ );
+
+ $form->save();
+
+ $data = new DonateControllerData();
+
+ $data->gatewayId = TestGateway::id();
+ $data->amount = 100;
+ $data->currency = "USD";
+ $data->firstName = "Bill";
+ $data->lastName = "Murray";
+ $data->email = "billmurray@givewp.com";
+ $data->formId = $form->id;
+ $data->formTitle = $form->title;
+ $data->company = null;
+ $data->wpUserId = 0;
+ $data->honorific = null;
+ $data->text_block_meta = null;
+ $data->donationType = DonationType::SINGLE();
+ $data->subscriptionFrequency = null;
+ $data->subscriptionPeriod = null;
+ $data->subscriptionInstallments = null;
+ $data->country = null;
+ $data->address1 = null;
+ $data->address2 = null;
+ $data->city = null;
+ $data->state = null;
+ $data->zip = null;
+
+ $request = array_merge(get_object_vars($data), [
+ 'text_block_meta' => null,
+ 'donationType' => $data->donationType->getValue(),
+ ]);
+
+ $formData = DonateFormRouteData::fromRequest($request);
+
+ $formData->validated();
+ }
+
+ /**
+ * @since 3.14.0
+ */
+ public function donationFormStatusProvider(): array
+ {
+ $notAllowed = [];
+ $allowed = [DonationFormStatus::PUBLISHED()->getValue()];
+ foreach (DonationFormStatus::values() as $status) {
+ if (!in_array($status->getValue(), $allowed, true)) {
+ $notAllowed[] = [$status];
+ }
+ }
+
+ return $notAllowed;
+ }
}
diff --git a/tests/Unit/DonationForms/Actions/TestAddHoneyPotFieldToDonationForms.php b/tests/Unit/DonationForms/Actions/TestAddHoneyPotFieldToDonationForms.php
new file mode 100644
index 0000000000..6deb2fcc46
--- /dev/null
+++ b/tests/Unit/DonationForms/Actions/TestAddHoneyPotFieldToDonationForms.php
@@ -0,0 +1,47 @@
+append(Section::make('section-1'), Section::make('section-2'), Section::make('section-3'));
+ $action = new AddHoneyPotFieldToDonationForms();
+ $action($formNode, $fieldName);
+
+ /** @var Section $lastSection */
+ $lastSection = $formNode->getNodeByName('section-3');
+
+ /** @var Honeypot $field */
+ $field = $lastSection->getNodeByName($fieldName);
+ $this->assertNotNull($field);
+ $this->assertInstanceOf(Honeypot::class, $field);
+ $this->assertSame('My Honeypot Field Name', $field->getLabel());
+ $this->assertTrue($field->hasRule('honeypot'));
+ $this->assertFalse($field->shouldShowInAdmin());
+ $this->assertFalse($field->shouldShowInReceipt());
+ }
+}
diff --git a/tests/Unit/DonationForms/Actions/TestReplaceGiveReceiptShortcodeViewWithDonationConfirmationIframe.php b/tests/Unit/DonationForms/Actions/TestReplaceGiveReceiptShortcodeViewWithDonationConfirmationIframe.php
new file mode 100644
index 0000000000..78ce13d217
--- /dev/null
+++ b/tests/Unit/DonationForms/Actions/TestReplaceGiveReceiptShortcodeViewWithDonationConfirmationIframe.php
@@ -0,0 +1,59 @@
+assertEquals($view, $result);
+ }
+
+ /**
+ * @since 3.16.0
+ */
+ public function testShouldNotReplaceGiveReceiptShortcodeViewWithDonationConfirmationIframeIfInvalidReceiptId(): void
+ {
+ $view = 'originalView';
+ $_GET['receipt_id'] = 1234;
+
+ $result = (new ReplaceGiveReceiptShortcodeViewWithDonationConfirmationIframe())($view);
+
+ $this->assertEquals($view, $result);
+ }
+
+ /**
+ * @since 3.16.0
+ */
+ public function testShouldReplaceGiveReceiptShortcodeViewWithDonationConfirmationIframe(): void
+ {
+ /** @var Donation $donation */
+ $donation = Donation::factory()->create();
+ $view = 'originalView';
+ $receiptId = $donation->purchaseKey;
+ $_GET['receipt-id'] = $receiptId;
+
+ $result = (new ReplaceGiveReceiptShortcodeViewWithDonationConfirmationIframe())($view);
+ $replacedViewUrl = (new GenerateDonationConfirmationReceiptViewRouteUrl())($receiptId);
+
+ $this->assertEquals("", $result);
+ }
+}
diff --git a/tests/Unit/DonationForms/Repositories/TestDonationFormRepository.php b/tests/Unit/DonationForms/Repositories/TestDonationFormRepository.php
index 143f7e6443..79ea8175cf 100644
--- a/tests/Unit/DonationForms/Repositories/TestDonationFormRepository.php
+++ b/tests/Unit/DonationForms/Repositories/TestDonationFormRepository.php
@@ -252,6 +252,7 @@ public function testIsLegacyFormShouldReturnFalseIfNotLegacy()
/**
+ * @since 3.17.0 updated to disable honeypot
* @since 3.0.0
*
* @return void
@@ -286,6 +287,8 @@ public function testGetFormSchemaFromBlocksShouldReturnFormSchema()
$blocks = BlockCollection::make([$block]);
+ add_filter("givewp_donation_forms_honeypot_enabled", "__return_false");
+
/** @var Form $formSchema */
$formSchema = $this->repository->getFormSchemaFromBlocks($formId, $blocks);
diff --git a/tests/Unit/DonationForms/Rules/TestHoneyPotRule.php b/tests/Unit/DonationForms/Rules/TestHoneyPotRule.php
new file mode 100644
index 0000000000..c4db7135f4
--- /dev/null
+++ b/tests/Unit/DonationForms/Rules/TestHoneyPotRule.php
@@ -0,0 +1,54 @@
+expectException(SpamDonationException::class);
+ }
+
+ $rule = new HoneyPotRule();
+
+ self::assertValidationRulePassed($rule, $value);
+ }
+
+ /**
+ * @since 3.16.2
+ *
+ * @return array>
+ */
+ public function honeyPotProvider(): array
+ {
+ return [
+ // Valid
+ ['', true],
+ [null, true],
+
+ // Invalid
+ ['123', false],
+ ['anything', false],
+ [123, false],
+ [['123'], false],
+ [[123], false],
+ ];
+ }
+}
diff --git a/tests/Unit/DonationForms/TestTraits/HasValidationRules.php b/tests/Unit/DonationForms/TestTraits/HasValidationRules.php
new file mode 100644
index 0000000000..c1cf3e3f72
--- /dev/null
+++ b/tests/Unit/DonationForms/TestTraits/HasValidationRules.php
@@ -0,0 +1,54 @@
+ 'true'];
+ protected $notSpamResponse = [1 => 'false'];
+
+ /**
+ * @since 3.15.0
+ */
+ public function testValidatesNotSpamDonation()
+ {
+ $data = new DonateControllerData();
+
+ /** @var API|PHPUnit_Framework_MockObject_MockObject */
+ $akismet = $this->mockAkismetAPI();
+ $akismet->method('commentCheck')->willReturn($this->notSpamResponse);
+
+ $action = new ValidateDonation(
+ $akismet,
+ new EmailAddressWhiteList()
+ );
+
+ $action->__invoke($data);
+
+ $this->assertTrue(true); // Assert no exception thrown.
+ }
+
+ /**
+ * @since 3.15.0
+ */
+ public function testThrowsSpamDonationException()
+ {
+ $data = new DonateControllerData();
+
+ /** @var API|PHPUnit_Framework_MockObject_MockObject */
+ $akismet = $this->mockAkismetAPI();
+ $akismet->method('commentCheck')->willReturn($this->spamResponse);
+
+ $action = new ValidateDonation(
+ $akismet,
+ new EmailAddressWhiteList()
+ );
+
+ $this->expectException(SpamDonationException::class);
+
+ $action->__invoke($data);
+ }
+
+ /**
+ * @since 3.15.0
+ */
+ protected function mockAkismetAPI()
+ {
+ return $this->createMock(API::class, function(PHPUnit_Framework_MockObject_MockBuilder $mockBuilder) {
+ $mockBuilder->setMethods(['commentCheck']);
+ return $mockBuilder->getMock();
+ });
+ }
+}
diff --git a/tests/Unit/DonationSpam/EmailAddressWhiteListTest.php b/tests/Unit/DonationSpam/EmailAddressWhiteListTest.php
new file mode 100644
index 0000000000..cc22374f10
--- /dev/null
+++ b/tests/Unit/DonationSpam/EmailAddressWhiteListTest.php
@@ -0,0 +1,30 @@
+assertTrue($validator->validate('admin@wordpress.test'));
+ }
+
+ /**
+ * @since 3.15.0
+ */
+ public function testDoesNotValidateNonWhitelistedEmailAddress()
+ {
+ $validator = new EmailAddressWhiteList(['admin@wordpress.test']);
+ $this->assertFalse($validator->validate('subscriber@wordpress.test'));
+ }
+}
diff --git a/tests/Unit/DonationSpam/ServiceProviderTest.php b/tests/Unit/DonationSpam/ServiceProviderTest.php
new file mode 100644
index 0000000000..4b832bd536
--- /dev/null
+++ b/tests/Unit/DonationSpam/ServiceProviderTest.php
@@ -0,0 +1,25 @@
+validate('name@email.test');
+
+ $this->assertTrue(true);
+ }
+}
diff --git a/tests/Unit/DonorDashboards/Repositories/TestProfile.php b/tests/Unit/DonorDashboards/Repositories/TestProfile.php
new file mode 100644
index 0000000000..e0388276a4
--- /dev/null
+++ b/tests/Unit/DonorDashboards/Repositories/TestProfile.php
@@ -0,0 +1,104 @@
+user->create_and_get();
+
+ /** @var Donor $donor */
+ $donor = Donor::factory()->create([
+ 'userId' => $user->ID,
+ ]);
+
+ wp_set_current_user($donor->userId);
+
+ $attachment = self::factory()->attachment->create_and_get([
+ 'post_author' => $donor->userId,
+ 'post_title' => 'test',
+ 'post_content' => 'test',
+ 'post_status' => 'inherit',
+ 'post_mime_type' => 'image/jpeg',
+ ]);
+
+ give()->donor_meta->update_meta($donor->id, '_give_donor_avatar_id', $attachment->ID);
+
+ $profileRepository = new Profile();
+
+ $this->assertTrue($profileRepository->avatarBelongsToCurrentUser());
+ }
+
+ /**
+ * @since 3.14.2
+ */
+ public function testAvatarBelongsToCurrentUserShouldReturnTrueWithAvatarParam(): void
+ {
+ $user = self::factory()->user->create_and_get();
+
+ /** @var Donor $donor */
+ $donor = Donor::factory()->create([
+ 'userId' => $user->ID,
+ ]);
+
+ wp_set_current_user($donor->userId);
+
+ $attachment = self::factory()->attachment->create_and_get([
+ 'post_author' => $donor->userId,
+ 'post_title' => 'test',
+ 'post_content' => 'test',
+ 'post_status' => 'inherit',
+ 'post_mime_type' => 'image/jpeg',
+ ]);
+
+ give()->donor_meta->update_meta($donor->id, '_give_donor_avatar_id', $attachment->ID);
+
+ $profileRepository = new Profile();
+
+ $this->assertTrue($profileRepository->avatarBelongsToCurrentUser($attachment->ID));
+ }
+
+ /**
+ * @since 3.14.2
+ */
+ public function testAvatarBelongsToCurrentUserShouldReturnFalse(): void
+ {
+ $user = self::factory()->user->create_and_get();
+
+ /** @var Donor $donor */
+ $donor = Donor::factory()->create([
+ 'userId' => $user->ID,
+ ]);
+
+ wp_set_current_user($donor->userId);
+
+ $attachment = self::factory()->attachment->create_and_get([
+ 'post_author' => $donor->userId + 1, // Different user
+ 'post_title' => 'test',
+ 'post_content' => 'test',
+ 'post_status' => 'inherit',
+ 'post_mime_type' => 'image/jpeg',
+ ]);
+
+ give()->donor_meta->update_meta($donor->id, '_give_donor_avatar_id', $attachment->ID);
+
+
+ $profileRepository = new Profile();
+
+ $this->assertFalse($profileRepository->avatarBelongsToCurrentUser());
+ }
+}
diff --git a/tests/Unit/FormBuilder/ServiceProviderTest.php b/tests/Unit/FormBuilder/ServiceProviderTest.php
new file mode 100644
index 0000000000..cb295dfb17
--- /dev/null
+++ b/tests/Unit/FormBuilder/ServiceProviderTest.php
@@ -0,0 +1,29 @@
+factory()->user->create();
+ wp_set_current_user($userId);
+
+ do_action('wp_ajax_givewp_additional_payment_gateways_hide_notice');
+
+ $this->assertTrue(
+ (bool) get_user_meta($userId, 'givewp-additional-payment-gateways-notice-dismissed', true)
+ );
+ }
+}
diff --git a/tests/Unit/FormMigration/Steps/FormTaxonomiesTest.php b/tests/Unit/FormMigration/Steps/FormTaxonomiesTest.php
new file mode 100644
index 0000000000..7679288852
--- /dev/null
+++ b/tests/Unit/FormMigration/Steps/FormTaxonomiesTest.php
@@ -0,0 +1,151 @@
+createSimpleDonationForm();
+ $donationFormV3 = DonationForm::factory()->create();
+
+ give_update_option('tags', 'enabled');
+ give_setup_taxonomies();
+
+ $tag = wp_create_term('aye', 'give_forms_tag');
+ wp_set_post_terms($donationFormV2->id, [$tag['term_id']], 'give_forms_tag');
+
+ $step = new FormTaxonomies(
+ new FormMigrationPayload($donationFormV2, $donationFormV3)
+ );
+ $step->process();
+
+ $this->assertContains(
+ $tag['term_id'],
+ wp_list_pluck(get_the_terms($donationFormV3->id, 'give_forms_tag'), 'term_id')
+ );
+ }
+
+ /**
+ * @since 3.16.0
+ */
+ public function testDoesNotMigrateFormTagsWhenTagsDisabled()
+ {
+ $donationFormV2 = $this->createSimpleDonationForm();
+ $donationFormV3 = DonationForm::factory()->create();
+
+ give_update_option('tags', 'enabled');
+ give_setup_taxonomies();
+
+ $tag = wp_create_term('aye', 'give_forms_tag');
+ wp_set_post_terms($donationFormV2->id, [$tag['term_id']], 'give_forms_tag');
+
+ give_update_option('tags', 'disabled');
+ unregister_taxonomy('give_forms_tag');
+
+ $step = new FormTaxonomies(
+ new FormMigrationPayload($donationFormV2, $donationFormV3)
+ );
+ $step->process();
+
+ $this->assertNotContains(
+ $tag['term_id'],
+ wp_list_pluck(get_the_terms($donationFormV3->id, 'give_forms_tag'), 'term_id')
+ );
+ }
+
+ /**
+ * @since 3.16.0
+ */
+ public function testMigratesFormCategories()
+ {
+ $donationFormV2 = $this->createSimpleDonationForm();
+ $donationFormV3 = DonationForm::factory()->create();
+
+ give_update_option('categories', 'enabled');
+ give_setup_taxonomies();
+
+ $category = wp_create_term('bee', 'give_forms_category');
+ wp_set_post_terms($donationFormV2->id, [$category['term_id']], 'give_forms_category');
+
+ give_update_option('categories', 'disabled');
+ unregister_taxonomy('give_forms_tag');
+
+ $step = new FormTaxonomies(
+ new FormMigrationPayload($donationFormV2, $donationFormV3)
+ );
+ $step->process();
+
+ $this->assertContains(
+ $category['term_id'],
+ wp_list_pluck(get_the_terms($donationFormV3->id, 'give_forms_category'), 'term_id')
+ );
+ }
+
+ /**
+ * @since 3.16.0
+ */
+ public function testDoesNotMigrateFormCategoriesWhenCategoriesDisabled()
+ {
+ $donationFormV2 = $this->createSimpleDonationForm();
+ $donationFormV3 = DonationForm::factory()->create();
+
+ give_update_option('categories', 'enabled');
+ give_setup_taxonomies();
+
+ $category = wp_create_term('bee', 'give_forms_category');
+ wp_set_post_terms($donationFormV2->id, [$category['term_id']], 'give_forms_category');
+
+ $step = new FormTaxonomies(
+ new FormMigrationPayload($donationFormV2, $donationFormV3)
+ );
+ $step->process();
+
+ $this->assertContains(
+ $category['term_id'],
+ wp_list_pluck(get_the_terms($donationFormV3->id, 'give_forms_category'), 'term_id')
+ );
+ }
+
+ /**
+ * @since 3.16.0
+ */
+ public function testMigratesOnlySelectedTerms()
+ {
+ $donationFormV2 = $this->createSimpleDonationForm();
+ $donationFormV3 = DonationForm::factory()->create();
+
+ give_update_option('tags', 'enabled');
+ give_setup_taxonomies();
+
+ $term1 = wp_create_term('aye', 'give_forms_tag');
+ $term2 = wp_create_term('bee', 'give_forms_tag');
+ wp_set_post_terms($donationFormV2->id, [$term1['term_id']], 'give_forms_tag');
+
+ $step = new FormTaxonomies(
+ new FormMigrationPayload($donationFormV2, $donationFormV3)
+ );
+ $step->process();
+
+ $migratedTermIds = wp_list_pluck(get_the_terms($donationFormV3->id, 'give_forms_tag'), 'term_id');
+
+ $this->assertContains($term1['term_id'], $migratedTermIds);
+ $this->assertNotContains($term2['term_id'], $migratedTermIds);
+ }
+}
diff --git a/tests/Unit/FormMigration/TestTraits/FormMigrationProcessor.php b/tests/Unit/FormMigration/TestTraits/FormMigrationProcessor.php
new file mode 100644
index 0000000000..68c8e6fb3b
--- /dev/null
+++ b/tests/Unit/FormMigration/TestTraits/FormMigrationProcessor.php
@@ -0,0 +1,29 @@
+formV3->save();
+
+ return $payload->formV3;
+ }
+}
diff --git a/tests/Unit/FormTaxonomies/Actions/UpdateFormTaxonomiesTest.php b/tests/Unit/FormTaxonomies/Actions/UpdateFormTaxonomiesTest.php
new file mode 100644
index 0000000000..6df022fe49
--- /dev/null
+++ b/tests/Unit/FormTaxonomies/Actions/UpdateFormTaxonomiesTest.php
@@ -0,0 +1,62 @@
+create();
+ $request = new \WP_REST_Request();
+
+ $tag = wp_create_term('aye', 'give_forms_tag');
+ $request->set_param('settings', json_encode([
+ 'formTags' => [['id' => $tag['term_id']]],
+ ]));
+
+ (new UpdateFormTaxonomies)($form, $request);
+
+ $terms = wp_get_post_terms($form->id, 'give_forms_tag');
+ $this->assertEquals([$tag['term_id']], wp_list_pluck($terms, 'term_id'));
+ }
+
+ /**
+ * @since 3.16.0
+ */
+ public function testUpdatesFormCategory()
+ {
+ give_update_option('categories', 'enabled');
+ give_setup_taxonomies();
+
+ $form = DonationForm::factory()->create();
+ $request = new \WP_REST_Request();
+
+ $category = wp_create_term('aye', 'give_forms_category');
+ $request->set_param('settings', json_encode([
+ 'formCategories' => [$category['term_id']],
+ ]));
+
+ (new UpdateFormTaxonomies)($form, $request);
+
+ $terms = wp_get_post_terms($form->id, 'give_forms_category');
+ $this->assertEquals([$category['term_id']], wp_list_pluck($terms, 'term_id'));
+ }
+}
diff --git a/tests/Unit/FormTaxonomies/ViewModels/FormTaxonomyViewModelTest.php b/tests/Unit/FormTaxonomies/ViewModels/FormTaxonomyViewModelTest.php
new file mode 100644
index 0000000000..4805e83a30
--- /dev/null
+++ b/tests/Unit/FormTaxonomies/ViewModels/FormTaxonomyViewModelTest.php
@@ -0,0 +1,83 @@
+createSimpleDonationForm();
+
+ give_update_option('tags', 'enabled');
+ give_setup_taxonomies();
+
+ $viewModel = new FormTaxonomyViewModel($form->id, give_get_settings());
+
+ $this->assertTrue($viewModel->isFormTagsEnabled());
+ }
+
+ /**
+ * @since 3.16.0
+ */
+ public function testIsFormCategoriesEnabled()
+ {
+ $form = $this->createSimpleDonationForm();
+
+ give_update_option('categories', 'enabled');
+ give_setup_taxonomies();
+
+ $viewModel = new FormTaxonomyViewModel($form->id, give_get_settings());
+
+ $this->assertTrue($viewModel->isFormCategoriesEnabled());
+ }
+
+ /**
+ * @since 3.16.0
+ */
+ public function testGetSelectedFormTags()
+ {
+ $form = $this->createSimpleDonationForm();
+
+ give_update_option('tags', 'enabled');
+ give_setup_taxonomies();
+
+ $tag = wp_create_term('aye', 'give_forms_tag');
+ wp_set_post_terms($form->id, [$tag['term_id']], 'give_forms_tag');
+
+ $viewModel = new FormTaxonomyViewModel($form->id, give_get_settings());
+
+ $this->assertEquals([['id' => $tag['term_id'], 'value' => 'aye']], $viewModel->getSelectedFormTags());
+ }
+
+ /**
+ * @since 3.16.0
+ */
+ public function testGetSelectedFormCategories()
+ {
+ $form = $this->createSimpleDonationForm();
+
+ give_update_option('categories', 'enabled');
+ give_setup_taxonomies();
+
+ $category = wp_create_term('aye', 'give_forms_category');
+ wp_set_post_terms($form->id, [$category['term_id']], 'give_forms_category');
+
+ $viewModel = new FormTaxonomyViewModel($form->id, give_get_settings());
+
+ $this->assertEquals([$category['term_id']], $viewModel->getSelectedFormCategories());
+ }
+}
diff --git a/tests/Unit/Framework/PaymentGateways/Webhooks/EventHandlers/SubscriptionRenewalDonationCreatedTest.php b/tests/Unit/Framework/PaymentGateways/Webhooks/EventHandlers/SubscriptionRenewalDonationCreatedTest.php
index b0de74412a..3b353e2234 100644
--- a/tests/Unit/Framework/PaymentGateways/Webhooks/EventHandlers/SubscriptionRenewalDonationCreatedTest.php
+++ b/tests/Unit/Framework/PaymentGateways/Webhooks/EventHandlers/SubscriptionRenewalDonationCreatedTest.php
@@ -44,4 +44,52 @@ public function testShouldCreateRenewalDonation()
$this->assertEquals($subscription->id, $renewalDonation->subscriptionId);
}
+
+ /**
+ * @since 3.16.0
+ *
+ * @throws Exception
+ */
+ public function testShouldNotCreateRenewalDonationWithFirstGatewayTransactionId()
+ {
+ $subscription = Subscription::factory()->createWithDonation();
+ $donation = $subscription->initialDonation();
+
+ $firstGatewayTransactionId = 'first-gateway-transaction-id';
+
+ $donation->status = DonationStatus::COMPLETE();
+ $donation->gatewayTransactionId = $firstGatewayTransactionId;
+ $donation->save();
+
+ give(SubscriptionRenewalDonationCreated::class)($subscription->gatewaySubscriptionId,
+ $firstGatewayTransactionId);
+
+ $totalDonations = give()->donations->getTotalDonationCountByGatewayTransactionId($firstGatewayTransactionId);
+
+ $this->assertEquals(1, $totalDonations);
+ }
+
+ /**
+ * @since 3.16.0
+ *
+ * @throws Exception
+ */
+ public function testShouldNotCreateRenewalDonationWithDuplicatedGatewayTransactionId()
+ {
+ $subscription = Subscription::factory()->createWithDonation();
+
+ $duplicatedGatewayTransactionId = 'duplicated-gateway-transaction-id';
+
+ // #1 Renewal Donation
+ give(SubscriptionRenewalDonationCreated::class)($subscription->gatewaySubscriptionId,
+ $duplicatedGatewayTransactionId);
+
+ // #2 Renewal Donation - This one should not be created
+ give(SubscriptionRenewalDonationCreated::class)($subscription->gatewaySubscriptionId,
+ $duplicatedGatewayTransactionId);
+
+ $totalDonations = give()->donations->getTotalDonationCountByGatewayTransactionId($duplicatedGatewayTransactionId);
+
+ $this->assertEquals(1, $totalDonations);
+ }
}
diff --git a/tests/Unit/Helpers/UtilsTest.php b/tests/Unit/Helpers/UtilsTest.php
new file mode 100644
index 0000000000..d0fbe9cc54
--- /dev/null
+++ b/tests/Unit/Helpers/UtilsTest.php
@@ -0,0 +1,104 @@
+assertTrue(strpos($stringWithoutBackslashes, '\\') === false);
+
+ $stringWithoutBackslashes = Utils::removeBackslashes('\\\\ double-backslash-bypass.');
+ $this->assertTrue(strpos($stringWithoutBackslashes, '\\') === false);
+
+ $stringWithoutBackslashes = Utils::removeBackslashes('\\\\\\\\\\\\ multiple-backslash-bypass.');
+ $this->assertTrue(strpos($stringWithoutBackslashes, '\\') === false);
+ }
+
+ /**
+ * @since 3.17.2
+ */
+ public function testContainsSerializedDataRegex()
+ {
+ $stringWithSerializedDataRegex = 'Lorem ipsum dolor sit amet, {a:2:{i:0;s:5:\"hello\";i:1;s:5:\"world\";}} consectetur adipiscing elit.';
+ $this->assertTrue(Utils::containsSerializedDataRegex($stringWithSerializedDataRegex));
+
+ $stringWithoutSerializedDataRegex = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';
+ $this->assertNotTrue(Utils::containsSerializedDataRegex($stringWithoutSerializedDataRegex));
+ }
+
+ /**
+ * @since 3.17.2
+ *
+ * @dataProvider serializedDataProvider
+ */
+ public function testIsSerialized($data, bool $expected)
+ {
+ if ($expected) {
+ $this->assertTrue(Utils::isSerialized($data));
+ } else {
+ $this->assertFalse(Utils::isSerialized($data));
+ }
+ }
+
+ /**
+ * @since 3.17.2
+ *
+ * @dataProvider serializedDataProvider
+ */
+ public function testSafeUnserialize($data, bool $expected)
+ {
+ $unserializedData = Utils::safeUnserialize($data);
+ if ($expected) {
+ $this->assertNotEquals($unserializedData, $data);
+ } else {
+ $this->assertEquals($unserializedData, $data);
+ }
+ }
+
+ /**
+ * @since 3.17.2
+ *
+ * @dataProvider serializedDataProvider
+ */
+ public function testMaybeSafeUnserialize($data, bool $expected)
+ {
+ $unserializedData = Utils::maybeSafeUnserialize($data);
+ if ($expected) {
+ $this->assertNotEquals($unserializedData, $data);
+ } else {
+ $this->assertEquals($unserializedData, $data);
+ }
+ }
+
+ /**
+ * @since 3.17.2
+ */
+ public function serializedDataProvider(): array
+ {
+ return [
+ [serialize('bar'), true],
+ ['\\' . serialize('backslash-bypass'), true],
+ ['\\\\' . serialize('double-backslash-bypass'), true],
+ [
+ // String with serialized data hidden in the middle of the content
+ 'Lorem ipsum dolor sit amet, {a:2:{i:0;s:5:\"hello\";i:1;s:5:\"world\";}} consectetur adipiscing elit.',
+ true,
+ ],
+ ['foo', false],
+ [serialize('qux'), true],
+ ['bar', false],
+ ['foo bar', false],
+ ];
+ }
+}
diff --git a/tests/Unit/PaymentGateways/Stripe/StripePaymentElementGateway/Actions/UpdateStripeFormBuilderSettingsMetaTest.php b/tests/Unit/PaymentGateways/Stripe/StripePaymentElementGateway/Actions/UpdateStripeFormBuilderSettingsMetaTest.php
index ec8e623bc3..1e1beed535 100644
--- a/tests/Unit/PaymentGateways/Stripe/StripePaymentElementGateway/Actions/UpdateStripeFormBuilderSettingsMetaTest.php
+++ b/tests/Unit/PaymentGateways/Stripe/StripePaymentElementGateway/Actions/UpdateStripeFormBuilderSettingsMetaTest.php
@@ -4,7 +4,7 @@
use Closure;
use Exception;
-use Give\Vendors\Faker\Factory;
+use Faker\Factory;
use Give\DonationForms\Models\DonationForm;
use Give\PaymentGateways\Gateways\Stripe\StripePaymentElementGateway\Actions\UpdateStripeFormBuilderSettingsMeta;
use Give\PaymentGateways\Gateways\Stripe\StripePaymentElementGateway\StripePaymentElementGateway;
diff --git a/tests/Unit/ViewModels/FormBuilderViewModelTest.php b/tests/Unit/ViewModels/FormBuilderViewModelTest.php
index 34895f2fc7..2ef60a3b02 100644
--- a/tests/Unit/ViewModels/FormBuilderViewModelTest.php
+++ b/tests/Unit/ViewModels/FormBuilderViewModelTest.php
@@ -88,7 +88,7 @@ public function testShouldReturnStorageData()
],
'goalTypeOptions' => $viewModel->getGoalTypeOptions(),
'goalProgressOptions' => $viewModel->getGoalProgressOptions(),
- 'nameTitlePrefixes' => give_get_option('title_prefixes'),
+ 'nameTitlePrefixes' => give_get_option('title_prefixes', array_values(give_get_default_title_prefixes())),
'isExcerptEnabled' => give_is_setting_enabled(give_get_option('forms_excerpt')),
'intlTelInputSettings' => IntlTelInput::getSettings(),
],
diff --git a/tests/includes/legacy/tests-functions.php b/tests/includes/legacy/tests-functions.php
index c6162a8cf2..bcdd8960d1 100644
--- a/tests/includes/legacy/tests-functions.php
+++ b/tests/includes/legacy/tests-functions.php
@@ -86,4 +86,42 @@ public function test_give_form_get_default_level() {
// When passing invalid form id, it should return null.
$this->assertEquals( give_form_get_default_level( 123 ), null );
}
+
+ /**
+ * @since 3.16.4
+ * @dataProvider give_donation_form_has_serialized_fields_data
+ */
+ public function test_give_donation_form_has_serialized_fields(array $fields, bool $expected): void
+ {
+ if ($expected) {
+ $this->assertTrue(give_donation_form_has_serialized_fields($fields));
+ } else {
+ $this->assertFalse(give_donation_form_has_serialized_fields($fields));
+ }
+ }
+
+ /**
+ * @since 3.17.2 Add string with serialized data hidden in the middle of the content
+ * @since 3.16.4
+ */
+ public function give_donation_form_has_serialized_fields_data(): array
+ {
+ return [
+ [['foo' => serialize('bar')], true],
+ [['foo' => 'bar', 'baz' => '\\' . serialize('backslash-bypass')], true],
+ [['foo' => 'bar', 'baz' => '\\\\' . serialize('double-backslash-bypass')], true],
+ [
+ [
+ 'foo' => 'bar',
+ // String with serialized data hidden in the middle of the content
+ 'baz' => 'Lorem ipsum dolor sit amet, {a:2:{i:0;s:5:\"hello\";i:1;s:5:\"world\";}} consectetur adipiscing elit.',
+ ],
+ true,
+ ],
+ [['foo' => 'bar'], false],
+ [['foo' => 'bar', 'baz' => serialize('qux')], true],
+ [['foo' => 'bar', 'baz' => 'qux'], false],
+ [['foo' => 'bar', 'baz' => 1], false],
+ ];
+ }
}
diff --git a/tests/includes/legacy/tests-give.php b/tests/includes/legacy/tests-give.php
index c270de5229..ffe4f40cbb 100644
--- a/tests/includes/legacy/tests-give.php
+++ b/tests/includes/legacy/tests-give.php
@@ -32,7 +32,7 @@ public function test_constants() {
// Plugin Root File
$path = str_replace( 'tests/unit-tests/', '', plugin_dir_path( $filePath ) );
- $this->assertSame( GIVE_PLUGIN_FILE, $path . 'give.php' );
+ $this->assertSame(GIVE_PLUGIN_FILE, untrailingslashit($path) . DIRECTORY_SEPARATOR . 'give.php');
}
/**
diff --git a/tests/includes/legacy/tests-post-types.php b/tests/includes/legacy/tests-post-types.php
index d584ab0e6f..8f4e660613 100644
--- a/tests/includes/legacy/tests-post-types.php
+++ b/tests/includes/legacy/tests-post-types.php
@@ -29,8 +29,8 @@ public function test_give_post_type_labels() {
$this->assertEquals( 'Donation Forms', $wp_post_types['give_forms']->labels->name );
$this->assertEquals( 'Form', $wp_post_types['give_forms']->labels->singular_name );
$this->assertEquals( 'Add Form', $wp_post_types['give_forms']->labels->add_new );
- $this->assertEquals( 'Add New Donation Form', $wp_post_types['give_forms']->labels->add_new_item );
- $this->assertEquals( 'Edit Donation Form', $wp_post_types['give_forms']->labels->edit_item );
+ $this->assertEquals('Add New Donation Form', $wp_post_types['give_forms']->labels->add_new_item);
+ $this->assertEquals('Edit Donation Form', $wp_post_types['give_forms']->labels->edit_item);
$this->assertEquals( 'New Form', $wp_post_types['give_forms']->labels->new_item );
$this->assertEquals( 'All Forms', $wp_post_types['give_forms']->labels->all_items );
$this->assertEquals( 'View Form', $wp_post_types['give_forms']->labels->view_item );
diff --git a/webpack.mix.js b/webpack.mix.js
index b2eaf51d5e..8c7be78756 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -18,7 +18,11 @@ mix.setPublicPath('assets/dist')
.sass('src/Views/Form/Templates/Classic/resources/css/form.scss', 'css/give-classic-template.css')
.sass('src/MultiFormGoals/resources/css/common.scss', 'css/multi-form-goal-block.css')
.sass('src/DonationSummary/resources/css/summary.scss', 'css/give-donation-summary.css')
- .sass('src/Promotions/InPluginUpsells/resources/css/stellarwp-sales-banner.scss', 'css/admin-stellarwp-sales-banner.css')
+ .sass(
+ 'src/Promotions/InPluginUpsells/resources/css/stellarwp-sales-banner.scss',
+ 'css/admin-stellarwp-sales-banner.css'
+ )
+ .sass('src/DonationForms/AsyncData/resources/loadAsyncData.scss', 'css/give-donation-forms-load-async-data.css')
.js('assets/src/js/frontend/give.js', 'js/')
.js('assets/src/js/frontend/give-stripe.js', 'js/')
@@ -42,16 +46,15 @@ mix.setPublicPath('assets/dist')
.js('src/MigrationLog/Admin/index.js', 'js/give-migrations-list-table-app.js')
.js('src/DonationSummary/resources/js/summary.js', 'js/give-donation-summary.js')
.js('src/Promotions/InPluginUpsells/resources/js/addons-admin-page.js', 'js/admin-upsell-addons-page.js')
+ .js('src/DonationForms/AsyncData/resources/loadAsyncData.js', 'js/give-donation-forms-load-async-data.js')
.ts('src/DonationForms/V2/resources/admin-donation-forms.tsx', 'js/give-admin-donation-forms.js')
.ts('src/DonationForms/V2/resources/edit-v2form.tsx', 'js/give-edit-v2form.js')
.ts('src/DonationForms/V2/resources/add-v2form.tsx', 'js/give-add-v2form.js')
- .ts('src/Donors/resources/admin-donors.tsx', 'js/give-admin-donors.js').
- ts('src/Donations/resources/index.tsx', 'js/give-admin-donations.js').
- ts('src/EventTickets/resources/admin/events-list-table.tsx',
- 'js/give-admin-event-tickets.js').
- ts('src/EventTickets/resources/admin/event-details.tsx',
- 'js/give-admin-event-tickets-details.js')
+ .ts('src/Donors/resources/admin-donors.tsx', 'js/give-admin-donors.js')
+ .ts('src/Donations/resources/index.tsx', 'js/give-admin-donations.js')
+ .ts('src/EventTickets/resources/admin/events-list-table.tsx', 'js/give-admin-event-tickets.js')
+ .ts('src/EventTickets/resources/admin/event-details.tsx', 'js/give-admin-event-tickets-details.js')
.ts('src/Subscriptions/resources/admin-subscriptions.tsx', 'js/give-admin-subscriptions.js')
.js('src/Promotions/InPluginUpsells/resources/js/sale-banner.js', 'js/admin-upsell-sale-banner.js')
.ts('src/Promotions/InPluginUpsells/resources/js/donation-options.ts', 'js/donation-options.js')
diff --git a/wordpress-scripts-webpack.config.js b/wordpress-scripts-webpack.config.js
index 0e633be4a6..bc837daf69 100644
--- a/wordpress-scripts-webpack.config.js
+++ b/wordpress-scripts-webpack.config.js
@@ -58,6 +58,7 @@ module.exports = {
baseFormDesignCss: srcPath('DonationForms/resources/styles/base.scss'),
formBuilderApp: srcPath('FormBuilder/resources/js/form-builder/src/index.tsx'),
formBuilderRegistrars: srcPath('FormBuilder/resources/js/registrars/index.ts'),
+ formTaxonomySettings: srcPath('FormTaxonomies/resources/form-builder/index.tsx'),
adminBlocks: path.resolve(process.cwd(), 'blocks', 'load.js'),
},
};