From 25127615874c6498ff4f39a146d00193ec9ee356 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@fullscreen.io>
Date: Thu, 5 Apr 2018 10:16:25 +1200
Subject: [PATCH] Fix invalid markup in SelectionGroup selected values

---
 .../SilverStripe/Forms/SelectionGroup.ss      |  4 +--
 tests/php/Forms/SelectionGroupTest.php        | 27 +++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/templates/SilverStripe/Forms/SelectionGroup.ss b/templates/SilverStripe/Forms/SelectionGroup.ss
index 8147c9a62..fc7434b1d 100644
--- a/templates/SilverStripe/Forms/SelectionGroup.ss
+++ b/templates/SilverStripe/Forms/SelectionGroup.ss
@@ -2,7 +2,7 @@
 	<ul class="SelectionGroup<% if extraClass %> $extraClass<% end_if %>">
 	<% loop $FieldSet %>
 	<% if $Selected %>
-		<li$Selected>
+		<li class="selected">
 			$RadioLabel
 			$FieldHolder
 		</li>
@@ -12,7 +12,7 @@
 <% else %>
 	<ul class="SelectionGroup<% if extraClass %> $extraClass<% end_if %>">
 	<% loop $FieldSet %>
-		<li$Selected>
+		<li <% if Selected %>class="selected"<% end_if %>>
 			<label>{$RadioButton} {$RadioLabel}</label>
 			<% if $FieldList %>
 				$FieldHolder
diff --git a/tests/php/Forms/SelectionGroupTest.php b/tests/php/Forms/SelectionGroupTest.php
index d87fe9000..87575ed1d 100644
--- a/tests/php/Forms/SelectionGroupTest.php
+++ b/tests/php/Forms/SelectionGroupTest.php
@@ -41,6 +41,33 @@ class SelectionGroupTest extends SapphireTest
         $this->assertContains('two view', (string)$listElTwo->div);
     }
 
+    function testSelectedFieldHolder()
+    {
+        $items = array(
+            new SelectionGroup_Item(
+                'one',
+                new LiteralField('one', 'one view'),
+                'one title'
+            ),
+            new SelectionGroup_Item(
+                'two',
+                new LiteralField('two', 'two view'),
+                'two title'
+            ),
+        );
+        $field = new SelectionGroup('MyGroup', $items);
+        $field->setValue('two');
+
+        $parser = new CSSContentParser($field->FieldHolder());
+        $listEls = $parser->getBySelector('li');
+        $listElOne = $listEls[0];
+        $listElTwo = $listEls[1];
+
+        $this->assertEquals('one', (string)$listElOne->label[0]->input[0]['value']);
+        $this->assertEquals('two', (string)$listElTwo->label[0]->input[0]['value']);
+        $this->assertEquals('selected', (string)$listElTwo->attributes()->class);
+    }
+
     function testLegacyItemsFieldHolder()
     {
         $items = array(