From d13bf1e0bcc2ddb187ae16c0c317d67bf5619878 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Fri, 23 Mar 2018 16:18:32 +1300
Subject: [PATCH 1/4] Add tests to ensure that editable form fields allow
 nullable titles

---
 .../EditableCheckboxGroupFieldTest.php        |  8 +++++++
 .../EditableCheckboxTest.php                  | 17 +++++++++++++++
 .../EditableCountryDropdownFieldTest.php      |  8 +++++++
 .../EditableDateFieldTest.php                 | 17 +++++++++++++++
 .../EditableDropdownTest.php                  |  8 +++++++
 .../EditableEmailFieldTest.php                | 17 +++++++++++++++
 .../EditableFieldGroupTest.php                | 17 +++++++++++++++
 .../EditableFileFieldTest.php                 |  8 +++++++
 .../EditableFormHeadingTest.php               | 17 +++++++++++++++
 .../EditableFormStepTest.php                  | 17 +++++++++++++++
 .../EditableLiteralFieldTest.php              |  8 +++++++
 .../EditableMemberListFieldTest.php           | 21 +++++++++++++++++++
 .../EditableMemberListFieldTest.yml           |  3 +++
 .../EditableNumericFieldTest.php              | 17 +++++++++++++++
 .../EditableRadioFieldTest.php                | 10 +++++++--
 .../EditableTextFieldTest.php                 |  8 +++++++
 16 files changed, 199 insertions(+), 2 deletions(-)
 create mode 100644 tests/Model/EditableFormField/EditableCheckboxTest.php
 create mode 100644 tests/Model/EditableFormField/EditableDateFieldTest.php
 create mode 100644 tests/Model/EditableFormField/EditableEmailFieldTest.php
 create mode 100644 tests/Model/EditableFormField/EditableFieldGroupTest.php
 create mode 100644 tests/Model/EditableFormField/EditableFormHeadingTest.php
 create mode 100644 tests/Model/EditableFormField/EditableFormStepTest.php
 create mode 100644 tests/Model/EditableFormField/EditableMemberListFieldTest.php
 create mode 100644 tests/Model/EditableFormField/EditableMemberListFieldTest.yml
 create mode 100644 tests/Model/EditableFormField/EditableNumericFieldTest.php

diff --git a/tests/Model/EditableFormField/EditableCheckboxGroupFieldTest.php b/tests/Model/EditableFormField/EditableCheckboxGroupFieldTest.php
index cc25b05..00e0380 100644
--- a/tests/Model/EditableFormField/EditableCheckboxGroupFieldTest.php
+++ b/tests/Model/EditableFormField/EditableCheckboxGroupFieldTest.php
@@ -18,4 +18,12 @@ class EditableCheckboxGroupFieldTest extends SapphireTest
         $checkboxGroup = $this->objFromFixture(EditableCheckboxGroupField::class, 'checkbox-group');
         $this->assertSame(UserFormsCheckboxSetField::class, $checkboxGroup->getFormField()->getTemplate());
     }
+
+    public function testAllowEmptyTitle()
+    {
+        /** @var EditableCheckboxGroupField $field */
+        $field = EditableCheckboxGroupField::create();
+        $field->Name = 'EditableFormField_123456';
+        $this->assertEmpty($field->getFormField()->Title());
+    }
 }
diff --git a/tests/Model/EditableFormField/EditableCheckboxTest.php b/tests/Model/EditableFormField/EditableCheckboxTest.php
new file mode 100644
index 0000000..1c8816d
--- /dev/null
+++ b/tests/Model/EditableFormField/EditableCheckboxTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace SilverStripe\UserForms\Tests\Model\EditableFormField;
+
+use SilverStripe\Dev\SapphireTest;
+use SilverStripe\UserForms\Model\EditableFormField\EditableCheckbox;
+
+class EditableCheckboxTest extends SapphireTest
+{
+    public function testAllowEmptyTitle()
+    {
+        /** @var EditableCheckbox $field */
+        $field = EditableCheckbox::create();
+        $field->Name = 'EditableFormField_123456';
+        $this->assertEmpty($field->getFormField()->Title());
+    }
+}
diff --git a/tests/Model/EditableFormField/EditableCountryDropdownFieldTest.php b/tests/Model/EditableFormField/EditableCountryDropdownFieldTest.php
index dff76c1..cfff955 100644
--- a/tests/Model/EditableFormField/EditableCountryDropdownFieldTest.php
+++ b/tests/Model/EditableFormField/EditableCountryDropdownFieldTest.php
@@ -13,4 +13,12 @@ class EditableCountryDropdownFieldTest extends SapphireTest
 
         $this->assertContains('/images/editabledropdown.png', $field->getIcon());
     }
