Merge branch '2.1'

ezsystems · Jun 1, 2018 · cf04282 · cf04282
2 parents 7335114 + 269b0c9
commit cf04282
Showing 1 changed file with 27 additions and 8 deletions.
diff --git a/features/Context/FieldTypeFormContext.php b/features/Context/FieldTypeFormContext.php
@@ -34,23 +34,42 @@ public function gatherContexts(BeforeScenarioScope $scope)
 
     /**
      * @Given a Content Type with a(n) :fieldTypeIdentifier field definition
+     * @Given a Content Type :contentTypeName with a(n) :fieldTypeIdentifier field definition
      */
-    public function aContentTypeWithAGivenFieldDefinition($fieldTypeIdentifier)
+    public function aContentTypeWithAGivenFieldDefinition($fieldTypeIdentifier, $contentTypeName = null)
     {
         if (isset(self::$fieldTypeIdentifierMap[$fieldTypeIdentifier])) {
             $fieldTypeIdentifier = self::$fieldTypeIdentifierMap[$fieldTypeIdentifier];
         }
 
         $contentTypeCreateStruct = $this->contentTypeContext->newContentTypeCreateStruct();
-        $contentTypeCreateStruct->addFieldDefinition(
-            new FieldDefinitionCreateStruct(
+        if (isset($contentTypeName)) {
+            $contentTypeCreateStruct->names = ['eng-GB' => $contentTypeName];
+        }
+
+        $fieldDefinition = [
+            'identifier' => self::$fieldIdentifier,
+            'fieldTypeIdentifier' => $fieldTypeIdentifier,
+            'names' => ['eng-GB' => 'Field'],
+        ];
+        if ($fieldTypeIdentifier === 'ezselection') {
+            $fieldDefinition = array_merge(
+                $fieldDefinition,
                 [
-                    'identifier' => self::$fieldIdentifier,
-                    'fieldTypeIdentifier' => $fieldTypeIdentifier,
-                    'names' => ['eng-GB' => 'Field'],
+                    'fieldSettings' => ['isMultiple' => false,
+                        'options' => [
+                            0 => 'A first',
+                            1 => 'Bielefeld',
+                            2 => 'Test-value',
+                            3 => 'Turtles',
+                            4 => 'Zombies',
+                        ],
+                    ],
                 ]
-            )
-        );
+            );
+        }
+
+        $contentTypeCreateStruct->addFieldDefinition(new FieldDefinitionCreateStruct($fieldDefinition));
         $this->contentTypeContext->createContentType($contentTypeCreateStruct);
     }