Include all block types in feature tests for both form and non-form schema

- included lead image block in both feature tests
- included a nested/object block in both feature tests -> as-is is broken for a few scenarios

TODO: remove TODOs

Author: lauraghiorghisor-tw

features/fixtures/test_configurable_document_type.json

@@ -20,14 +20,40 @@
         "title": "Date Field",
         "description": "A date field for the page",
         "type": "date"
+      },
+      "address": {
+        "title": "Address",
+        "description": "A nested object field",
+        "type": "object",
+        "format": "default",
+        "properties": {
+          "street": {
+            "title": "Street",
+            "description": "A default string inside the nested object",
+            "type": "string",
+            "format": "default"
+          },
+          "city": {
+            "title": "City",
+            "description": "Another default string inside the nested object",
+            "type": "string",
+            "format": "default"
+          }
+        }
+      },
+      "lead_image": {
+        "title": "Lead Image",
+        "description": "The lead image for the page",
+        "format": "lead_image_select",
+        "type": "integer"
       }
     }
   },
   "associations": [],
   "settings": {
     "edit_screens": {
-      "document": ["body", "date_field"],
-      "images": ["image"]
+      "document": ["body", "date_field", "address"],
+      "images": ["image", "lead_image"]
     },
     "base_path_prefix": "/government/test-type",
     "publishing_api_schema_name": "test_type",
@@ -38,4 +64,4 @@
     "translations_enabled": true,
     "images_enabled": true
   }
-}
+}

features/fixtures/test_configurable_document_type_with_forms.json

@@ -14,6 +14,23 @@
           "title": "Date Field",
           "description": "A date field for the page",
           "block": "default_date"
+        },
+        "address": {
+          "title": "Address",
+          "description": "A nested object field",
+          "block": "default_object",
+          "fields": {
+            "street": {
+              "title": "Street",
+              "description": "A default string inside the nested object",
+              "block": "default_string"
+            },
+            "city": {
+              "title": "City",
+              "description": "Another default string inside the nested object",
+              "block": "default_string"
+            }
+          }
         }
       }
     },
@@ -23,6 +40,11 @@
           "title": "Image",
           "description": "The image for the page",
           "block": "image_select"
+        },
+        "lead_image": {
+          "title": "Lead Image",
+          "description": "The lead image for the page",
+          "block": "lead_image_select"
         }
       }
     }
@@ -44,6 +66,15 @@
       },
       "date_field": {
         "type": "date"
+      },
+      "street": {
+        "type": "string"
+      },
+      "city": {
+        "type": "string"
+      },
+      "lead_image": {
+        "type": "integer"
       }
     }
   },

features/standard-edition-with-forms.feature

@@ -4,31 +4,31 @@ Feature: Standard Editions
     Given I am a writer
     And the configurable document types feature flag is enabled
     And the test configurable document type with forms is defined
-    When I draft a new "Test configurable document type" configurable document titled "The history of GOV.UK"
+    When I draft a new "Test configurable document type" configurable document with forms titled "The history of GOV.UK"
     Then I am on the summary page of the draft titled "The history of GOV.UK"
     And when I switch to the Images tab to fill in the other configurable fields
     Then the configurable fields on the Images tab are persisted
-    And the configurable fields on the Document tab are not overwritten
+    And the configurable fields - with forms - on the Document tab are not overwritten
 
   Scenario: Force publishing an existing draft configurable document
     Given I am an editor
     And the configurable document types feature flag is enabled
     And the test configurable document type with forms is defined
-    When I publish a submitted draft of a test configurable document titled "The history of GOV.UK"
+    When I publish a submitted draft of a test configurable document with forms titled "The history of GOV.UK"
     Then I can see that the draft edition of "The history of GOV.UK" was published successfully
-    And a new draft of "The history of GOV.UK" is created with the correct field values
+    And a new draft of "The history of GOV.UK" is created with the correct field values - with forms
 
   Scenario: Adding translations with all content block types
     Given I am a writer
     And the configurable document types feature flag is enabled
     And the test configurable document type with forms is defined with translations enabled
-    And I have drafted an English configurable document titled "Digital transformation report"
+    And I have drafted an English configurable document with forms titled "Digital transformation report"
     When I go to add a Welsh translation
     Then configured content blocks should appear on the translation page
-    And the Welsh translation fields should be pre-populated with primary locale content
+    And the Welsh translation fields should be pre-populated with primary locale content - with forms
     And the image selections should be preserved from the primary locale
     And I should see the original English content in "original text" sections
-    And when I set the Welsh translations
+    And when I set the Welsh translations - with forms
     Then the Welsh translations should have persisted
 
   Scenario: Editing translations on a persisted edition