+
+    public function testAllowEmptyTitle()
+    {
+        /** @var EditableCountryDropdownField $field */
+        $field = EditableCountryDropdownField::create();
+        $field->Name = 'EditableFormField_123456';
+        $this->assertEmpty($field->getFormField()->Title());
+    }
 }
diff --git a/tests/Model/EditableFormField/EditableDateFieldTest.php b/tests/Model/EditableFormField/EditableDateFieldTest.php
new file mode 100644
index 0000000..580bc1d
--- /dev/null
+++ b/tests/Model/EditableFormField/EditableDateFieldTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace SilverStripe\UserForms\Tests\Model\EditableFormField;
+
+use SilverStripe\Dev\SapphireTest;
+use SilverStripe\UserForms\Model\EditableFormField\EditableDateField;
+
+class EditableDateFieldTest extends SapphireTest
+{
+    public function testAllowEmptyTitle()
+    {
+        /** @var EditableDateField $field */
+        $field = EditableDateField::create();
+        $field->Name = 'EditableFormField_123456';
+        $this->assertEmpty($field->getFormField()->Title());
+    }
+}
diff --git a/tests/Model/EditableFormField/EditableDropdownTest.php b/tests/Model/EditableFormField/EditableDropdownTest.php
index 844a7bd..3545ed7 100644
--- a/tests/Model/EditableFormField/EditableDropdownTest.php
+++ b/tests/Model/EditableFormField/EditableDropdownTest.php
@@ -36,4 +36,12 @@ class EditableDropdownTest extends SapphireTest
         $alternateDropdown->write();
         $this->assertEquals($formField->getEmptyString(), '');
     }
+
+    public function testAllowEmptyTitle()
+    {
+        /** @var EditableDropdown $field */
+        $field = EditableDropdown::create();
+        $field->Name = 'EditableFormField_123456';
+        $this->assertEmpty($field->getFormField()->Title());
+    }
 }
diff --git a/tests/Model/EditableFormField/EditableEmailFieldTest.php b/tests/Model/EditableFormField/EditableEmailFieldTest.php
new file mode 100644
index 0000000..6d07ba3
--- /dev/null
+++ b/tests/Model/EditableFormField/EditableEmailFieldTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace SilverStripe\UserForms\Tests\Model\EditableFormField;
+
+use SilverStripe\Dev\SapphireTest;
+use SilverStripe\UserForms\Model\EditableFormField\EditableEmailField;
+
+class EditableEmailFieldTest extends SapphireTest
+{
+    public function testAllowEmptyTitle()
+    {
+        /** @var EditableEmailField $field */
+        $field = EditableEmailField::create();
+        $field->Name = 'EditableFormField_123456';
+        $this->assertEmpty($field->getFormField()->Title());
+    }
+}
diff --git a/tests/Model/EditableFormField/EditableFieldGroupTest.php b/tests/Model/EditableFormField/EditableFieldGroupTest.php
new file mode 100644
index 0000000..03f932d
--- /dev/null
+++ b/tests/Model/EditableFormField/EditableFieldGroupTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace SilverStripe\UserForms\Tests\Model\EditableFormField;
+
+use SilverStripe\Dev\SapphireTest;
+use SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroup;
+
+class EditableFieldGroupTest extends SapphireTest
+{
+    public function testAllowEmptyTitle()
+    {
+        /** @var EditableFieldGroup $field */
+        $field = EditableFieldGroup::create();
+        $field->Name = 'EditableFormField_123456';
+        $this->assertEmpty($field->getFormField()->Title());
+    }
+}
diff --git a/tests/Model/EditableFormField/EditableFileFieldTest.php b/tests/Model/EditableFormField/EditableFileFieldTest.php
index 16bae3e..12de5b9 100644
--- a/tests/Model/EditableFormField/EditableFileFieldTest.php
+++ b/tests/Model/EditableFormField/EditableFileFieldTest.php
@@ -64,4 +64,12 @@ class EditableFileFieldTest extends SapphireTest
         $formField = $fileField->getFormField();
         $this->assertEquals($formField->getValidator()->getAllowedMaxFileSize(), 262144);
     }
