FIX Update namespacing and include paths in new multiple option field tests

code/Model/EditableFormField/EditableCheckboxGroupField.php

@@ -26,7 +26,8 @@ class EditableCheckboxGroupField extends EditableMultipleOptionField
     public function getFormField()
     {
         $field = UserFormsCheckboxSetField::create($this->Name, $this->EscapedTitle, $this->getOptionsMap())
-            ->setFieldHolderTemplate(EditableMultipleOptionField::class . '_holder');
+            ->setFieldHolderTemplate(EditableMultipleOptionField::class . '_holder')
+            ->setTemplate(UserFormsCheckboxSetField::class);
 
         // Set the default checked items
         $defaultCheckedItems = $this->getDefaultOptions();

code/Model/Recipient/EmailRecipient.php

@@ -26,6 +26,7 @@ use SilverStripe\Forms\TextareaField;
 use SilverStripe\Forms\TextField;
 use SilverStripe\ORM\ArrayList;
 use SilverStripe\ORM\DataObject;
+use SilverStripe\ORM\FieldType\DBField;
 use SilverStripe\UserForms\Model\EditableFormField\EditableEmailField;
 use SilverStripe\UserForms\Model\EditableFormField;
 use SilverStripe\UserForms\Model\EditableFormField\EditableMultipleOptionField;
@@ -504,7 +505,7 @@ class EmailRecipient extends DataObject
     public function getEmailBodyContent()
     {
         if ($this->SendPlain) {
-            return DBField::create_field('HTMLText', $this->EmailBody)->NoHTML();
+            return DBField::create_field('HTMLText', $this->EmailBody)->Plain();
         }
         return DBField::create_field('HTMLText', $this->EmailBodyHtml)->RAW();
     }

templates/SilverStripe/UserForms/Form/UserForm.ss

@@ -12,11 +12,11 @@
 <% if $Legend %>
     <fieldset>
         <legend>$Legend</legend>
-        <% include UserFormFields %>
+        <% include SilverStripe\\UserForms\\Form\\UserFormFields %>
     </fieldset>
 <% else %>
     <div class="userform-fields">
-        <% include UserFormFields %>
+        <% include SilverStripe\\UserForms\\Form\\UserFormFields %>
     </div>
 <% end_if %>
 

tests/EditableCheckboxGroupFieldTest.php

@@ -1,15 +0,0 @@
-<?php
-
-class EditableCheckboxGroupFieldTest extends SapphireTest
-{
-    protected static $fixture_file = 'EditableFormFieldTest.yml';
-
-    /**
-     * Tests that this element is rendered with a custom template
-     */
-    public function testRenderedWithCustomTemplate()
-    {
-        $checkboxGroup = $this->objFromFixture('EditableCheckboxGroupField', 'checkbox-group');
-        $this->assertEquals('UserFormsCheckboxSetField', $checkboxGroup->getFormField()->getTemplate());
-    }
-}

tests/EditableRadioFieldTest.php

@@ -1,15 +0,0 @@
-<?php
-
-class EditableRadioFieldTest extends SapphireTest
-{
-    protected static $fixture_file = 'EditableFormFieldTest.yml';
-
-    /**
-     * Tests that this element is rendered with a custom template
-     */
-    public function testRenderedWithCustomTemplate()
-    {
-        $radio = $this->objFromFixture('EditableRadioField', 'radio-field');
-        $this->assertEquals('UserFormsOptionSetField', $radio->getFormField()->getTemplate());
-    }
-}

tests/Model/EditableFormField/EditableCheckboxGroupFieldTest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace SilverStripe\UserForms\Tests\Model\EditableFormField;
+
+use SilverStripe\Dev\SapphireTest;
+use SilverStripe\UserForms\FormField\UserFormsCheckboxSetField;
+use SilverStripe\UserForms\Model\EditableFormField\EditableCheckboxGroupField;
+
+class EditableCheckboxGroupFieldTest extends SapphireTest
+{
+    protected static $fixture_file = '../EditableFormFieldTest.yml';
+
+    /**
+     * Tests that this element is rendered with a custom template
+     */
+    public function testRenderedWithCustomTemplate()
+    {
+        $checkboxGroup = $this->objFromFixture(EditableCheckboxGroupField::class, 'checkbox-group');
+        $this->assertSame(UserFormsCheckboxSetField::class, $checkboxGroup->getFormField()->getTemplate());
+    }
+}

tests/Model/EditableFormField/EditableRadioFieldTest.php

@@ -0,0 +1,25 @@
+<?php
+
+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
+{
+    protected static $fixture_file = '../EditableFormFieldTest.yml';
+
+    /**
+     * Tests that this element is rendered with a custom template
+     */
+    public function testRenderedWithCustomTemplate()
+    {
+        $radio = $this->objFromFixture(EditableRadioField::class, 'radio-field');
+        $this->assertSame(
+            'SilverStripe\\UserForms\\FormField\\UserFormsOptionSetField',
+            $radio->getFormField()->getTemplate()
+        );
+    }
+}

tests/Model/EditableFormField/EditableTextFieldTest.php

@@ -1,17 +1,23 @@
 <?php
 
+namespace SilverStripe\UserForms\Tests\Model\EditableFormField;
+
+use SilverStripe\Core\Config\Config;
+use SilverStripe\Dev\SapphireTest;
+use SilverStripe\Forms\DropdownField;
+use SilverStripe\UserForms\Model\EditableFormField\EditableTextField;
+
 class EditableTextFieldTest extends SapphireTest
 {
     public function testGetCmsFields()
     {
-        Config::inst()->remove('EditableTextField', 'autocomplete_options');
-        Config::inst()->update('EditableTextField', 'autocomplete_options', array('foo' => 'foo'));
+        Config::modify()->set(EditableTextField::class, 'autocomplete_options', ['foo' => 'foo']);
 
         $field = new EditableTextField;
         $result = $field->getCMSFields();
 
         $autocompleteField = $result->fieldByName('Root.Main.Autocomplete');
-        $this->assertInstanceOf('DropdownField', $autocompleteField);
-        $this->assertEquals(array('foo' => 'foo'), $autocompleteField->getSource());
+        $this->assertInstanceOf(DropdownField::class, $autocompleteField);
+        $this->assertEquals(['foo' => 'foo'], $autocompleteField->getSource());
     }
 }

tests/Model/Recipient/EmailRecipientTest.php

@@ -1,14 +1,20 @@
 <?php
 
-class UserDefinedForm_EmailRecipientTest extends SapphireTest
+namespace SilverStripe\UserForms\Tests\Model\Recipient;
+
+use SilverStripe\CMS\Model\SiteTree;
+use SilverStripe\Dev\SapphireTest;
+use SilverStripe\UserForms\Model\Recipient\EmailRecipient;
+
+class EmailRecipientTest extends SapphireTest
 {
-    protected static $fixture_file = 'UserDefinedForm_EmailRecipientTest.yml';
+    protected static $fixture_file = 'EmailRecipientTest.yml';
 
     public function testShortcodesAreRenderedInEmailPreviewContent()
     {
-        $page = $this->objFromFixture('SiteTree', 'about_us');
+        $page = $this->objFromFixture(SiteTree::class, 'about_us');
 
-        $recipient = UserDefinedForm_EmailRecipient::create();
+        $recipient = EmailRecipient::create();
         $recipient->SendPlain = false;
         $recipient->EmailBodyHtml = '<p>Some email content. About us: [sitetree_link,id=' . $page->ID . '].</p>';
 

tests/Model/Recipient/EmailRecipientTest.yml

@@ -1,4 +1,4 @@
-SiteTree:
+SilverStripe\CMS\Model\SiteTree:
   about_us:
     Title: About Us
     URLSegment: about-us