BUG Issues with CMSForm not consistently respecting new form naming s…

…cheme.

Fixes for failing CMSFormTest cases

admin/code/CMSForm.php

@@ -86,9 +86,4 @@ public function getResponseNegotiator() {
 		return $this->responseNegotiator;
 	}
 
-	public function FormName() {
-		if($this->htmlID) return $this->htmlID;
-		else return 'Form_' . str_replace(array('.', '/'), '', $this->name);
-	}
-
-}
+}

admin/tests/CMSFormTest.php

@@ -10,7 +10,7 @@ public function testValidationExemptActions() {
 		$response = $this->get('CMSFormTest_Controller');
 
 		$response = $this->submitForm(
-			'Form_Form',
+			'CMSForm_Form',
 			'action_doSubmit',
 			array(
 				'Email' => 'test@test.com'
@@ -19,7 +19,7 @@ public function testValidationExemptActions() {
 
 		// Firstly, assert that required fields still work when not using an exempt action
 		$this->assertPartialMatchBySelector(
-			'#SomeRequiredField span.required',
+			'#CMSForm_Form_SomeRequiredField_Holder span.required',
 			array(
 				'"Some Required Field" is required'
 			),
@@ -28,20 +28,20 @@ public function testValidationExemptActions() {
 
 		// Re-submit the form using validation-exempt button
 		$response = $this->submitForm(
-			'Form_Form',
+			'CMSForm_Form',
 			'action_doSubmitValidationExempt',
 			array(
 				'Email' => 'test@test.com'
 			)
 		);
 
 		// The required message should be empty if validation was skipped
-		$items = $this->cssParser()->getBySelector('#SomeRequiredField span.required');
+		$items = $this->cssParser()->getBySelector('#CMSForm_Form_SomeRequiredField_Holder span.required');
 		$this->assertEmpty($items);
 
 		// And the session message should show up is submitted successfully
 		$this->assertPartialMatchBySelector(
-			'#Form_Form_error',
+			'#CMSForm_Form_error',
 			array(
 				'Validation skipped'
 			),

forms/Form.php

@@ -693,7 +693,7 @@ public function getAttribute($name) {
 
 	public function getAttributes() {
 		$attrs = array(
-			'id' => $this->getTemplateHelper()->generateFormID($this),
+			'id' => $this->FormName(),
 			'action' => $this->FormAction(),
 			'method' => $this->FormMethod(),
 			'enctype' => $this->getEncType(),