+
+    public function testAllowEmptyTitle()
+    {
+        /** @var EditableFileField $field */
+        $field = EditableFileField::create();
+        $field->Name = 'EditableFormField_123456';
+        $this->assertEmpty($field->getFormField()->Title());
+    }
 }
diff --git a/tests/Model/EditableFormField/EditableFormHeadingTest.php b/tests/Model/EditableFormField/EditableFormHeadingTest.php
new file mode 100644
index 0000000..2299422
--- /dev/null
+++ b/tests/Model/EditableFormField/EditableFormHeadingTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace SilverStripe\UserForms\Tests\Model\EditableFormField;
+
+use SilverStripe\Dev\SapphireTest;
+use SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading;
+
+class EditableFormHeadingTest extends SapphireTest
+{
+    public function testAllowEmptyTitle()
+    {
+        /** @var EditableFormHeading $field */
+        $field = EditableFormHeading::create();
+        $field->Name = 'EditableFormField_123456';
+        $this->assertEmpty($field->getFormField()->Title());
+    }
+}
diff --git a/tests/Model/EditableFormField/EditableFormStepTest.php b/tests/Model/EditableFormField/EditableFormStepTest.php
new file mode 100644
index 0000000..13e16b7
--- /dev/null
+++ b/tests/Model/EditableFormField/EditableFormStepTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace SilverStripe\UserForms\Tests\Model\EditableFormField;
+
+use SilverStripe\Dev\SapphireTest;
+use SilverStripe\UserForms\Model\EditableFormField\EditableFormStep;
+
+class EditableFormStepTest extends SapphireTest
+{
+    public function testAllowEmptyTitle()
+    {
+        /** @var EditableFormStep $field */
+        $field = EditableFormStep::create();
+        $field->Name = 'EditableFormField_123456';
+        $this->assertEmpty($field->getFormField()->Title());
+    }
+}
diff --git a/tests/Model/EditableFormField/EditableLiteralFieldTest.php b/tests/Model/EditableFormField/EditableLiteralFieldTest.php
index c12f77f..6d9e291 100644
--- a/tests/Model/EditableFormField/EditableLiteralFieldTest.php
+++ b/tests/Model/EditableFormField/EditableLiteralFieldTest.php
@@ -87,4 +87,12 @@ class EditableLiteralFieldTest extends SapphireTest
             'Actual literal field exists in composite field children'
         );
     }
+
+    public function testAllowEmptyTitle()
+    {
+        /** @var EditableLiteralField $field */
+        $field = EditableLiteralField::create();
+        $field->Name = 'EditableFormField_123456';
+        $this->assertEmpty($field->getFormField()->Title());
+    }
 }
diff --git a/tests/Model/EditableFormField/EditableMemberListFieldTest.php b/tests/Model/EditableFormField/EditableMemberListFieldTest.php
new file mode 100644
index 0000000..c602e4a
--- /dev/null
+++ b/tests/Model/EditableFormField/EditableMemberListFieldTest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace SilverStripe\UserForms\Tests\Model\EditableFormField;
+
+use SilverStripe\Dev\SapphireTest;
+use SilverStripe\Security\Group;
+use SilverStripe\UserForms\Model\EditableFormField\EditableMemberListField;
+
+class EditableMemberListFieldTest extends SapphireTest
+{
+    protected static $fixture_file = 'EditableMemberListFieldTest.yml';
+
+    public function testAllowEmptyTitle()
+    {
+        /** @var EditableMemberListField $field */
+        $field = EditableMemberListField::create();
+        $field->GroupID = $this->idFromFixture(Group::class, 'a_group');
+        $field->Name = 'EditableFormField_123456';
+        $this->assertEmpty($field->getFormField()->Title());
+    }
+}
diff --git a/tests/Model/EditableFormField/EditableMemberListFieldTest.yml b/tests/Model/EditableFormField/EditableMemberListFieldTest.yml
new file mode 100644
index 0000000..42b9821
--- /dev/null
+++ b/tests/Model/EditableFormField/EditableMemberListFieldTest.yml
@@ -0,0 +1,3 @@
+SilverStripe\Security\Group:
+  a_group:
+    Title: A security group
diff --git a/tests/Model/EditableFormField/EditableNumericFieldTest.php b/tests/Model/EditableFormField/EditableNumericFieldTest.php
new file mode 100644
index 0000000..9b7b8e9
--- /dev/null
+++ b/tests/Model/EditableFormField/EditableNumericFieldTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace SilverStripe\UserForms\Tests\Model\EditableFormField;
+
+use SilverStripe\Dev\SapphireTest;
+use SilverStripe\UserForms\Model\EditableFormField\EditableNumericField;
+
+class EditableNumericFieldTest extends SapphireTest
+{
+    public function testAllowEmptyTitle()
+    {
+        /** @var EditableNumericField $field */
+        $field = EditableNumericField::create();
+        $field->Name = 'EditableFormField_123456';
+        $this->assertEmpty($field->getFormField()->Title());
+    }
+}
diff --git a/tests/Model/EditableFormField/EditableRadioFieldTest.php b/tests/Model/EditableFormField/EditableRadioFieldTest.php
index c1faefc..b82265f 100644
--- a/tests/Model/EditableFormField/EditableRadioFieldTest.php
+++ b/tests/Model/EditableFormField/EditableRadioFieldTest.php
@@ -3,8 +3,6 @@
 namespace SilverStripe\UserForms\Tests\Model\EditableFormField;
 
 use SilverStripe\Dev\SapphireTest;
