Thanks, we\'ve received your submission.
' - ); - - /** - * @var array - */ - private static $has_many = array( - "Submissions" => "SubmittedForm", - "EmailRecipients" => "UserDefinedForm_EmailRecipient" - ); - - /** - * @var array - * @config - */ - private static $casting = array( - 'ErrorContainerID' => 'Text' - ); - - /** - * Error container selector which matches the element for grouped messages - * - * @var string - * @config - */ - private static $error_container_id = 'error-container'; - - /** - * The configuration used to determine whether a confirmation message is to - * appear when navigating away from a partially completed form. - * - * @var boolean - * @config - */ - private static $enable_are_you_sure = true; - - /** - * @var bool + /** + * Should this module automatically upgrade on dev/build? + * * @config - */ - private static $recipients_warning_enabled = false; + * @var bool + */ + private static $upgrade_on_build = true; - /** - * Temporary storage of field ids when the form is duplicated. - * Example layout: array('EditableCheckbox3' => 'EditableCheckbox14') - * @var array - */ - protected $fieldsFromTo = array(); + /** + * Built in extensions required by this page + * @config + * @var array + */ + private static $extensions = array( + 'UserFormFieldEditorExtension' + ); - /** - * @return FieldList - */ - public function getCMSFields() { - Requirements::css(USERFORMS_DIR . '/css/UserForm_cms.css'); + /** + * @var array Fields on the user defined form page. + */ + private static $db = array( + "SubmitButtonText" => "Varchar", + "ClearButtonText" => "Varchar", + "OnCompleteMessage" => "HTMLText", + "ShowClearButton" => "Boolean", + 'DisableSaveSubmissions' => 'Boolean', + 'EnableLiveValidation' => 'Boolean', + 'HideFieldLabels' => 'Boolean', + 'DisplayErrorMessagesAtTop' => 'Boolean', + 'DisableAuthenicatedFinishAction' => 'Boolean', + 'DisableCsrfSecurityToken' => 'Boolean' + ); - $self = $this; + /** + * @var array Default values of variables when this page is created + */ + private static $defaults = array( + 'Content' => '$UserDefinedForm', + 'DisableSaveSubmissions' => 0, + 'OnCompleteMessage' => 'Thanks, we\'ve received your submission.
' + ); - $this->beforeUpdateCMSFields(function($fields) use ($self) { + /** + * @var array + */ + private static $has_many = array( + "Submissions" => "SubmittedForm", + "EmailRecipients" => "UserDefinedForm_EmailRecipient" + ); - // define tabs - $fields->findOrMakeTab('Root.FormOptions', _t('UserDefinedForm.CONFIGURATION', 'Configuration')); - $fields->findOrMakeTab('Root.Recipients', _t('UserDefinedForm.RECIPIENTS', 'Recipients')); - $fields->findOrMakeTab('Root.Submissions', _t('UserDefinedForm.SUBMISSIONS', 'Submissions')); + /** + * @var array + * @config + */ + private static $casting = array( + 'ErrorContainerID' => 'Text' + ); - // text to show on complete - $onCompleteFieldSet = new CompositeField( - $label = new LabelField('OnCompleteMessageLabel',_t('UserDefinedForm.ONCOMPLETELABEL', 'Show on completion')), - $editor = new HtmlEditorField( 'OnCompleteMessage', '', _t('UserDefinedForm.ONCOMPLETEMESSAGE', $self->OnCompleteMessage)) - ); + /** + * Error container selector which matches the element for grouped messages + * + * @var string + * @config + */ + private static $error_container_id = 'error-container'; - $onCompleteFieldSet->addExtraClass('field'); + /** + * The configuration used to determine whether a confirmation message is to + * appear when navigating away from a partially completed form. + * + * @var boolean + * @config + */ + private static $enable_are_you_sure = true; - $editor->setRows(3); - $label->addExtraClass('left'); + /** + * @var bool + * @config + */ + private static $recipients_warning_enabled = false; - // Define config for email recipients - $emailRecipientsConfig = GridFieldConfig_RecordEditor::create(10); - $emailRecipientsConfig->getComponentByType('GridFieldAddNewButton') - ->setButtonName( - _t('UserDefinedForm.ADDEMAILRECIPIENT', 'Add Email Recipient') - ); + /** + * Temporary storage of field ids when the form is duplicated. + * Example layout: array('EditableCheckbox3' => 'EditableCheckbox14') + * @var array + */ + protected $fieldsFromTo = array(); - // who do we email on submission - $emailRecipients = new GridField( - 'EmailRecipients', - _t('UserDefinedForm.EMAILRECIPIENTS', 'Email Recipients'), - $self->EmailRecipients(), - $emailRecipientsConfig - ); - $emailRecipients - ->getConfig() - ->getComponentByType('GridFieldDetailForm') - ->setItemRequestClass('UserFormRecipientItemRequest'); + /** + * @return FieldList + */ + public function getCMSFields() + { + Requirements::css(USERFORMS_DIR . '/css/UserForm_cms.css'); - $fields->addFieldsToTab('Root.FormOptions', $onCompleteFieldSet); - $fields->addFieldToTab('Root.Recipients', $emailRecipients); - $fields->addFieldsToTab('Root.FormOptions', $self->getFormOptions()); + $self = $this; + + $this->beforeUpdateCMSFields(function ($fields) use ($self) { + + // define tabs + $fields->findOrMakeTab('Root.FormOptions', _t('UserDefinedForm.CONFIGURATION', 'Configuration')); + $fields->findOrMakeTab('Root.Recipients', _t('UserDefinedForm.RECIPIENTS', 'Recipients')); + $fields->findOrMakeTab('Root.Submissions', _t('UserDefinedForm.SUBMISSIONS', 'Submissions')); + + // text to show on complete + $onCompleteFieldSet = new CompositeField( + $label = new LabelField('OnCompleteMessageLabel', _t('UserDefinedForm.ONCOMPLETELABEL', 'Show on completion')), + $editor = new HtmlEditorField('OnCompleteMessage', '', _t('UserDefinedForm.ONCOMPLETEMESSAGE', $self->OnCompleteMessage)) + ); + + $onCompleteFieldSet->addExtraClass('field'); + + $editor->setRows(3); + $label->addExtraClass('left'); + + // Define config for email recipients + $emailRecipientsConfig = GridFieldConfig_RecordEditor::create(10); + $emailRecipientsConfig->getComponentByType('GridFieldAddNewButton') + ->setButtonName( + _t('UserDefinedForm.ADDEMAILRECIPIENT', 'Add Email Recipient') + ); + + // who do we email on submission + $emailRecipients = new GridField( + 'EmailRecipients', + _t('UserDefinedForm.EMAILRECIPIENTS', 'Email Recipients'), + $self->EmailRecipients(), + $emailRecipientsConfig + ); + $emailRecipients + ->getConfig() + ->getComponentByType('GridFieldDetailForm') + ->setItemRequestClass('UserFormRecipientItemRequest'); + + $fields->addFieldsToTab('Root.FormOptions', $onCompleteFieldSet); + $fields->addFieldToTab('Root.Recipients', $emailRecipients); + $fields->addFieldsToTab('Root.FormOptions', $self->getFormOptions()); - // view the submissions - $submissions = new GridField( - 'Submissions', - _t('UserDefinedForm.SUBMISSIONS', 'Submissions'), - $self->Submissions()->sort('Created', 'DESC') - ); + // view the submissions + $submissions = new GridField( + 'Submissions', + _t('UserDefinedForm.SUBMISSIONS', 'Submissions'), + $self->Submissions()->sort('Created', 'DESC') + ); - // make sure a numeric not a empty string is checked against this int column for SQL server - $parentID = (!empty($self->ID)) ? (int) $self->ID : 0; + // make sure a numeric not a empty string is checked against this int column for SQL server + $parentID = (!empty($self->ID)) ? (int) $self->ID : 0; - // get a list of all field names and values used for print and export CSV views of the GridField below. - $columnSQL = <<Giant Robots!
'; - $safeContent = 'Giant Robots!
'; - $field = new EditableLiteralField(); + /** + * Tests the sanitisation of HTML content + */ + public function testSanitisation() + { + $rawContent = 'Giant Robots!
'; + $safeContent = 'Giant Robots!
'; + $field = new EditableLiteralField(); - // Test with sanitisation enabled - Config::inst()->update('HtmlEditorField', 'sanitise_server_side', true); - $field->setContent($rawContent); - $this->assertEquals($safeContent, $field->getContent()); + // Test with sanitisation enabled + Config::inst()->update('HtmlEditorField', 'sanitise_server_side', true); + $field->setContent($rawContent); + $this->assertEquals($safeContent, $field->getContent()); - // Test with sanitisation disabled - Config::inst()->remove('HtmlEditorField', 'sanitise_server_side'); - $field->setContent($rawContent); - $this->assertEquals($rawContent, $field->getContent()); - } + // Test with sanitisation disabled + Config::inst()->remove('HtmlEditorField', 'sanitise_server_side'); + $field->setContent($rawContent); + $this->assertEquals($rawContent, $field->getContent()); + } - public function testHideLabel() { - $field = new EditableLiteralField(array( - 'Title' => 'Test label' - )); + public function testHideLabel() + { + $field = new EditableLiteralField(array( + 'Title' => 'Test label' + )); - $this->assertContains('Test label', $field->getFormField()->Field()); + $this->assertContains('Test label', $field->getFormField()->Field()); - $field->HideLabel = true; - $this->assertNotContains('Test label', $field->getFormField()->Field()); - } + $field->HideLabel = true; + $this->assertNotContains('Test label', $field->getFormField()->Field()); + } } diff --git a/tests/SecureEditableFileFieldTest.php b/tests/SecureEditableFileFieldTest.php index c6d56fe..4bc8194 100644 --- a/tests/SecureEditableFileFieldTest.php +++ b/tests/SecureEditableFileFieldTest.php @@ -5,79 +5,85 @@ * * @author dmooyman */ -class SecureEditableFileFieldTest extends SapphireTest { +class SecureEditableFileFieldTest extends SapphireTest +{ - protected $usesDatabase = true; + protected $usesDatabase = true; - public function setUp() { - parent::setUp(); + public function setUp() + { + parent::setUp(); - if(!class_exists('SecureFileExtension')) { - $this->skipTest = true; - $this->markTestSkipped(get_class() . ' skipped unless running with securefiles'); - } - Config::inst()->update('EditableFileField', 'secure_folder_name', 'SecureEditableFileFieldTest/SecureUploads'); - $this->clearPath(); - } + if (!class_exists('SecureFileExtension')) { + $this->skipTest = true; + $this->markTestSkipped(get_class() . ' skipped unless running with securefiles'); + } + Config::inst()->update('EditableFileField', 'secure_folder_name', 'SecureEditableFileFieldTest/SecureUploads'); + $this->clearPath(); + } - public function tearDown() { - $this->clearPath(); - parent::tearDown(); - } + public function tearDown() + { + $this->clearPath(); + parent::tearDown(); + } - protected function clearPath() { - if(file_exists(ASSETS_PATH . '/SecureEditableFileFieldTest')) { - Filesystem::removeFolder(ASSETS_PATH . '/SecureEditableFileFieldTest'); - } - } + protected function clearPath() + { + if (file_exists(ASSETS_PATH . '/SecureEditableFileFieldTest')) { + Filesystem::removeFolder(ASSETS_PATH . '/SecureEditableFileFieldTest'); + } + } - /** - * Test that newly created folders are secure - */ - public function testCreateFolder() { - $field = new EditableFileField(); - $field->write(); - $this->assertTrue($field->getIsSecure()); - $this->assertTrue($field->Folder()->exists()); - $this->assertEquals('assets/SecureEditableFileFieldTest/SecureUploads/', $field->Folder()->Filename); - $this->assertEquals('OnlyTheseUsers', $field->Folder()->CanViewType); - $this->assertEquals(1, $field->Folder()->ViewerGroups()->first()->Permissions()->filter('code', 'ADMIN')->count()); - } + /** + * Test that newly created folders are secure + */ + public function testCreateFolder() + { + $field = new EditableFileField(); + $field->write(); + $this->assertTrue($field->getIsSecure()); + $this->assertTrue($field->Folder()->exists()); + $this->assertEquals('assets/SecureEditableFileFieldTest/SecureUploads/', $field->Folder()->Filename); + $this->assertEquals('OnlyTheseUsers', $field->Folder()->CanViewType); + $this->assertEquals(1, $field->Folder()->ViewerGroups()->first()->Permissions()->filter('code', 'ADMIN')->count()); + } - /** - * Test new folders that are created without security enabled - */ - public function testCreateInsecure() { - Config::inst()->update('EditableFileField', 'disable_security', true); + /** + * Test new folders that are created without security enabled + */ + public function testCreateInsecure() + { + Config::inst()->update('EditableFileField', 'disable_security', true); - // Esure folder is created without a folder - $field = new EditableFileField(); - $field->write(); - $this->assertFalse($field->getIsSecure()); - $this->assertFalse($field->Folder()->exists()); + // Esure folder is created without a folder + $field = new EditableFileField(); + $field->write(); + $this->assertFalse($field->getIsSecure()); + $this->assertFalse($field->Folder()->exists()); - // Assigning a non-secure folder doesn't secure this - $folder = Folder::find_or_make('SecureEditableFileFieldTest/PublicFolder'); - $field->FolderID = $folder->ID; - $field->write(); + // Assigning a non-secure folder doesn't secure this + $folder = Folder::find_or_make('SecureEditableFileFieldTest/PublicFolder'); + $field->FolderID = $folder->ID; + $field->write(); - $this->assertFalse($field->getIsSecure()); - $this->assertTrue($field->Folder()->exists()); - $this->assertEquals('assets/SecureEditableFileFieldTest/PublicFolder/', $field->Folder()->Filename); - $this->assertEquals('Inherit', $field->Folder()->CanViewType); + $this->assertFalse($field->getIsSecure()); + $this->assertTrue($field->Folder()->exists()); + $this->assertEquals('assets/SecureEditableFileFieldTest/PublicFolder/', $field->Folder()->Filename); + $this->assertEquals('Inherit', $field->Folder()->CanViewType); - // Enabling security and re-saving will force this field to be made secure (but not changed) - Config::inst()->update('EditableFileField', 'disable_security', false); - singleton('EditableFileField')->requireDefaultRecords(); + // Enabling security and re-saving will force this field to be made secure (but not changed) + Config::inst()->update('EditableFileField', 'disable_security', false); + singleton('EditableFileField')->requireDefaultRecords(); - // Reload record from DB - $field = EditableFileField::get()->byID($field->ID); + // Reload record from DB + $field = EditableFileField::get()->byID($field->ID); - // Existing folder is now secured (retro-actively secures any old uploads) - $this->assertTrue($field->getIsSecure()); - $this->assertTrue($field->Folder()->exists()); - $this->assertEquals('assets/SecureEditableFileFieldTest/PublicFolder/', $field->Folder()->Filename); - $this->assertEquals('OnlyTheseUsers', $field->Folder()->CanViewType); - $this->assertEquals(1, $field->Folder()->ViewerGroups()->first()->Permissions()->filter('code', 'ADMIN')->count()); - } -} \ No newline at end of file + // Existing folder is now secured (retro-actively secures any old uploads) + $this->assertTrue($field->getIsSecure()); + $this->assertTrue($field->Folder()->exists()); + $this->assertEquals('assets/SecureEditableFileFieldTest/PublicFolder/', $field->Folder()->Filename); + $this->assertEquals('OnlyTheseUsers', $field->Folder()->CanViewType); + $this->assertEquals(1, $field->Folder()->ViewerGroups()->first()->Permissions()->filter('code', 'ADMIN')->count()); + } +} diff --git a/tests/UserDefinedFormControllerTest.php b/tests/UserDefinedFormControllerTest.php index a43cd64..75e4c27 100644 --- a/tests/UserDefinedFormControllerTest.php +++ b/tests/UserDefinedFormControllerTest.php @@ -4,282 +4,296 @@ * @package userforms */ -class UserDefinedFormControllerTest extends FunctionalTest { +class UserDefinedFormControllerTest extends FunctionalTest +{ - static $fixture_file = 'UserDefinedFormTest.yml'; + public static $fixture_file = 'UserDefinedFormTest.yml'; - public function testProcess() { - $form = $this->setupFormFrontend(); + public function testProcess() + { + $form = $this->setupFormFrontend(); - $controller = new UserDefinedFormControllerTest_Controller($form); + $controller = new UserDefinedFormControllerTest_Controller($form); - $this->autoFollowRedirection = false; - $this->clearEmails(); + $this->autoFollowRedirection = false; + $this->clearEmails(); - // load the form - $this->get($form->URLSegment); + // load the form + $this->get($form->URLSegment); - $field = $this->objFromFixture('EditableTextField', 'basic-text'); + $field = $this->objFromFixture('EditableTextField', 'basic-text'); - $response = $this->submitForm('UserForm_Form', null, array($field->Name => 'Basic Value')); + $response = $this->submitForm('UserForm_Form', null, array($field->Name => 'Basic Value')); - // should have a submitted form field now - $submitted = DataObject::get('SubmittedFormField', "\"Name\" = 'basic-text-name'"); - $this->assertDOSAllMatch(array('Name' => 'basic-text-name', 'Value' => 'Basic Value', 'Title' => 'Basic Text Field'), $submitted); + // should have a submitted form field now + $submitted = DataObject::get('SubmittedFormField', "\"Name\" = 'basic-text-name'"); + $this->assertDOSAllMatch(array('Name' => 'basic-text-name', 'Value' => 'Basic Value', 'Title' => 'Basic Text Field'), $submitted); - // check emails - $this->assertEmailSent('test@example.com', 'no-reply@example.com', 'Email Subject'); - $email = $this->findEmail('test@example.com', 'no-reply@example.com', 'Email Subject'); + // check emails + $this->assertEmailSent('test@example.com', 'no-reply@example.com', 'Email Subject'); + $email = $this->findEmail('test@example.com', 'no-reply@example.com', 'Email Subject'); - // assert that the email has the field title and the value html email - $parser = new CSSContentParser($email['content']); - $title = $parser->getBySelector('strong'); + // assert that the email has the field title and the value html email + $parser = new CSSContentParser($email['content']); + $title = $parser->getBySelector('strong'); - $this->assertEquals('Basic Text Field', (string) $title[0], 'Email contains the field name'); + $this->assertEquals('Basic Text Field', (string) $title[0], 'Email contains the field name'); - $value = $parser->getBySelector('dd'); - $this->assertEquals('Basic Value', (string) $value[0], 'Email contains the value'); + $value = $parser->getBySelector('dd'); + $this->assertEquals('Basic Value', (string) $value[0], 'Email contains the value'); - // no html - $this->assertEmailSent('nohtml@example.com', 'no-reply@example.com', 'Email Subject'); - $nohtml = $this->findEmail('nohtml@example.com', 'no-reply@example.com', 'Email Subject'); + // no html + $this->assertEmailSent('nohtml@example.com', 'no-reply@example.com', 'Email Subject'); + $nohtml = $this->findEmail('nohtml@example.com', 'no-reply@example.com', 'Email Subject'); - $this->assertContains('Basic Text Field: Basic Value', $nohtml['content'], 'Email contains no html'); + $this->assertContains('Basic Text Field: Basic Value', $nohtml['content'], 'Email contains no html'); - // no data - $this->assertEmailSent('nodata@example.com', 'no-reply@example.com', 'Email Subject'); - $nodata = $this->findEmail('nodata@example.com', 'no-reply@example.com', 'Email Subject'); + // no data + $this->assertEmailSent('nodata@example.com', 'no-reply@example.com', 'Email Subject'); + $nodata = $this->findEmail('nodata@example.com', 'no-reply@example.com', 'Email Subject'); - $parser = new CSSContentParser($nodata['content']); - $list = $parser->getBySelector('dl'); + $parser = new CSSContentParser($nodata['content']); + $list = $parser->getBySelector('dl'); - $this->assertFalse(isset($list[0]), 'Email contains no fields'); + $this->assertFalse(isset($list[0]), 'Email contains no fields'); - // check to see if the user was redirected (301) - $this->assertEquals($response->getStatusCode(), 302); - $this->assertStringEndsWith('finished#uff', $response->getHeader('Location')); - } + // check to see if the user was redirected (301) + $this->assertEquals($response->getStatusCode(), 302); + $this->assertStringEndsWith('finished#uff', $response->getHeader('Location')); + } - public function testValidation() { - $form = $this->setupFormFrontend('email-form'); + public function testValidation() + { + $form = $this->setupFormFrontend('email-form'); - // Post with no fields - $this->get($form->URLSegment); - $response = $this->submitForm('UserForm_Form', null, array()); - $this->assertPartialMatchBySelector( - '.field .message', - array('This field is required') - ); + // Post with no fields + $this->get($form->URLSegment); + $response = $this->submitForm('UserForm_Form', null, array()); + $this->assertPartialMatchBySelector( + '.field .message', + array('This field is required') + ); - // Post with all fields, but invalid email - $this->get($form->URLSegment); - $this->submitForm('UserForm_Form', null, array( - 'required-email' => 'invalid', - 'required-text' => 'bob' - )); - $this->assertPartialMatchBySelector( - '.field .message', - array('Please enter an email address') - ); + // Post with all fields, but invalid email + $this->get($form->URLSegment); + $this->submitForm('UserForm_Form', null, array( + 'required-email' => 'invalid', + 'required-text' => 'bob' + )); + $this->assertPartialMatchBySelector( + '.field .message', + array('Please enter an email address') + ); - // Post with only required - $this->get($form->URLSegment); - $this->submitForm('UserForm_Form', null, array( - 'required-text' => 'bob' - )); - $this->assertPartialMatchBySelector( - 'p', - array("Thanks, we've received your submission.") - ); - } + // Post with only required + $this->get($form->URLSegment); + $this->submitForm('UserForm_Form', null, array( + 'required-text' => 'bob' + )); + $this->assertPartialMatchBySelector( + 'p', + array("Thanks, we've received your submission.") + ); + } - public function testFinished() { - $form = $this->setupFormFrontend(); + public function testFinished() + { + $form = $this->setupFormFrontend(); - // set formProcessed and SecurityID to replicate the form being filled out - $this->session()->inst_set('SecurityID', 1); - $this->session()->inst_set('FormProcessed', 1); + // set formProcessed and SecurityID to replicate the form being filled out + $this->session()->inst_set('SecurityID', 1); + $this->session()->inst_set('FormProcessed', 1); - $response = $this->get($form->URLSegment.'/finished'); + $response = $this->get($form->URLSegment.'/finished'); - $this->assertContains($form->OnCompleteMessage ,$response->getBody()); - } + $this->assertContains($form->OnCompleteMessage, $response->getBody()); + } - public function testAppendingFinished() { - $form = $this->setupFormFrontend(); + public function testAppendingFinished() + { + $form = $this->setupFormFrontend(); - // replicate finished being added to the end of the form URL without the form being filled out - $this->session()->inst_set('SecurityID', 1); - $this->session()->inst_set('FormProcessed', null); + // replicate finished being added to the end of the form URL without the form being filled out + $this->session()->inst_set('SecurityID', 1); + $this->session()->inst_set('FormProcessed', null); - $response = $this->get($form->URLSegment.'/finished'); + $response = $this->get($form->URLSegment.'/finished'); - $this->assertNotContains($form->OnCompleteMessage ,$response->getBody()); - } + $this->assertNotContains($form->OnCompleteMessage, $response->getBody()); + } - public function testForm() { - $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); + public function testForm() + { + $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); - $controller = new UserDefinedFormControllerTest_Controller($form); + $controller = new UserDefinedFormControllerTest_Controller($form); - // test form - $this->assertEquals($controller->Form()->getName(), 'Form', 'The form is referenced as Form'); - $this->assertEquals($controller->Form()->Fields()->Count(), 1); // disabled SecurityID token fields - $this->assertEquals($controller->Form()->Actions()->Count(), 1); - $this->assertEquals(count($controller->Form()->getValidator()->getRequired()), 0); + // test form + $this->assertEquals($controller->Form()->getName(), 'Form', 'The form is referenced as Form'); + $this->assertEquals($controller->Form()->Fields()->Count(), 1); // disabled SecurityID token fields + $this->assertEquals($controller->Form()->Actions()->Count(), 1); + $this->assertEquals(count($controller->Form()->getValidator()->getRequired()), 0); - $requiredForm = $this->objFromFixture('UserDefinedForm', 'validation-form'); - $controller = new UserDefinedFormControllerTest_Controller($requiredForm); + $requiredForm = $this->objFromFixture('UserDefinedForm', 'validation-form'); + $controller = new UserDefinedFormControllerTest_Controller($requiredForm); - $this->assertEquals($controller->Form()->Fields()->Count(), 1); // disabled SecurityID token fields - $this->assertEquals($controller->Form()->Actions()->Count(), 1); - $this->assertEquals(count($controller->Form()->getValidator()->getRequired()), 1); - } + $this->assertEquals($controller->Form()->Fields()->Count(), 1); // disabled SecurityID token fields + $this->assertEquals($controller->Form()->Actions()->Count(), 1); + $this->assertEquals(count($controller->Form()->getValidator()->getRequired()), 1); + } - public function testGetFormFields() { - // generating the fieldset of fields - $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); + public function testGetFormFields() + { + // generating the fieldset of fields + $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); - $controller = new UserDefinedFormControllerTest_Controller($form); + $controller = new UserDefinedFormControllerTest_Controller($form); + + $formSteps = $controller->Form()->getFormFields(); + $firstStep = $formSteps->first(); - $formSteps = $controller->Form()->getFormFields(); - $firstStep = $formSteps->first(); + $this->assertEquals($formSteps->Count(), 1); + $this->assertEquals($firstStep->getChildren()->Count(), 1); - $this->assertEquals($formSteps->Count(), 1); - $this->assertEquals($firstStep->getChildren()->Count(), 1); + // custom error message on a form field + $requiredForm = $this->objFromFixture('UserDefinedForm', 'validation-form'); + $controller = new UserDefinedFormControllerTest_Controller($requiredForm); - // custom error message on a form field - $requiredForm = $this->objFromFixture('UserDefinedForm', 'validation-form'); - $controller = new UserDefinedFormControllerTest_Controller($requiredForm); + UserDefinedForm::config()->required_identifier = "*"; - UserDefinedForm::config()->required_identifier = "*"; + $formSteps = $controller->Form()->getFormFields(); + $firstStep = $formSteps->first(); + $firstField = $firstStep->getChildren()->first(); - $formSteps = $controller->Form()->getFormFields(); - $firstStep = $formSteps->first(); - $firstField = $firstStep->getChildren()->first(); + $this->assertEquals('Custom Error Message', $firstField->getCustomValidationMessage()); + $this->assertEquals($firstField->Title(), 'Required Text Field *'); - $this->assertEquals('Custom Error Message', $firstField->getCustomValidationMessage()); - $this->assertEquals($firstField->Title(), 'Required Text Field *'); + // test custom right title + $field = $form->Fields()->limit(1, 1)->First(); + $field->RightTitle = 'Right Title'; + $field->write(); - // test custom right title - $field = $form->Fields()->limit(1, 1)->First(); - $field->RightTitle = 'Right Title'; - $field->write(); + $controller = new UserDefinedFormControllerTest_Controller($form); + $formSteps = $controller->Form()->getFormFields(); + $firstStep = $formSteps->first(); - $controller = new UserDefinedFormControllerTest_Controller($form); - $formSteps = $controller->Form()->getFormFields(); - $firstStep = $formSteps->first(); + $this->assertEquals($firstStep->getChildren()->First()->RightTitle(), "Right Title"); - $this->assertEquals($firstStep->getChildren()->First()->RightTitle(), "Right Title"); + // test empty form + $emptyForm = $this->objFromFixture('UserDefinedForm', 'empty-form'); + $controller = new UserDefinedFormControllerTest_Controller($emptyForm); - // test empty form - $emptyForm = $this->objFromFixture('UserDefinedForm', 'empty-form'); - $controller = new UserDefinedFormControllerTest_Controller($emptyForm); + $this->assertFalse($controller->Form()->getFormFields()->exists()); + } - $this->assertFalse($controller->Form()->getFormFields()->exists()); - } + public function testGetFormActions() + { + // generating the fieldset of actions + $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); - public function testGetFormActions() - { - // generating the fieldset of actions - $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); + $controller = new UserDefinedFormControllerTest_Controller($form); + $actions = $controller->Form()->getFormActions(); - $controller = new UserDefinedFormControllerTest_Controller($form); - $actions = $controller->Form()->getFormActions(); + // by default will have 1 submit button which links to process + $expected = new FieldList(new FormAction('process', 'Submit')); + $expected->setForm($controller->Form()); - // by default will have 1 submit button which links to process - $expected = new FieldList(new FormAction('process', 'Submit')); - $expected->setForm($controller->Form()); + $this->assertEquals($actions, $expected); - $this->assertEquals($actions, $expected); + // the custom popup should have a reset button and a custom text + $custom = $this->objFromFixture('UserDefinedForm', 'form-with-reset-and-custom-action'); + $controller = new UserDefinedFormControllerTest_Controller($custom); + $actions = $controller->Form()->getFormActions(); - // the custom popup should have a reset button and a custom text - $custom = $this->objFromFixture('UserDefinedForm', 'form-with-reset-and-custom-action'); - $controller = new UserDefinedFormControllerTest_Controller($custom); - $actions = $controller->Form()->getFormActions(); + $expected = new FieldList(new FormAction('process', 'Custom Button')); + $expected->push(new ResetFormAction("clearForm", "Clear")); + $expected->setForm($controller->Form()); - $expected = new FieldList(new FormAction('process', 'Custom Button')); - $expected->push(new ResetFormAction("clearForm", "Clear")); - $expected->setForm($controller->Form()); + $this->assertEquals($actions, $expected); + } - $this->assertEquals($actions, $expected); - } + public function testRenderingIntoFormTemplate() + { + $form = $this->setupFormFrontend(); - public function testRenderingIntoFormTemplate() { - $form = $this->setupFormFrontend(); + $form->Content = 'This is some content without a form nested between it'; + $form->doPublish(); - $form->Content = 'This is some content without a form nested between it'; - $form->doPublish(); + $controller = new UserDefinedFormControllerTest_Controller($form); - $controller = new UserDefinedFormControllerTest_Controller($form); + // check to see if $Form is replaced to inside the content + $index = new ArrayData($controller->index()); + $parser = new CSSContentParser($index->renderWith(array('UserDefinedFormControllerTest'))); - // check to see if $Form is replaced to inside the content - $index = new ArrayData($controller->index()); - $parser = new CSSContentParser($index->renderWith(array('UserDefinedFormControllerTest'))); + $this->checkTemplateIsCorrect($parser); + } - $this->checkTemplateIsCorrect($parser); - } + public function testRenderingIntoTemplateWithSubstringReplacement() + { + $form = $this->setupFormFrontend(); - public function testRenderingIntoTemplateWithSubstringReplacement() { - $form = $this->setupFormFrontend(); + $controller = new UserDefinedFormControllerTest_Controller($form); - $controller = new UserDefinedFormControllerTest_Controller($form); + // check to see if $Form is replaced to inside the content + $index = new ArrayData($controller->index()); + $parser = new CSSContentParser($index->renderWith(array('UserDefinedFormControllerTest'))); - // check to see if $Form is replaced to inside the content - $index = new ArrayData($controller->index()); - $parser = new CSSContentParser($index->renderWith(array('UserDefinedFormControllerTest'))); + $this->checkTemplateIsCorrect($parser); + } + /** + * Publish a form for use on the frontend + * + * @param string $fixtureName + * @return UserDefinedForm + */ + protected function setupFormFrontend($fixtureName = 'basic-form-page') + { + $form = $this->objFromFixture('UserDefinedForm', $fixtureName); + $this->logInWithPermission('ADMIN'); - $this->checkTemplateIsCorrect($parser); - } - /** - * Publish a form for use on the frontend - * - * @param string $fixtureName - * @return UserDefinedForm - */ - protected function setupFormFrontend($fixtureName = 'basic-form-page') { - $form = $this->objFromFixture('UserDefinedForm', $fixtureName); - $this->logInWithPermission('ADMIN'); + $form->doPublish(); - $form->doPublish(); + $member = Member::currentUser(); + $member->logOut(); - $member = Member::currentUser(); - $member->logOut(); + return $form; + } - return $form; - } + public function checkTemplateIsCorrect($parser) + { + $this->assertArrayHasKey(0, $parser->getBySelector('form#UserForm_Form')); - public function checkTemplateIsCorrect($parser) { - $this->assertArrayHasKey(0, $parser->getBySelector('form#UserForm_Form')); + // check for the input + $this->assertArrayHasKey(0, $parser->getBySelector('input.text')); - // check for the input - $this->assertArrayHasKey(0, $parser->getBySelector('input.text')); + // check for the label and the text + $label = $parser->getBySelector('label.left'); + $this->assertArrayHasKey(0, $label); - // check for the label and the text - $label = $parser->getBySelector('label.left'); - $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 + $action = $parser->getBySelector('input.action'); + $this->assertArrayHasKey(0, $action); - // check for the action - $action = $parser->getBySelector('input.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"); + } } -class UserDefinedFormControllerTest_Controller extends UserDefinedForm_Controller implements TestOnly { +class UserDefinedFormControllerTest_Controller extends UserDefinedForm_Controller implements TestOnly +{ - /** - * Overloaded to avoid inconsistencies between 2.4.2 and 2.4.3 (disables all security tokens in unit tests by default) - */ - public function Form() { - $form = parent::Form(); + /** + * Overloaded to avoid inconsistencies between 2.4.2 and 2.4.3 (disables all security tokens in unit tests by default) + */ + public function Form() + { + $form = parent::Form(); - if($form) $form->disableSecurityToken(); - - return $form; - } + if ($form) { + $form->disableSecurityToken(); + } + return $form; + } } diff --git a/tests/UserDefinedFormTest.php b/tests/UserDefinedFormTest.php index c418563..f9d06a7 100644 --- a/tests/UserDefinedFormTest.php +++ b/tests/UserDefinedFormTest.php @@ -3,421 +3,436 @@ /** * @package userforms */ -class UserDefinedFormTest extends FunctionalTest { +class UserDefinedFormTest extends FunctionalTest +{ - static $fixture_file = 'UserDefinedFormTest.yml'; + public static $fixture_file = 'UserDefinedFormTest.yml'; - public function testRollbackToVersion() { - $this->markTestSkipped( - 'UserDefinedForm::rollback() has not been implemented completely' - ); + public function testRollbackToVersion() + { + $this->markTestSkipped( + 'UserDefinedForm::rollback() has not been implemented completely' + ); - // @todo - $this->logInWithPermission('ADMIN'); - $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); + // @todo + $this->logInWithPermission('ADMIN'); + $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); - $form->SubmitButtonText = 'Button Text'; - $form->write(); - $form->doPublish(); - $origVersion = $form->Version; + $form->SubmitButtonText = 'Button Text'; + $form->write(); + $form->doPublish(); + $origVersion = $form->Version; - $form->SubmitButtonText = 'Updated Button Text'; - $form->write(); - $form->doPublish(); + $form->SubmitButtonText = 'Updated Button Text'; + $form->write(); + $form->doPublish(); - // check published site - $updated = Versioned::get_one_by_stage("UserDefinedForm", "Stage", "\"UserDefinedForm\".\"ID\" = $form->ID"); - $this->assertEquals($updated->SubmitButtonText, 'Updated Button Text'); + // check published site + $updated = Versioned::get_one_by_stage("UserDefinedForm", "Stage", "\"UserDefinedForm\".\"ID\" = $form->ID"); + $this->assertEquals($updated->SubmitButtonText, 'Updated Button Text'); - $form->doRollbackTo($origVersion); + $form->doRollbackTo($origVersion); - $orignal = Versioned::get_one_by_stage("UserDefinedForm", "Stage", "\"UserDefinedForm\".\"ID\" = $form->ID"); - $this->assertEquals($orignal->SubmitButtonText, 'Button Text'); - } + $orignal = Versioned::get_one_by_stage("UserDefinedForm", "Stage", "\"UserDefinedForm\".\"ID\" = $form->ID"); + $this->assertEquals($orignal->SubmitButtonText, 'Button Text'); + } - public function testGetCMSFields() { - $this->logInWithPermission('ADMIN'); - $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); + public function testGetCMSFields() + { + $this->logInWithPermission('ADMIN'); + $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); - $fields = $form->getCMSFields(); + $fields = $form->getCMSFields(); - $this->assertTrue($fields->dataFieldByName('Fields') !== null); - $this->assertTrue($fields->dataFieldByName('EmailRecipients') != null); - $this->assertTrue($fields->dataFieldByName('Submissions') != null); - $this->assertTrue($fields->dataFieldByName('OnCompleteMessage') != null); - } + $this->assertTrue($fields->dataFieldByName('Fields') !== null); + $this->assertTrue($fields->dataFieldByName('EmailRecipients') != null); + $this->assertTrue($fields->dataFieldByName('Submissions') != null); + $this->assertTrue($fields->dataFieldByName('OnCompleteMessage') != null); + } - public function testEmailRecipientPopup() { - $this->logInWithPermission('ADMIN'); + public function testEmailRecipientPopup() + { + $this->logInWithPermission('ADMIN'); - $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); + $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); - $popup = new UserDefinedForm_EmailRecipient(); - $popup->FormID = $form->ID; + $popup = new UserDefinedForm_EmailRecipient(); + $popup->FormID = $form->ID; - $fields = $popup->getCMSFields(); + $fields = $popup->getCMSFields(); - $this->assertTrue($fields->dataFieldByName('EmailSubject') !== null); - $this->assertTrue($fields->dataFieldByName('EmailFrom') !== null); - $this->assertTrue($fields->dataFieldByName('EmailAddress') !== null); - $this->assertTrue($fields->dataFieldByName('HideFormData') !== null); - $this->assertTrue($fields->dataFieldByName('SendPlain') !== null); - $this->assertTrue($fields->dataFieldByName('EmailBody') !== null); + $this->assertTrue($fields->dataFieldByName('EmailSubject') !== null); + $this->assertTrue($fields->dataFieldByName('EmailFrom') !== null); + $this->assertTrue($fields->dataFieldByName('EmailAddress') !== null); + $this->assertTrue($fields->dataFieldByName('HideFormData') !== null); + $this->assertTrue($fields->dataFieldByName('SendPlain') !== null); + $this->assertTrue($fields->dataFieldByName('EmailBody') !== null); - // add an email field, it should now add a or from X address picker - $email = $this->objFromFixture('EditableEmailField','email-field'); - $form->Fields()->add($email); + // add an email field, it should now add a or from X address picker + $email = $this->objFromFixture('EditableEmailField', 'email-field'); + $form->Fields()->add($email); - $popup->write(); + $popup->write(); - $fields = $popup->getCMSFields(); - $this->assertThat($fields->dataFieldByName('SendEmailToFieldID'), $this->isInstanceOf('DropdownField')); + $fields = $popup->getCMSFields(); + $this->assertThat($fields->dataFieldByName('SendEmailToFieldID'), $this->isInstanceOf('DropdownField')); - // if the front end has checkboxs or dropdown they can select from that can also be used to send things - $dropdown = $this->objFromFixture('EditableDropdown', 'department-dropdown'); - $form->Fields()->add($dropdown); + // if the front end has checkboxs or dropdown they can select from that can also be used to send things + $dropdown = $this->objFromFixture('EditableDropdown', 'department-dropdown'); + $form->Fields()->add($dropdown); - $fields = $popup->getCMSFields(); - $this->assertTrue($fields->dataFieldByName('SendEmailToFieldID') !== null); + $fields = $popup->getCMSFields(); + $this->assertTrue($fields->dataFieldByName('SendEmailToFieldID') !== null); - $popup->delete(); - } + $popup->delete(); + } - function testGetEmailBodyContent() { - $recipient = new UserDefinedForm_EmailRecipient(); + public function testGetEmailBodyContent() + { + $recipient = new UserDefinedForm_EmailRecipient(); - $emailBody = 'not html'; - $emailBodyHtml = 'html
'; + $emailBody = 'not html'; + $emailBodyHtml = 'html
'; - $recipient->EmailBody = $emailBody; - $recipient->EmailBodyHtml = $emailBodyHtml; - $recipient->write(); + $recipient->EmailBody = $emailBody; + $recipient->EmailBodyHtml = $emailBodyHtml; + $recipient->write(); - $this->assertEquals($recipient->SendPlain, 0); - $this->assertEquals($recipient->getEmailBodyContent(), $emailBodyHtml); + $this->assertEquals($recipient->SendPlain, 0); + $this->assertEquals($recipient->getEmailBodyContent(), $emailBodyHtml); - $recipient->SendPlain = 1; - $recipient->write(); + $recipient->SendPlain = 1; + $recipient->write(); - $this->assertEquals($recipient->getEmailBodyContent(), $emailBody); + $this->assertEquals($recipient->getEmailBodyContent(), $emailBody); - $recipient->delete(); - } + $recipient->delete(); + } - function testGetEmailTemplateDropdownValues() { - $recipient = new UserDefinedForm_EmailRecipient(); + public function testGetEmailTemplateDropdownValues() + { + $recipient = new UserDefinedForm_EmailRecipient(); - $defaultValues = array('SubmittedFormEmail' => 'SubmittedFormEmail'); + $defaultValues = array('SubmittedFormEmail' => 'SubmittedFormEmail'); - $this->assertEquals($recipient->getEmailTemplateDropdownValues(), $defaultValues); - } + $this->assertEquals($recipient->getEmailTemplateDropdownValues(), $defaultValues); + } - function testEmailTemplateExists() { - $recipient = new UserDefinedForm_EmailRecipient(); + public function testEmailTemplateExists() + { + $recipient = new UserDefinedForm_EmailRecipient(); - // Set the default template - $recipient->EmailTemplate = current(array_keys($recipient->getEmailTemplateDropdownValues())); - $recipient->write(); + // Set the default template + $recipient->EmailTemplate = current(array_keys($recipient->getEmailTemplateDropdownValues())); + $recipient->write(); - // The default template exists - $this->assertTrue($recipient->emailTemplateExists()); + // The default template exists + $this->assertTrue($recipient->emailTemplateExists()); - // A made up template doesn't exists - $this->assertFalse($recipient->emailTemplateExists('MyTemplateThatsNotThere')); + // A made up template doesn't exists + $this->assertFalse($recipient->emailTemplateExists('MyTemplateThatsNotThere')); - $recipient->delete(); - } + $recipient->delete(); + } - function testCanEditAndDeleteRecipient() { - $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); + public function testCanEditAndDeleteRecipient() + { + $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); - $this->logInWithPermission('ADMIN'); - foreach($form->EmailRecipients() as $recipient) { - $this->assertTrue($recipient->canEdit()); - $this->assertTrue($recipient->canDelete()); - } + $this->logInWithPermission('ADMIN'); + foreach ($form->EmailRecipients() as $recipient) { + $this->assertTrue($recipient->canEdit()); + $this->assertTrue($recipient->canDelete()); + } - $member = Member::currentUser(); - $member->logOut(); + $member = Member::currentUser(); + $member->logOut(); - $this->logInWithPermission('SITETREE_VIEW_ALL'); - foreach($form->EmailRecipients() as $recipient) { - $this->assertFalse($recipient->canEdit()); - $this->assertFalse($recipient->canDelete()); - } - } + $this->logInWithPermission('SITETREE_VIEW_ALL'); + foreach ($form->EmailRecipients() as $recipient) { + $this->assertFalse($recipient->canEdit()); + $this->assertFalse($recipient->canDelete()); + } + } - function testPublishing() { - $this->logInWithPermission('ADMIN'); + public function testPublishing() + { + $this->logInWithPermission('ADMIN'); - $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); - $form->write(); + $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); + $form->write(); - $form->doPublish(); + $form->doPublish(); - $live = Versioned::get_one_by_stage("UserDefinedForm", "Live", "\"UserDefinedForm_Live\".\"ID\" = $form->ID"); + $live = Versioned::get_one_by_stage("UserDefinedForm", "Live", "\"UserDefinedForm_Live\".\"ID\" = $form->ID"); - $this->assertNotNull($live); - $this->assertEquals(2, $live->Fields()->Count()); // one page and one field + $this->assertNotNull($live); + $this->assertEquals(2, $live->Fields()->Count()); // one page and one field - $dropdown = $this->objFromFixture('EditableDropdown', 'basic-dropdown'); - $form->Fields()->add($dropdown); + $dropdown = $this->objFromFixture('EditableDropdown', 'basic-dropdown'); + $form->Fields()->add($dropdown); - $stage = Versioned::get_one_by_stage("UserDefinedForm", "Stage", "\"UserDefinedForm\".\"ID\" = $form->ID"); - $this->assertEquals(3, $stage->Fields()->Count()); + $stage = Versioned::get_one_by_stage("UserDefinedForm", "Stage", "\"UserDefinedForm\".\"ID\" = $form->ID"); + $this->assertEquals(3, $stage->Fields()->Count()); - // should not have published the dropdown - $liveDropdown = Versioned::get_one_by_stage("EditableFormField", "Live", "\"EditableFormField_Live\".\"ID\" = $dropdown->ID"); - $this->assertNull($liveDropdown); + // should not have published the dropdown + $liveDropdown = Versioned::get_one_by_stage("EditableFormField", "Live", "\"EditableFormField_Live\".\"ID\" = $dropdown->ID"); + $this->assertNull($liveDropdown); - // when publishing it should have added it - $form->doPublish(); + // when publishing it should have added it + $form->doPublish(); - $live = Versioned::get_one_by_stage("UserDefinedForm", "Live", "\"UserDefinedForm_Live\".\"ID\" = $form->ID"); - $this->assertEquals(3, $live->Fields()->Count()); + $live = Versioned::get_one_by_stage("UserDefinedForm", "Live", "\"UserDefinedForm_Live\".\"ID\" = $form->ID"); + $this->assertEquals(3, $live->Fields()->Count()); - // edit the title - $text = $form->Fields()->limit(1, 1)->First(); - $text->Title = 'Edited title'; - $text->write(); + // edit the title + $text = $form->Fields()->limit(1, 1)->First(); + $text->Title = 'Edited title'; + $text->write(); - $liveText = Versioned::get_one_by_stage("EditableFormField", "Live", "\"EditableFormField_Live\".\"ID\" = $text->ID"); - $this->assertFalse($liveText->Title == $text->Title); + $liveText = Versioned::get_one_by_stage("EditableFormField", "Live", "\"EditableFormField_Live\".\"ID\" = $text->ID"); + $this->assertFalse($liveText->Title == $text->Title); - $form->doPublish(); + $form->doPublish(); - $liveText = Versioned::get_one_by_stage("EditableFormField", "Live", "\"EditableFormField_Live\".\"ID\" = $text->ID"); - $this->assertTrue($liveText->Title == $text->Title); + $liveText = Versioned::get_one_by_stage("EditableFormField", "Live", "\"EditableFormField_Live\".\"ID\" = $text->ID"); + $this->assertTrue($liveText->Title == $text->Title); - // Add a display rule to the dropdown - $displayRule = new EditableCustomRule(); - $displayRule->ParentID = $dropdown->ID; - $displayRule->ConditionFieldID = $text->ID; - $displayRule->write(); - $ruleID = $displayRule->ID; + // Add a display rule to the dropdown + $displayRule = new EditableCustomRule(); + $displayRule->ParentID = $dropdown->ID; + $displayRule->ConditionFieldID = $text->ID; + $displayRule->write(); + $ruleID = $displayRule->ID; - // Not live - $liveRule = Versioned::get_one_by_stage("EditableCustomRule", "Live", "\"EditableCustomRule_Live\".\"ID\" = $ruleID"); - $this->assertEmpty($liveRule); + // Not live + $liveRule = Versioned::get_one_by_stage("EditableCustomRule", "Live", "\"EditableCustomRule_Live\".\"ID\" = $ruleID"); + $this->assertEmpty($liveRule); - // Publish form, it's now live - $form->doPublish(); - $liveRule = Versioned::get_one_by_stage("EditableCustomRule", "Live", "\"EditableCustomRule_Live\".\"ID\" = $ruleID"); - $this->assertNotEmpty($liveRule); + // Publish form, it's now live + $form->doPublish(); + $liveRule = Versioned::get_one_by_stage("EditableCustomRule", "Live", "\"EditableCustomRule_Live\".\"ID\" = $ruleID"); + $this->assertNotEmpty($liveRule); - // Remove rule - $displayRule->delete(); + // Remove rule + $displayRule->delete(); - // Live rule still exists - $liveRule = Versioned::get_one_by_stage("EditableCustomRule", "Live", "\"EditableCustomRule_Live\".\"ID\" = $ruleID"); - $this->assertNotEmpty($liveRule); + // Live rule still exists + $liveRule = Versioned::get_one_by_stage("EditableCustomRule", "Live", "\"EditableCustomRule_Live\".\"ID\" = $ruleID"); + $this->assertNotEmpty($liveRule); - // Publish form, it should remove this rule - $form->doPublish(); - $liveRule = Versioned::get_one_by_stage("EditableCustomRule", "Live", "\"EditableCustomRule_Live\".\"ID\" = $ruleID"); - $this->assertEmpty($liveRule); - } + // Publish form, it should remove this rule + $form->doPublish(); + $liveRule = Versioned::get_one_by_stage("EditableCustomRule", "Live", "\"EditableCustomRule_Live\".\"ID\" = $ruleID"); + $this->assertEmpty($liveRule); + } - function testUnpublishing() { - $this->logInWithPermission('ADMIN'); - $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); - $form->write(); - $this->assertEquals(0, DB::query("SELECT COUNT(*) FROM \"EditableFormField_Live\"")->value()); - $form->doPublish(); + public function testUnpublishing() + { + $this->logInWithPermission('ADMIN'); + $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); + $form->write(); + $this->assertEquals(0, DB::query("SELECT COUNT(*) FROM \"EditableFormField_Live\"")->value()); + $form->doPublish(); - // assert that it exists and has a field - $live = Versioned::get_one_by_stage("UserDefinedForm", "Live", "\"UserDefinedForm_Live\".\"ID\" = $form->ID"); - - $this->assertTrue(isset($live)); - $this->assertEquals(2, DB::query("SELECT COUNT(*) FROM \"EditableFormField_Live\"")->value()); - - // unpublish - $form->doUnpublish(); - - $this->assertNull(Versioned::get_one_by_stage("UserDefinedForm", "Live", "\"UserDefinedForm_Live\".\"ID\" = $form->ID")); - $this->assertEquals(0, DB::query("SELECT COUNT(*) FROM \"EditableFormField_Live\"")->value()); - } - - function testDoRevertToLive() { - $this->logInWithPermission('ADMIN'); - $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); - $field = $form->Fields()->First(); - - $field->Title = 'Title'; - $field->write(); - - $form->doPublish(); - - $field->Title = 'Edited title'; - $field->write(); - - // check that the published version is not updated - $live = Versioned::get_one_by_stage("EditableFormField", "Live", "\"EditableFormField_Live\".\"ID\" = $field->ID"); - $this->assertEquals('Title', $live->Title); - - // revert back to the live data - $form->doRevertToLive(); - $form->flushCache(); - - $check = Versioned::get_one_by_stage("EditableFormField", "Stage", "\"EditableFormField\".\"ID\" = $field->ID"); - - $this->assertEquals('Title', $check->Title); - } - - function testDuplicatingForm() { - $this->logInWithPermission('ADMIN'); - $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); - - $duplicate = $form->duplicate(); - - $this->assertEquals($form->Fields()->Count(), $duplicate->Fields()->Count()); - $this->assertEquals($form->EmailRecipients()->Count(), $form->EmailRecipients()->Count()); - - // can't compare object since the dates/ids change - $this->assertEquals($form->Fields()->First()->Title, $duplicate->Fields()->First()->Title); - - // Test duplicate with group - $form2 = $this->objFromFixture('UserDefinedForm', 'page-with-group'); - $form2Validator = new UserFormValidator(); - $form2Validator->setForm(new Form(new Controller(), 'Form', new FieldList(), new FieldList())); - $this->assertTrue($form2Validator->php($form2->toMap())); - - // Check field groups exist - $form2GroupStart = $form2->Fields()->filter('ClassName', 'EditableFieldGroup')->first(); - $form2GroupEnd = $form2->Fields()->filter('ClassName', 'EditableFieldGroupEnd')->first(); - $this->assertEquals($form2GroupEnd->ID, $form2GroupStart->EndID); - - // Duplicate this - $form3 = $form2->duplicate(); - $form3Validator = new UserFormValidator(); - $form3Validator->setForm(new Form(new Controller(), 'Form', new FieldList(), new FieldList())); - $this->assertTrue($form3Validator->php($form3->toMap())); - - // Check field groups exist - $form3GroupStart = $form3->Fields()->filter('ClassName', 'EditableFieldGroup')->first(); - $form3GroupEnd = $form3->Fields()->filter('ClassName', 'EditableFieldGroupEnd')->first(); - $this->assertEquals($form3GroupEnd->ID, $form3GroupStart->EndID); - $this->assertNotEquals($form2GroupEnd->ID, $form3GroupStart->EndID); - } - - function testFormOptions() { - $this->logInWithPermission('ADMIN'); - $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); - - $fields = $form->getFormOptions(); - $submit = $fields->fieldByName('SubmitButtonText'); - $reset = $fields->fieldByName('ShowClearButton'); - - $this->assertEquals($submit->Title(), 'Text on submit button:'); - $this->assertEquals($reset->Title(), 'Show Clear Form Button'); - } - - public function testEmailRecipientFilters() { - $form = $this->objFromFixture('UserDefinedForm', 'filtered-form-page'); - - // Check unfiltered recipients - $result0 = $form - ->EmailRecipients() - ->sort('EmailAddress') - ->column('EmailAddress'); - $this->assertEquals( - array( - 'filtered1@example.com', - 'filtered2@example.com', - 'unfiltered@example.com' - ), - $result0 - ); - - // check filters based on given data - $result1 = $form->FilteredEmailRecipients( - array( - 'your-name' => 'Value', - 'address' => '', - 'street' => 'Anything', - 'city' => 'Matches Not Equals', - 'colours' => array('Red') // matches 2 - ), null - ) - ->sort('EmailAddress') - ->column('EmailAddress'); - $this->assertEquals( - array( - 'filtered2@example.com', - 'unfiltered@example.com' - ), - $result1 - ); - - // Check all positive matches - $result2 = $form->FilteredEmailRecipients( - array( - 'your-name' => '', - 'address' => 'Anything', - 'street' => 'Matches Equals', - 'city' => 'Anything', - 'colours' => array('Red', 'Blue') // matches 2 - ), null - ) - ->sort('EmailAddress') - ->column('EmailAddress'); - $this->assertEquals( - array( - 'filtered1@example.com', - 'filtered2@example.com', - 'unfiltered@example.com' - ), - $result2 - ); - - - $result3 = $form->FilteredEmailRecipients( - array( - 'your-name' => 'Should be blank but is not', - 'address' => 'Anything', - 'street' => 'Matches Equals', - 'city' => 'Anything', - 'colours' => array('Blue') - ), null - )->column('EmailAddress'); - $this->assertEquals( - array( - 'unfiltered@example.com' - ), - $result3 - ); - - - $result4 = $form->FilteredEmailRecipients( - array( - 'your-name' => '', - 'address' => 'Anything', - 'street' => 'Wrong value for this field', - 'city' => '', - 'colours' => array('Blue', 'Green') - ), null - )->column('EmailAddress'); - $this->assertEquals( - array( - 'unfiltered@example.com' - ), - $result4 - ); - } - - public function testIndex() { - // Test that the $UserDefinedForm is stripped out - $page = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); - $page->publish('Stage', 'Live'); - - $result = $this->get($page->Link()); - $body = Convert::nl2os($result->getBody(), ''); // strip out newlines - $this->assertFalse($result->isError()); - $this->assertContains('Here is my form
Thank you for filling it out
', $body); - - $this->assertNotContains('$UserDefinedForm
', $body); - $this->assertNotContains('', $body); - $this->assertNotContains('Thank you for filling it out
', $body); - } -} \ No newline at end of file + // assert that it exists and has a field + $live = Versioned::get_one_by_stage("UserDefinedForm", "Live", "\"UserDefinedForm_Live\".\"ID\" = $form->ID"); + + $this->assertTrue(isset($live)); + $this->assertEquals(2, DB::query("SELECT COUNT(*) FROM \"EditableFormField_Live\"")->value()); + + // unpublish + $form->doUnpublish(); + + $this->assertNull(Versioned::get_one_by_stage("UserDefinedForm", "Live", "\"UserDefinedForm_Live\".\"ID\" = $form->ID")); + $this->assertEquals(0, DB::query("SELECT COUNT(*) FROM \"EditableFormField_Live\"")->value()); + } + + public function testDoRevertToLive() + { + $this->logInWithPermission('ADMIN'); + $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); + $field = $form->Fields()->First(); + + $field->Title = 'Title'; + $field->write(); + + $form->doPublish(); + + $field->Title = 'Edited title'; + $field->write(); + + // check that the published version is not updated + $live = Versioned::get_one_by_stage("EditableFormField", "Live", "\"EditableFormField_Live\".\"ID\" = $field->ID"); + $this->assertEquals('Title', $live->Title); + + // revert back to the live data + $form->doRevertToLive(); + $form->flushCache(); + + $check = Versioned::get_one_by_stage("EditableFormField", "Stage", "\"EditableFormField\".\"ID\" = $field->ID"); + + $this->assertEquals('Title', $check->Title); + } + + public function testDuplicatingForm() + { + $this->logInWithPermission('ADMIN'); + $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); + + $duplicate = $form->duplicate(); + + $this->assertEquals($form->Fields()->Count(), $duplicate->Fields()->Count()); + $this->assertEquals($form->EmailRecipients()->Count(), $form->EmailRecipients()->Count()); + + // can't compare object since the dates/ids change + $this->assertEquals($form->Fields()->First()->Title, $duplicate->Fields()->First()->Title); + + // Test duplicate with group + $form2 = $this->objFromFixture('UserDefinedForm', 'page-with-group'); + $form2Validator = new UserFormValidator(); + $form2Validator->setForm(new Form(new Controller(), 'Form', new FieldList(), new FieldList())); + $this->assertTrue($form2Validator->php($form2->toMap())); + + // Check field groups exist + $form2GroupStart = $form2->Fields()->filter('ClassName', 'EditableFieldGroup')->first(); + $form2GroupEnd = $form2->Fields()->filter('ClassName', 'EditableFieldGroupEnd')->first(); + $this->assertEquals($form2GroupEnd->ID, $form2GroupStart->EndID); + + // Duplicate this + $form3 = $form2->duplicate(); + $form3Validator = new UserFormValidator(); + $form3Validator->setForm(new Form(new Controller(), 'Form', new FieldList(), new FieldList())); + $this->assertTrue($form3Validator->php($form3->toMap())); + + // Check field groups exist + $form3GroupStart = $form3->Fields()->filter('ClassName', 'EditableFieldGroup')->first(); + $form3GroupEnd = $form3->Fields()->filter('ClassName', 'EditableFieldGroupEnd')->first(); + $this->assertEquals($form3GroupEnd->ID, $form3GroupStart->EndID); + $this->assertNotEquals($form2GroupEnd->ID, $form3GroupStart->EndID); + } + + public function testFormOptions() + { + $this->logInWithPermission('ADMIN'); + $form = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); + + $fields = $form->getFormOptions(); + $submit = $fields->fieldByName('SubmitButtonText'); + $reset = $fields->fieldByName('ShowClearButton'); + + $this->assertEquals($submit->Title(), 'Text on submit button:'); + $this->assertEquals($reset->Title(), 'Show Clear Form Button'); + } + + public function testEmailRecipientFilters() + { + $form = $this->objFromFixture('UserDefinedForm', 'filtered-form-page'); + + // Check unfiltered recipients + $result0 = $form + ->EmailRecipients() + ->sort('EmailAddress') + ->column('EmailAddress'); + $this->assertEquals( + array( + 'filtered1@example.com', + 'filtered2@example.com', + 'unfiltered@example.com' + ), + $result0 + ); + + // check filters based on given data + $result1 = $form->FilteredEmailRecipients( + array( + 'your-name' => 'Value', + 'address' => '', + 'street' => 'Anything', + 'city' => 'Matches Not Equals', + 'colours' => array('Red') // matches 2 + ), null + ) + ->sort('EmailAddress') + ->column('EmailAddress'); + $this->assertEquals( + array( + 'filtered2@example.com', + 'unfiltered@example.com' + ), + $result1 + ); + + // Check all positive matches + $result2 = $form->FilteredEmailRecipients( + array( + 'your-name' => '', + 'address' => 'Anything', + 'street' => 'Matches Equals', + 'city' => 'Anything', + 'colours' => array('Red', 'Blue') // matches 2 + ), null + ) + ->sort('EmailAddress') + ->column('EmailAddress'); + $this->assertEquals( + array( + 'filtered1@example.com', + 'filtered2@example.com', + 'unfiltered@example.com' + ), + $result2 + ); + + + $result3 = $form->FilteredEmailRecipients( + array( + 'your-name' => 'Should be blank but is not', + 'address' => 'Anything', + 'street' => 'Matches Equals', + 'city' => 'Anything', + 'colours' => array('Blue') + ), null + )->column('EmailAddress'); + $this->assertEquals( + array( + 'unfiltered@example.com' + ), + $result3 + ); + + + $result4 = $form->FilteredEmailRecipients( + array( + 'your-name' => '', + 'address' => 'Anything', + 'street' => 'Wrong value for this field', + 'city' => '', + 'colours' => array('Blue', 'Green') + ), null + )->column('EmailAddress'); + $this->assertEquals( + array( + 'unfiltered@example.com' + ), + $result4 + ); + } + + public function testIndex() + { + // Test that the $UserDefinedForm is stripped out + $page = $this->objFromFixture('UserDefinedForm', 'basic-form-page'); + $page->publish('Stage', 'Live'); + + $result = $this->get($page->Link()); + $body = Convert::nl2os($result->getBody(), ''); // strip out newlines + $this->assertFalse($result->isError()); + $this->assertContains('Here is my form
Thank you for filling it out
', $body); + + $this->assertNotContains('$UserDefinedForm
', $body); + $this->assertNotContains('', $body); + $this->assertNotContains('Thank you for filling it out
', $body); + } +} diff --git a/tests/UserFormTest.php b/tests/UserFormTest.php index 5496748..ce3a33a 100644 --- a/tests/UserFormTest.php +++ b/tests/UserFormTest.php @@ -1,18 +1,20 @@ objFromFixture('UserDefinedForm', 'empty-page'); - $this->assertEquals(5, $page->Fields()->count()); - $controller = ModelAsController::controller_for($page); - $form = new UserForm($controller); - $this->assertEquals(2, $form->getSteps()->count()); - } -} \ No newline at end of file + /** + * Tests that a form will not generate empty pages + */ + public function testEmptyPages() + { + $page = $this->objFromFixture('UserDefinedForm', 'empty-page'); + $this->assertEquals(5, $page->Fields()->count()); + $controller = ModelAsController::controller_for($page); + $form = new UserForm($controller); + $this->assertEquals(2, $form->getSteps()->count()); + } +} diff --git a/tests/UserFormsUpgradeServiceTest.php b/tests/UserFormsUpgradeServiceTest.php index b9ce8c9..ba3ee78 100644 --- a/tests/UserFormsUpgradeServiceTest.php +++ b/tests/UserFormsUpgradeServiceTest.php @@ -1,216 +1,220 @@ update('UserDefinedForm', 'upgrade_on_build', false); - parent::setUp(); + public function setUp() + { + Config::inst()->update('UserDefinedForm', 'upgrade_on_build', false); + parent::setUp(); - // Assign rules programatically - $field1 = $this->objFromFixture('EditableTextField', 'text1'); - $field2 = $this->objFromFixture('EditableTextField', 'text2'); - $field3 = $this->objFromFixture('EditableTextField', 'text3'); + // Assign rules programatically + $field1 = $this->objFromFixture('EditableTextField', 'text1'); + $field2 = $this->objFromFixture('EditableTextField', 'text2'); + $field3 = $this->objFromFixture('EditableTextField', 'text3'); - $field3->CustomRules = serialize(array( - array( - 'Display' => 'Show', - 'ConditionField' => $field1->Name, - 'ConditionOption' => 'IsBlank', - 'Value' => '' - ), - array( - 'Display' => 'Hide', - 'ConditionField' => $field2->Name, - 'ConditionOption' => 'HasValue', - 'Value' => 'bob' - ) - )); - $field3->write(); + $field3->CustomRules = serialize(array( + array( + 'Display' => 'Show', + 'ConditionField' => $field1->Name, + 'ConditionOption' => 'IsBlank', + 'Value' => '' + ), + array( + 'Display' => 'Hide', + 'ConditionField' => $field2->Name, + 'ConditionOption' => 'HasValue', + 'Value' => 'bob' + ) + )); + $field3->write(); - // Assign settings programatically - $field4 = $this->objFromFixture('EditableTextField', 'text4'); - $field4->CustomSettings = serialize(array( - 'MinLength' => 20, - 'MaxLength' => 100, - 'Rows' => 4, - 'ExtraClass' => 'special class', - 'RightTitle' => 'My Field', - 'ShowOnLoad' => '', - 'Default' => 'Enter your text here' - )); - $field4->write(); + // Assign settings programatically + $field4 = $this->objFromFixture('EditableTextField', 'text4'); + $field4->CustomSettings = serialize(array( + 'MinLength' => 20, + 'MaxLength' => 100, + 'Rows' => 4, + 'ExtraClass' => 'special class', + 'RightTitle' => 'My Field', + 'ShowOnLoad' => '', + 'Default' => 'Enter your text here' + )); + $field4->write(); - $numeric1 = $this->objFromFixture('EditableNumericField', 'numeric1'); - $numeric1->CustomSettings = serialize(array( - 'RightTitle' => 'Number of %', - 'Default' => 1, - 'MinValue' => 1, - 'MaxValue' => 100, - 'ShowOnLoad' => 'Show' - )); - $numeric1->write(); + $numeric1 = $this->objFromFixture('EditableNumericField', 'numeric1'); + $numeric1->CustomSettings = serialize(array( + 'RightTitle' => 'Number of %', + 'Default' => 1, + 'MinValue' => 1, + 'MaxValue' => 100, + 'ShowOnLoad' => 'Show' + )); + $numeric1->write(); - $group1 = $this->objFromFixture('Group', 'group1'); - $members1 = $this->objFromFixture('EditableMemberListField', 'members1'); - $members1->CustomSettings = serialize(array( - 'RightTitle' => 'Select group', - 'GroupID' => $group1->ID, - 'ShowOnLoad' => 'Hide' - )); - $members1->write(); + $group1 = $this->objFromFixture('Group', 'group1'); + $members1 = $this->objFromFixture('EditableMemberListField', 'members1'); + $members1->CustomSettings = serialize(array( + 'RightTitle' => 'Select group', + 'GroupID' => $group1->ID, + 'ShowOnLoad' => 'Hide' + )); + $members1->write(); - $literal1 = $this->objFromFixture('EditableLiteralField', 'literal1'); - $literal1->CustomSettings = serialize(array( - 'HideFromReports' => 1, - 'RightTitle' => 'Literal', - 'Content' => 'Content
', - 'ShowOnLoad' => true - )); - $literal1->write(); + $literal1 = $this->objFromFixture('EditableLiteralField', 'literal1'); + $literal1->CustomSettings = serialize(array( + 'HideFromReports' => 1, + 'RightTitle' => 'Literal', + 'Content' => 'Content
', + 'ShowOnLoad' => true + )); + $literal1->write(); - $heading1 = $this->objFromFixture('EditableFormHeading', 'heading1'); - $heading1->CustomSettings = serialize(array( - 'RightTitle' => 'Right', - 'Level' => 3, - 'HideFromReports' => true, - 'ShowOnLoad' => false - )); - $heading1->write(); + $heading1 = $this->objFromFixture('EditableFormHeading', 'heading1'); + $heading1->CustomSettings = serialize(array( + 'RightTitle' => 'Right', + 'Level' => 3, + 'HideFromReports' => true, + 'ShowOnLoad' => false + )); + $heading1->write(); - $folder = $this->objFromFixture('Folder', 'folder1'); - $file1 = $this->objFromFixture('EditableFileField', 'file1'); - $file1->CustomSettings = serialize(array( - 'RightTitle' => 'File field', - 'Folder' => $folder->ID - )); - $file1->write(); + $folder = $this->objFromFixture('Folder', 'folder1'); + $file1 = $this->objFromFixture('EditableFileField', 'file1'); + $file1->CustomSettings = serialize(array( + 'RightTitle' => 'File field', + 'Folder' => $folder->ID + )); + $file1->write(); - $date1 = $this->objFromFixture('EditableDateField', 'date1'); - $date1->CustomSettings = serialize(array( - 'RightTitle' => 'Date field', - 'DefaultToToday' => '1' - )); - $date1->write(); + $date1 = $this->objFromFixture('EditableDateField', 'date1'); + $date1->CustomSettings = serialize(array( + 'RightTitle' => 'Date field', + 'DefaultToToday' => '1' + )); + $date1->write(); - $checkbox1 = $this->objFromFixture('EditableCheckbox', 'checkbox1'); - $checkbox1->CustomSettings = serialize(array( - 'Default' => true, - 'RightTitle' => 'Check this' - )); - $checkbox1->write(); + $checkbox1 = $this->objFromFixture('EditableCheckbox', 'checkbox1'); + $checkbox1->CustomSettings = serialize(array( + 'Default' => true, + 'RightTitle' => 'Check this' + )); + $checkbox1->write(); + } - } + /** + * @return UserFormsUpgradeService; + */ + protected function getService() + { + return singleton('UserFormsUpgradeService'); + } - /** - * @return UserFormsUpgradeService; - */ - protected function getService() { - return singleton('UserFormsUpgradeService'); - } + /** + * Tests migration of custom rules + */ + public function testCustomRulesMigration() + { + $service = $this->getService(); + $service->setQuiet(true); + $service->run(); - /** - * Tests migration of custom rules - */ - public function testCustomRulesMigration() { - $service = $this->getService(); - $service->setQuiet(true); - $service->run(); + $field1 = $this->objFromFixture('EditableTextField', 'text1'); + $field2 = $this->objFromFixture('EditableTextField', 'text2'); + $field3 = $this->objFromFixture('EditableTextField', 'text3'); - $field1 = $this->objFromFixture('EditableTextField', 'text1'); - $field2 = $this->objFromFixture('EditableTextField', 'text2'); - $field3 = $this->objFromFixture('EditableTextField', 'text3'); + $this->assertDOSEquals(array( + array( + 'Display' => 'Show', + 'ConditionFieldID' => $field1->ID, + 'ConditionOption' => 'IsBlank' + ), + array( + 'Display' => 'Hide', + 'ConditionFieldID' => $field2->ID, + 'ConditionOption' => 'HasValue', + 'FieldValue' => 'bob' + ) + ), $field3->DisplayRules()); + } - $this->assertDOSEquals(array( - array( - 'Display' => 'Show', - 'ConditionFieldID' => $field1->ID, - 'ConditionOption' => 'IsBlank' - ), - array( - 'Display' => 'Hide', - 'ConditionFieldID' => $field2->ID, - 'ConditionOption' => 'HasValue', - 'FieldValue' => 'bob' - ) - ), $field3->DisplayRules()); - } + /** + * Tests migration of all custom settings + */ + public function testCustomSettingsMigration() + { + $service = $this->getService(); + $service->setQuiet(true); + $service->run(); - /** - * Tests migration of all custom settings - */ - public function testCustomSettingsMigration() { - $service = $this->getService(); - $service->setQuiet(true); - $service->run(); + $group1 = $this->objFromFixture('Group', 'group1'); + $form = $this->objFromFixture('UserDefinedForm', 'form-with-settings'); + $folder = $this->objFromFixture('Folder', 'folder1'); - $group1 = $this->objFromFixture('Group', 'group1'); - $form = $this->objFromFixture('UserDefinedForm', 'form-with-settings'); - $folder = $this->objFromFixture('Folder', 'folder1'); - - $this->assertDOSEquals(array( - array( - 'ClassName' => 'EditableTextField', - 'Title' => 'Text with rule', - 'MinLength' => 20, - 'MaxLength' => 100, - 'Rows' => 4, - 'ExtraClass' => 'special class', - 'RightTitle' => 'My Field', - 'ShowOnLoad' => true, - 'Default' => 'Enter your text here', - ), - array( - 'ClassName' => 'EditableNumericField', - 'Title' => 'Numeric 1', - 'RightTitle' => 'Number of %', - 'Default' => 1, - 'MinValue' => 1, - 'MaxValue' => 100, - 'ShowOnLoad' => true, - ), - array( - 'ClassName' => 'EditableMemberListField', - 'Title' => 'Members 1', - 'RightTitle' => 'Select group', - 'GroupID' => $group1->ID, - 'ShowOnLoad' => false, - ), - array( - 'ClassName' => 'EditableLiteralField', - 'Title' => 'Literal 1', - 'HideFromReports' => true, - 'RightTitle' => 'Literal', - 'Content' => 'Content
', - 'ShowOnLoad' => true, - ), - array( - 'ClassName' => 'EditableFormHeading', - 'Title' => 'Heading 1', - 'RightTitle' => 'Right', - 'Level' => 3, - 'HideFromReports' => true, - 'ShowOnLoad' => false, - ), - array( - 'ClassName' => 'EditableFileField', - 'Title' => 'File 1', - 'RightTitle' => 'File field', - 'FolderID' => $folder->ID, - ), - array( - 'ClassName' => 'EditableDateField', - 'Title' => 'Date 1', - 'RightTitle' => 'Date field', - 'DefaultToToday' => true, - ), - array( - 'ClassName' => 'EditableCheckbox', - 'Title' => 'Checkbox 1', - 'CheckedDefault' => true, - 'RightTitle' => 'Check this', - ), - ), $form->Fields()); - } + $this->assertDOSEquals(array( + array( + 'ClassName' => 'EditableTextField', + 'Title' => 'Text with rule', + 'MinLength' => 20, + 'MaxLength' => 100, + 'Rows' => 4, + 'ExtraClass' => 'special class', + 'RightTitle' => 'My Field', + 'ShowOnLoad' => true, + 'Default' => 'Enter your text here', + ), + array( + 'ClassName' => 'EditableNumericField', + 'Title' => 'Numeric 1', + 'RightTitle' => 'Number of %', + 'Default' => 1, + 'MinValue' => 1, + 'MaxValue' => 100, + 'ShowOnLoad' => true, + ), + array( + 'ClassName' => 'EditableMemberListField', + 'Title' => 'Members 1', + 'RightTitle' => 'Select group', + 'GroupID' => $group1->ID, + 'ShowOnLoad' => false, + ), + array( + 'ClassName' => 'EditableLiteralField', + 'Title' => 'Literal 1', + 'HideFromReports' => true, + 'RightTitle' => 'Literal', + 'Content' => 'Content
', + 'ShowOnLoad' => true, + ), + array( + 'ClassName' => 'EditableFormHeading', + 'Title' => 'Heading 1', + 'RightTitle' => 'Right', + 'Level' => 3, + 'HideFromReports' => true, + 'ShowOnLoad' => false, + ), + array( + 'ClassName' => 'EditableFileField', + 'Title' => 'File 1', + 'RightTitle' => 'File field', + 'FolderID' => $folder->ID, + ), + array( + 'ClassName' => 'EditableDateField', + 'Title' => 'Date 1', + 'RightTitle' => 'Date field', + 'DefaultToToday' => true, + ), + array( + 'ClassName' => 'EditableCheckbox', + 'Title' => 'Checkbox 1', + 'CheckedDefault' => true, + 'RightTitle' => 'Check this', + ), + ), $form->Fields()); + } }