Add more test

maxime-rainville · Aug 5, 2023 · 02810ac · 02810ac
1 parent afebce1
commit 02810ac
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/src/Form/AnyField.php b/src/Form/AnyField.php
@@ -2,12 +2,8 @@
 
 namespace SilverStripe\AnyField\Form;
 
-use Behat\Mink\Element\Element;
 use DNADesign\Elemental\Controllers\ElementalAreaController;
-use DNADesign\Elemental\Forms\EditFormFactory;
 use DNADesign\Elemental\Models\BaseElement;
-use SilverStripe\AnyField\Services\AnyService;
-use SilverStripe\Core\ClassInfo;
 use SilverStripe\ORM\DataObject;
 
 /**
@@ -43,6 +39,7 @@ private function guessBaseClass(): ?string
             $fieldname = $fakeData[0];
         };
 
+
         $class = DataObject::getSchema()->hasOneComponent(get_class($record), $fieldname);
         return $class;
     }

diff --git a/src/Form/JsonField.php b/src/Form/JsonField.php
@@ -3,6 +3,7 @@
 namespace SilverStripe\AnyField\Form;
 
 use InvalidArgumentException;
+use LogicException;
 use MaximeRainville\SilverstripeReact\ReactFormField;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Forms\FormField;
@@ -50,12 +51,11 @@ public function saveInto(DataObjectInterface $record)
         $fieldname = $this->getName();
 
         if (!$fieldname) {
-            return $this;
+            throw new LogicException(sprintf('%s: Field must have a name', static::class));
         }
 
         $service = AnyService::singleton();
-        $dataValue = $this->dataValue();
-        $value = is_string($dataValue) ? $this->parseString($this->dataValue()) : $dataValue;
+        $value = $this->dataValue();
 
         if ($class = DataObject::getSchema()->hasOneComponent(get_class($record), $fieldname)) {
             /** @var JsonData|DataObject $dataObject */

diff --git a/tests/php/Form/AnyFieldTest.php b/tests/php/Form/AnyFieldTest.php
@@ -67,5 +67,29 @@ public function testSetValue()
         }
     }
 
+    public function testSaveNew(): void
+    {
+        $field = $this->getAnyField();
+        $field->setName('Link');
+
+        $this->assertEquals(
+            '',
+            $field->getBaseClass(),
+            'When base class is not guessable, a blank string is returned'
+        );
+
+        $form = new Form(Controller::curr(), 'Form', FieldList::create($field));
+        $parentRecord = AnyFieldTest\SingleLink::create();
+        $form->loadDataFrom($parentRecord);
+
+        $field->setValue([
+            'ClassName' => ExternalLink::class,
+            'Title' => 'Silverstripe CMS',
+            'URL' => 'https://silverstripe.org',
+        ]);
+
+        $field->saveInto($parentRecord);
+    }
+
 
 }