FIX: two broken tests in UserDefinedFormControllerTest

This commit is contained in:
Mike 2015-01-22 16:36:22 +13:00
parent f1ddac35d8
commit 0d4d949b23
2 changed files with 19 additions and 21 deletions

View File

@ -216,13 +216,13 @@ class UserDefinedFormControllerTest extends FunctionalTest {
$this->assertArrayHasKey(0, $parser->getBySelector('input.text')); $this->assertArrayHasKey(0, $parser->getBySelector('input.text'));
// check for the label and the text // check for the label and the text
$label = $parser->getBySelector('label.left'); $label = $parser->getBySelector('label.field__label');
$this->assertArrayHasKey(0, $label); $this->assertArrayHasKey(0, $label);
$this->assertEquals((string) $label[0][0], "Basic Text Field", "Label contains correct field name"); $this->assertEquals((string) $label[0][0], "Basic Text Field", "Label contains correct field name");
// check for the action // check for the action
$action = $parser->getBySelector('input.action'); $action = $parser->getBySelector('input.btn--submit');
$this->assertArrayHasKey(0, $action); $this->assertArrayHasKey(0, $action);
$this->assertEquals((string) $action[0]['value'], "Submit", "Submit button has default text"); $this->assertEquals((string) $action[0]['value'], "Submit", "Submit button has default text");

View File

@ -2,7 +2,7 @@ EditableOption:
option-1: option-1:
Name: Option1 Name: Option1
Title: Option 1 Title: Option 1
option-2: option-2:
Name: Option2 Name: Option2
Title: Option 2 Title: Option 2
@ -30,71 +30,71 @@ EditableOption:
option-6: option-6:
Name: Option6 Name: Option6
Title: Option 6 Title: Option 6
UserDefinedForm_EmailRecipient: UserDefinedForm_EmailRecipient:
recipient-1: recipient-1:
EmailAddress: test@example.com EmailAddress: test@example.com
EmailSubject: Email Subject EmailSubject: Email Subject
EmailFrom: no-reply@example.com EmailFrom: no-reply@example.com
no-html: no-html:
EmailAddress: nohtml@example.com EmailAddress: nohtml@example.com
EmailSubject: Email Subject EmailSubject: Email Subject
EmailFrom: no-reply@example.com EmailFrom: no-reply@example.com
SendPlain: true SendPlain: true
no-data: no-data:
EmailAddress: nodata@example.com EmailAddress: nodata@example.com
EmailSubject: Email Subject EmailSubject: Email Subject
EmailFrom: no-reply@example.com EmailFrom: no-reply@example.com
HideFormData: true HideFormData: true
EditableTextField: EditableTextField:
basic-text: basic-text:
Name: basic-text-name Name: basic-text-name
Title: Basic Text Field Title: Basic Text Field
basic-text-2: basic-text-2:
Name: basic-text-name Name: basic-text-name
Title: Basic Text Field Title: Basic Text Field
required-text: required-text:
Name: required-text-field Name: required-text-field
Title: Required Text Field Title: Required Text Field
CustomErrorMessage: Custom Error Message CustomErrorMessage: Custom Error Message
Required: true Required: true
EditableDropdown: EditableDropdown:
basic-dropdown: basic-dropdown:
Name: basic-dropdown Name: basic-dropdown
Title: Basic Dropdown Field Title: Basic Dropdown Field
Options: =>EditableOption.option-1, =>EditableOption.option-2 Options: =>EditableOption.option-1, =>EditableOption.option-2
department-dropdown: department-dropdown:
Name: department Name: department
Title: Department Title: Department
Options: =>EditableOption.department-1, =>EditableOption.department-2 Options: =>EditableOption.department-1, =>EditableOption.department-2
EditableCheckbox: EditableCheckbox:
checkbox-1: checkbox-1:
Name: checkbox-1 Name: checkbox-1
Title: Checkbox 1 Title: Checkbox 1
checkbox-2: checkbox-2:
Name: checkbox-1 Name: checkbox-1
Title: Checkbox 1 Title: Checkbox 1
EditableCheckboxGroupField: EditableCheckboxGroupField:
checkbox-group: checkbox-group:
Name: check-box-group Name: check-box-group
Title: Check box group Title: Check box group
Options: =>EditableOption.option-3, =>EditableOption.option-4 Options: =>EditableOption.option-3, =>EditableOption.option-4
EditableEmailField: EditableEmailField:
email-field: email-field:
Name: email-field Name: email-field
Title: Email Title: Email
EditableRadioField: EditableRadioField:
radio-field: radio-field:
@ -108,20 +108,18 @@ UserDefinedForm:
Title: User Defined Form Title: User Defined Form
Fields: =>EditableTextField.basic-text Fields: =>EditableTextField.basic-text
EmailRecipients: =>UserDefinedForm_EmailRecipient.recipient-1, =>UserDefinedForm_EmailRecipient.no-html, =>UserDefinedForm_EmailRecipient.no-data EmailRecipients: =>UserDefinedForm_EmailRecipient.recipient-1, =>UserDefinedForm_EmailRecipient.no-html, =>UserDefinedForm_EmailRecipient.no-data
form-with-reset-and-custom-action: form-with-reset-and-custom-action:
Title: Form with Reset Action Title: Form with Reset Action
SubmitButtonText: Custom Button SubmitButtonText: Custom Button
ShowClearButton: true ShowClearButton: true
validation-form: validation-form:
Title: Validation Form Title: Validation Form
Fields: =>EditableTextField.required-text Fields: =>EditableTextField.required-text
custom-rules-form: custom-rules-form:
Title: Custom Rules Form Title: Custom Rules Form
Fields: =>EditableCheckbox.checkbox-2, =>EditableTextField.basic-text-2 Fields: =>EditableCheckbox.checkbox-2, =>EditableTextField.basic-text-2
empty-form: empty-form:
Title: Empty Form Title: Empty Form