From 0d4d949b2313688802c5a6918b9dbdeb24807dcc Mon Sep 17 00:00:00 2001
From: Mike <mike@silverstripe.com>
Date: Thu, 22 Jan 2015 16:36:22 +1300
Subject: [PATCH] FIX: two broken tests in UserDefinedFormControllerTest

---
 tests/UserDefinedFormControllerTest.php |  4 +--
 tests/UserDefinedFormTest.yml           | 36 ++++++++++++-------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/tests/UserDefinedFormControllerTest.php b/tests/UserDefinedFormControllerTest.php
index cd63874..c920b86 100644
--- a/tests/UserDefinedFormControllerTest.php
+++ b/tests/UserDefinedFormControllerTest.php
@@ -216,13 +216,13 @@ class UserDefinedFormControllerTest extends FunctionalTest {
 		$this->assertArrayHasKey(0, $parser->getBySelector('input.text'));
 		
 		// check for the label and the text
-		$label = $parser->getBySelector('label.left');
+		$label = $parser->getBySelector('label.field__label');
 		$this->assertArrayHasKey(0, $label);
 		
 		$this->assertEquals((string) $label[0][0], "Basic Text Field", "Label contains correct field name");
 		
 		// check for the action
-		$action = $parser->getBySelector('input.action');
+		$action = $parser->getBySelector('input.btn--submit');
 		$this->assertArrayHasKey(0, $action);
 		
 		$this->assertEquals((string) $action[0]['value'], "Submit", "Submit button has default text");
diff --git a/tests/UserDefinedFormTest.yml b/tests/UserDefinedFormTest.yml
index 7b95324..b5b109a 100644
--- a/tests/UserDefinedFormTest.yml
+++ b/tests/UserDefinedFormTest.yml
@@ -2,7 +2,7 @@ EditableOption:
     option-1:
         Name: Option1
         Title: Option 1
-    
+
     option-2:
         Name: Option2
         Title: Option 2
@@ -30,71 +30,71 @@ EditableOption:
     option-6:
         Name: Option6
         Title: Option 6
-        
+
 UserDefinedForm_EmailRecipient:
     recipient-1:
         EmailAddress: test@example.com
         EmailSubject: Email Subject
         EmailFrom: no-reply@example.com
-        
+
     no-html:
         EmailAddress: nohtml@example.com
         EmailSubject: Email Subject
         EmailFrom: no-reply@example.com
         SendPlain: true
-        
+
     no-data:
         EmailAddress: nodata@example.com
         EmailSubject: Email Subject
         EmailFrom: no-reply@example.com  
         HideFormData: true
-    
+
 EditableTextField:
     basic-text:
         Name: basic-text-name
         Title: Basic Text Field
- 
+
     basic-text-2:
         Name: basic-text-name
         Title: Basic Text Field
-                  
+
     required-text:
         Name: required-text-field
         Title: Required Text Field
         CustomErrorMessage: Custom Error Message
         Required: true
-        
+
 EditableDropdown:
     basic-dropdown:
         Name: basic-dropdown
         Title: Basic Dropdown Field
         Options: =>EditableOption.option-1, =>EditableOption.option-2
-        
+
     department-dropdown:
         Name: department
         Title: Department
         Options: =>EditableOption.department-1, =>EditableOption.department-2
-        
+
 EditableCheckbox:
     checkbox-1:
         Name: checkbox-1
         Title: Checkbox 1
-        
+
     checkbox-2:
         Name: checkbox-1
         Title: Checkbox 1
-        
+
 EditableCheckboxGroupField:
     checkbox-group:
         Name: check-box-group
         Title: Check box group
         Options: =>EditableOption.option-3, =>EditableOption.option-4
-                
+
 EditableEmailField:
     email-field:
         Name: email-field
         Title: Email
-        
+
 
 EditableRadioField:
     radio-field:
@@ -108,20 +108,18 @@ UserDefinedForm:
         Title: User Defined Form
         Fields: =>EditableTextField.basic-text
         EmailRecipients: =>UserDefinedForm_EmailRecipient.recipient-1, =>UserDefinedForm_EmailRecipient.no-html, =>UserDefinedForm_EmailRecipient.no-data
-        
+
     form-with-reset-and-custom-action:
         Title: Form with Reset Action
         SubmitButtonText: Custom Button
         ShowClearButton: true
-        
+
     validation-form:
         Title: Validation Form
         Fields: =>EditableTextField.required-text
-        
+
     custom-rules-form:
         Title: Custom Rules Form
         Fields: =>EditableCheckbox.checkbox-2, =>EditableTextField.basic-text-2
     empty-form:
         Title: Empty Form
-        
-