Add missing test case

sulu · May 28, 2024 · cc3d9c6 · cc3d9c6
1 parent 94f1ff6
commit cc3d9c6
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 3 deletions.
diff --git a/Manager/FormManager.php b/Manager/FormManager.php
@@ -337,6 +337,7 @@ protected function updateFields(array $data, Form $form, string $locale): void
             ++$counter;
             $fieldType = self::getValue($fieldData, 'type');
             $fieldKey = self::getValue($fieldData, 'key');
+
             $field = $form->getField($fieldKey);
             $uniqueKey = $this->getUniqueKey($fieldType, $reservedKeys);
 
@@ -347,10 +348,12 @@ protected function updateFields(array $data, Form $form, string $locale): void
             if (!$field) {
                 $field = new FormField();
                 $field->setKey($uniqueKey);
-                $reservedKeys[] = $uniqueKey;
             } elseif ($field->getType() !== $fieldType || !$field->getKey()) {
                 $field->setKey($uniqueKey);
-                $reservedKeys[] = $uniqueKey;
+            }
+
+            if (!\in_array($field->getKey(), $reservedKeys)) {
+                $reservedKeys[] = $field->getKey();
             }
 
             $field->setOrder($counter);

diff --git a/Tests/Application/.env b/Tests/Application/.env
@@ -1,4 +1,4 @@
 APP_ENV=test
-DATABASE_URL=mysql://[email protected]:3306/su_form_test?serverVersion=5.7
+DATABASE_URL=mysql://root:ChangeMe@127.0.0.1:3306/su_form_test?serverVersion=5.7
 DATABASE_CHARSET=utf8mb4
 DATABASE_COLLATE=utf8mb4_unicode_ci
diff --git a/Tests/Functional/Controller/FormControllerTest.php b/Tests/Functional/Controller/FormControllerTest.php
@@ -206,6 +206,79 @@ public function testPutFull(): void
         $this->assertFullForm($response);
     }
 
+    public function testPutDuplicatedField(): void
+    {
+        $form = $this->createFullForm();
+        $this->client->request(
+            'PUT',
+            '/admin/api/forms/' . $form->getId(),
+            [
+                'locale' => 'en',
+                'title' => 'Title',
+                'toEmail' => '[email protected]',
+                'fromEmail' => '[email protected]',
+                'fields' => [
+                    [
+                        'key' => 'email',
+                        'type' => 'email',
+                        'title' => 'Title',
+                        'shortTitle' => 'Short Title',
+                        'placeholder' => 'Placeholder',
+                        'defaultValue' => 'Default Value',
+                        'width' => 'full',
+                        'required' => true,
+                    ],
+                    [
+                        'key' => 'email', // we are testing here if second email field is correctly interpreted as email1
+                        'type' => 'email',
+                        'title' => 'Title',
+                        'shortTitle' => 'Short Title',
+                        'placeholder' => 'Placeholder',
+                        'defaultValue' => 'Default Value',
+                        'width' => 'full',
+                        'required' => true,
+                    ],
+                    [
+                        'key' => 'email', // we are testing here if second email field is correctly created as email2
+                        'type' => 'email',
+                        'title' => 'Title',
+                        'shortTitle' => 'Short Title',
+                        'placeholder' => 'Placeholder',
+                        'defaultValue' => 'Default Value',
+                        'width' => 'full',
+                        'required' => true,
+                    ],
+                ],
+            ]
+        );
+
+        $this->assertHttpStatusCode(200, $this->client->getResponse());
+        $response = \json_decode($this->client->getResponse()->getContent(), true);
+
+        $respondedFields = [];
+        foreach ($response['fields'] ?? [] as $field) {
+            $respondedFields[] = [
+                'key' => $field['key'],
+                'type' => $field['type'],
+            ];
+        }
+
+        $this->assertSame([
+            [
+                'key' => 'email',
+                'type' => 'email',
+            ],
+            [
+                'key' => 'email1',
+                'type' => 'email',
+            ],
+            [
+                'key' => 'email2',
+                'type' => 'email',
+            ],
+        ], $respondedFields);
+    }
+
     public function testPutNotExist(): void
     {
         $this->client->request(