Fix tests for watermark

SolidInvoice · Mar 7, 2023 · 19e74ec · 19e74ec
1 parent 2f871c6
commit 19e74ec
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/SettingsBundle/Form/Handler/SettingsFormHandler.php b/src/SettingsBundle/Form/Handler/SettingsFormHandler.php
@@ -23,6 +23,7 @@
 use SolidWorx\FormHandler\FormHandlerSuccessInterface;
 use SolidWorx\FormHandler\FormRequest;
 use SolidWorx\FormHandler\Options;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
@@ -106,7 +107,13 @@ private function getSettings(bool $keepObject = true): array
         foreach ($this->settingsRepository->findAll() as $setting) {
             $path = '[' . str_replace('/', '][', $setting->getKey()) . ']';
 
-            $propertyAccessor->setValue($settings, $path, $keepObject ? $setting : $setting->getValue());
+            if ($setting->getType() === CheckboxType::class) {
+                $value = $setting->getValue() === '1';
+            } else {
+                $value = $setting->getValue();
+            }
+
+            $propertyAccessor->setValue($settings, $path, $keepObject ? $setting : $value);
         }
 
         return $settings;

diff --git a/src/SettingsBundle/Tests/Form/Handler/SettingsFormHandlerTest.php b/src/SettingsBundle/Tests/Form/Handler/SettingsFormHandlerTest.php
@@ -68,12 +68,12 @@ protected function assertOnSuccess(?Response $response, FormRequest $form, $data
             'quote' => [
                 'email_subject' => null,
                 'bcc_address' => null,
-                'watermark' => true,
+                'watermark' => false,
             ],
             'invoice' => [
                 'email_subject' => null,
                 'bcc_address' => null,
-                'watermark' => true,
+                'watermark' => false,
             ],
             'email' => [
                 'from_name' => null,