-use SilverStripe\UserForms\FormField\UserFormsCheckboxSetField;
-use SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField;
 use SilverStripe\UserForms\Model\EditableFormField\EditableRadioField;
 
 class EditableRadioFieldTest extends SapphireTest
@@ -22,4 +20,12 @@ class EditableRadioFieldTest extends SapphireTest
             $radio->getFormField()->getTemplate()
         );
     }
+
+    public function testAllowEmptyTitle()
+    {
+        /** @var EditableRadioField $field */
+        $field = EditableRadioField::create();
+        $field->Name = 'EditableFormField_123456';
+        $this->assertEmpty($field->getFormField()->Title());
+    }
 }
diff --git a/tests/Model/EditableFormField/EditableTextFieldTest.php b/tests/Model/EditableFormField/EditableTextFieldTest.php
index 1a994d5..9bd947b 100644
--- a/tests/Model/EditableFormField/EditableTextFieldTest.php
+++ b/tests/Model/EditableFormField/EditableTextFieldTest.php
@@ -20,4 +20,12 @@ class EditableTextFieldTest extends SapphireTest
         $this->assertInstanceOf(DropdownField::class, $autocompleteField);
         $this->assertEquals(['foo' => 'foo'], $autocompleteField->getSource());
     }
+
+    public function testAllowEmptyTitle()
+    {
+        /** @var EditableTextField $field */
+        $field = EditableTextField::create();
+        $field->Name = 'EditableFormField_123456';
+        $this->assertEmpty($field->getFormField()->Title());
+    }
 }

From 5cce5f5a17f562f0cebc8e1efb27ef7f3e63bafd Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Fri, 23 Mar 2018 16:23:51 +1300
Subject: [PATCH 2/4] FIX Allow editable form fields to have nullable titles
 rather than fallback to Name

---
 code/Model/EditableFormField/EditableCheckbox.php         | 2 +-
 .../EditableFormField/EditableCheckboxGroupField.php      | 2 +-
 .../EditableFormField/EditableCountryDropdownField.php    | 2 +-
 code/Model/EditableFormField/EditableDateField.php        | 2 +-
 code/Model/EditableFormField/EditableDropdown.php         | 2 +-
 code/Model/EditableFormField/EditableEmailField.php       | 2 +-
 code/Model/EditableFormField/EditableFileField.php        | 2 +-
 code/Model/EditableFormField/EditableFormHeading.php      | 2 +-
 code/Model/EditableFormField/EditableMemberListField.php  | 2 +-
 code/Model/EditableFormField/EditableNumericField.php     | 2 +-
 code/Model/EditableFormField/EditableRadioField.php       | 2 +-
 code/Model/EditableFormField/EditableTextField.php        | 4 ++--
 .../Model/EditableFormField/EditableLiteralFieldTest.php  | 8 --------
 tests/Model/EditableFormField/EditableTextFieldTest.php   | 4 ++++
 14 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/code/Model/EditableFormField/EditableCheckbox.php b/code/Model/EditableFormField/EditableCheckbox.php
index dcb602c..8439acb 100755
--- a/code/Model/EditableFormField/EditableCheckbox.php
+++ b/code/Model/EditableFormField/EditableCheckbox.php
@@ -44,7 +44,7 @@ class EditableCheckbox extends EditableFormField
 
     public function getFormField()
     {
-        $field = CheckboxField::create($this->Name, $this->Title, $this->CheckedDefault)
+        $field = CheckboxField::create($this->Name, $this->Title ?: false, $this->CheckedDefault)
             ->setFieldHolderTemplate(__CLASS__ . '_holder')
             ->setTemplate(__CLASS__);
 
diff --git a/code/Model/EditableFormField/EditableCheckboxGroupField.php b/code/Model/EditableFormField/EditableCheckboxGroupField.php
index 4fd136c..58ca64c 100755
--- a/code/Model/EditableFormField/EditableCheckboxGroupField.php
+++ b/code/Model/EditableFormField/EditableCheckboxGroupField.php
@@ -25,7 +25,7 @@ class EditableCheckboxGroupField extends EditableMultipleOptionField
 
     public function getFormField()
     {
-        $field = UserFormsCheckboxSetField::create($this->Name, $this->Title, $this->getOptionsMap())
+        $field = UserFormsCheckboxSetField::create($this->Name, $this->Title ?: false, $this->getOptionsMap())
             ->setFieldHolderTemplate(EditableMultipleOptionField::class . '_holder')
             ->setTemplate(UserFormsCheckboxSetField::class);
 
diff --git a/code/Model/EditableFormField/EditableCountryDropdownField.php b/code/Model/EditableFormField/EditableCountryDropdownField.php
index 1446ad9..dd38a74 100644
--- a/code/Model/EditableFormField/EditableCountryDropdownField.php
+++ b/code/Model/EditableFormField/EditableCountryDropdownField.php
@@ -35,7 +35,7 @@ class EditableCountryDropdownField extends EditableFormField
 
     public function getFormField()
     {
-        $field = DropdownField::create($this->Name, $this->Title)
+        $field = DropdownField::create($this->Name, $this->Title ?: false)
             ->setSource(i18n::getData()->getCountries())
             ->setFieldHolderTemplate(EditableFormField::class . '_holder')
             ->setTemplate(EditableDropdown::class);
diff --git a/code/Model/EditableFormField/EditableDateField.php b/code/Model/EditableFormField/EditableDateField.php
index 0e54244..d8cf23e 100755
--- a/code/Model/EditableFormField/EditableDateField.php
+++ b/code/Model/EditableFormField/EditableDateField.php
@@ -58,7 +58,7 @@ class EditableDateField extends EditableFormField
             ? DBDatetime::now()->Format('Y-m-d')
             : $this->Default;
 
-        $field = FormField::create($this->Name, $this->Title, $defaultValue)
+        $field = FormField::create($this->Name, $this->Title ?: false, $defaultValue)
             ->setFieldHolderTemplate(EditableFormField::class . '_holder')
             ->setTemplate(EditableFormField::class);
 
diff --git a/code/Model/EditableFormField/EditableDropdown.php b/code/Model/EditableFormField/EditableDropdown.php
index 8020e1f..1fa8968 100755
--- a/code/Model/EditableFormField/EditableDropdown.php
+++ b/code/Model/EditableFormField/EditableDropdown.php
@@ -60,7 +60,7 @@ class EditableDropdown extends EditableMultipleOptionField
      */
     public function getFormField()
     {
-        $field = DropdownField::create($this->Name, $this->Title, $this->getOptionsMap())
+        $field = DropdownField::create($this->Name, $this->Title ?: false, $this->getOptionsMap())
             ->setFieldHolderTemplate(EditableFormField::class . '_holder')
             ->setTemplate(__CLASS__);
 
diff --git a/code/Model/EditableFormField/EditableEmailField.php b/code/Model/EditableFormField/EditableEmailField.php
index 88009d6..deccc11 100644
--- a/code/Model/EditableFormField/EditableEmailField.php
+++ b/code/Model/EditableFormField/EditableEmailField.php
@@ -30,7 +30,7 @@ class EditableEmailField extends EditableFormField
 
     public function getFormField()
     {
-        $field = EmailField::create($this->Name, $this->Title, $this->Default)
+        $field = EmailField::create($this->Name, $this->Title ?: false, $this->Default)
             ->setFieldHolderTemplate(EditableFormField::class . '_holder')
             ->setTemplate(EditableFormField::class);
 
diff --git a/code/Model/EditableFormField/EditableFileField.php b/code/Model/EditableFormField/EditableFileField.php
index eaf020c..cd4a725 100755
--- a/code/Model/EditableFormField/EditableFileField.php
+++ b/code/Model/EditableFormField/EditableFileField.php
@@ -97,7 +97,7 @@ class EditableFileField extends EditableFormField
 
     public function getFormField()
     {
-        $field = FileField::create($this->Name, $this->Title)
+        $field = FileField::create($this->Name, $this->Title ?: false)
             ->setFieldHolderTemplate(EditableFormField::class . '_holder')
             ->setTemplate(__CLASS__);
 
diff --git a/code/Model/EditableFormField/EditableFormHeading.php b/code/Model/EditableFormField/EditableFormHeading.php
index 2b76978..6e9b4eb 100644
--- a/code/Model/EditableFormField/EditableFormHeading.php
+++ b/code/Model/EditableFormField/EditableFormHeading.php
@@ -68,7 +68,7 @@ class EditableFormHeading extends EditableFormField
 
     public function getFormField()
     {
-        $labelField = HeaderField::create('userforms-header', $this->Title)
+        $labelField = HeaderField::create('userforms-header', $this->Title ?: false)
             ->setHeadingLevel($this->Level);
         $labelField->addExtraClass('FormHeading');
         $labelField->setAttribute('data-id', $this->Name);
diff --git a/code/Model/EditableFormField/EditableMemberListField.php b/code/Model/EditableFormField/EditableMemberListField.php
index 42d682b..b9b0429 100644
--- a/code/Model/EditableFormField/EditableMemberListField.php
+++ b/code/Model/EditableFormField/EditableMemberListField.php
@@ -54,7 +54,7 @@ class EditableMemberListField extends EditableFormField
         }
 
         $members = Member::map_in_groups($this->GroupID);
-        $field = DropdownField::create($this->Name, $this->Title, $members);
+        $field = DropdownField::create($this->Name, $this->Title ?: false, $members);
         $this->doUpdateFormField($field);
         return $field;
     }
diff --git a/code/Model/EditableFormField/EditableNumericField.php b/code/Model/EditableFormField/EditableNumericField.php
index ace2dd4..9916db9 100755
--- a/code/Model/EditableFormField/EditableNumericField.php
+++ b/code/Model/EditableFormField/EditableNumericField.php
@@ -41,7 +41,7 @@ class EditableNumericField extends EditableFormField
      */
     public function getFormField()
     {
-        $field = NumericField::create($this->Name, $this->Title, $this->Default)
+        $field = NumericField::create($this->Name, $this->Title ?: false, $this->Default)
             ->setFieldHolderTemplate(EditableFormField::class . '_holder')
             ->setTemplate(EditableFormField::class)
             ->addExtraClass('number');
diff --git a/code/Model/EditableFormField/EditableRadioField.php b/code/Model/EditableFormField/EditableRadioField.php
index d997265..433a4c9 100755
--- a/code/Model/EditableFormField/EditableRadioField.php
+++ b/code/Model/EditableFormField/EditableRadioField.php
@@ -35,7 +35,7 @@ class EditableRadioField extends EditableMultipleOptionField
 
     public function getFormField()
     {
-        $field = OptionsetField::create($this->Name, $this->Title, $this->getOptionsMap())
+        $field = OptionsetField::create($this->Name, $this->Title ?: false, $this->getOptionsMap())
             ->setFieldHolderTemplate(EditableMultipleOptionField::class . '_holder')
             ->setTemplate('SilverStripe\\UserForms\\FormField\\UserFormsOptionSetField');
 
diff --git a/code/Model/EditableFormField/EditableTextField.php b/code/Model/EditableFormField/EditableTextField.php
index 7dc3fbc..3116476 100644
--- a/code/Model/EditableFormField/EditableTextField.php
+++ b/code/Model/EditableFormField/EditableTextField.php
@@ -128,12 +128,12 @@ class EditableTextField extends EditableFormField
     public function getFormField()
     {
         if ($this->Rows > 1) {
-            $field = TextareaField::create($this->Name, $this->Title, $this->Default)
+            $field = TextareaField::create($this->Name, $this->Title ?: false, $this->Default)
                 ->setFieldHolderTemplate(EditableFormField::class . '_holder')
                 ->setTemplate(str_replace('EditableTextField', 'EditableTextareaField', __CLASS__))
                 ->setRows($this->Rows);
         } else {
-            $field = TextField::create($this->Name, $this->Title, $this->Default)
+            $field = TextField::create($this->Name, $this->Title ?: false, $this->Default)
                 ->setFieldHolderTemplate(EditableFormField::class . '_holder')
                 ->setTemplate(EditableFormField::class);
         }
diff --git a/tests/Model/EditableFormField/EditableLiteralFieldTest.php b/tests/Model/EditableFormField/EditableLiteralFieldTest.php
index 6d9e291..c12f77f 100644
--- a/tests/Model/EditableFormField/EditableLiteralFieldTest.php
+++ b/tests/Model/EditableFormField/EditableLiteralFieldTest.php
@@ -87,12 +87,4 @@ class EditableLiteralFieldTest extends SapphireTest
             'Actual literal field exists in composite field children'
         );
     }
-
-    public function testAllowEmptyTitle()
-    {
-        /** @var EditableLiteralField $field */
-        $field = EditableLiteralField::create();
-        $field->Name = 'EditableFormField_123456';
-        $this->assertEmpty($field->getFormField()->Title());
-    }
 }
diff --git a/tests/Model/EditableFormField/EditableTextFieldTest.php b/tests/Model/EditableFormField/EditableTextFieldTest.php
index 9bd947b..a00fd07 100644
--- a/tests/Model/EditableFormField/EditableTextFieldTest.php
+++ b/tests/Model/EditableFormField/EditableTextFieldTest.php
@@ -26,6 +26,10 @@ class EditableTextFieldTest extends SapphireTest
         /** @var EditableTextField $field */
         $field = EditableTextField::create();
         $field->Name = 'EditableFormField_123456';
+        $field->Rows = 1;
+        $this->assertEmpty($field->getFormField()->Title());
+
+        $field->Rows = 3;
         $this->assertEmpty($field->getFormField()->Title());
     }
 }

From b615721f22d03ed85d05e3ed6fb39b881dd5e28b Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Mon, 26 Mar 2018 10:46:09 +1300
Subject: [PATCH 3/4] Switch test assertion to be more flexible in URL pieces
 (versioned changes in 4.2)

---
 tests/Control/UserDefinedFormControllerTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/Control/UserDefinedFormControllerTest.php b/tests/Control/UserDefinedFormControllerTest.php
index f4f6171..1fa8207 100644
--- a/tests/Control/UserDefinedFormControllerTest.php
+++ b/tests/Control/UserDefinedFormControllerTest.php
@@ -89,7 +89,9 @@ class UserDefinedFormControllerTest extends FunctionalTest
 
         // check to see if the user was redirected (301)
         $this->assertEquals($response->getStatusCode(), 302);
-        $this->assertStringEndsWith('finished#uff', $response->getHeader('Location'));
+        $location = $response->getHeader('Location');
+        $this->assertContains('finished', $location);
+        $this->assertStringEndsWith('#uff', $location);
 
         // check that multiple email addresses are supported in to and from
         $this->assertEmailSent(

From 68a072374915888c3441fb1c51f6e8d2ddd0fa8b Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Mon, 26 Mar 2018 10:46:17 +1300
Subject: [PATCH 4/4] Remove incorrect @covers annotation

---
 tests/Model/EditableFormFieldTest.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/Model/EditableFormFieldTest.php b/tests/Model/EditableFormFieldTest.php
index 145d559..595a340 100644
--- a/tests/Model/EditableFormFieldTest.php
+++ b/tests/Model/EditableFormFieldTest.php
@@ -86,9 +86,6 @@ class EditableFormFieldTest extends FunctionalTest
         $this->assertEquals(0, $checkbox->EffectiveDisplayRules()->count());
     }
 
-    /**
-     * @covers EditableOption::getValue
-     */
     public function testEditableOptionEmptyValue()
     {
         $option = $this->objFromFixture(EditableOption::class, 'option-1');