tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity

FIX Validation related errors in unit tests and EmailRecipient

Browse Source
This commit is contained in:
Robbie Averill 2017-08-14 10:52:48 +12:00
parent 84c8592097
commit cdb2259307
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/Model/Recipient/EmailRecipient.php
View File

@ -548,7 +548,7 @@ class EmailRecipient extends DataObject
__CLASS__.".$translation", __CLASS__.".$translation",
"Invalid email address $trimAddress" "Invalid email address $trimAddress"
); );
$result->error($error . " ($trimAddress)"); $result->addError($error . " ($trimAddress)");
} }
} }
} }

11
tests/Model/UserDefinedFormTest.php
View File

@ -306,6 +306,7 @@ class UserDefinedFormTest extends FunctionalTest
// check that the published version is not updated // check that the published version is not updated
$live = Versioned::get_one_by_stage(EditableFormField::class, 'Live', "\"EditableFormField_Live\".\"ID\" = $field->ID"); $live = Versioned::get_one_by_stage(EditableFormField::class, 'Live', "\"EditableFormField_Live\".\"ID\" = $field->ID");
$this->assertInstanceOf(EditableFormField::class, $live);
$this->assertEquals('Title', $live->Title); $this->assertEquals('Title', $live->Title);
// revert back to the live data // revert back to the live data
@ -490,9 +491,9 @@ class UserDefinedFormTest extends FunctionalTest
'invalid-recipient-list' 'invalid-recipient-list'
); );
$result = $recipient->validate(); $result = $recipient->validate();
$this->assertFalse($result->valid()); $this->assertFalse($result->isValid());
$this->assertContains('filtered.example.com', $result->message()); $this->assertContains('filtered.example.com', $result->getMessages());
$this->assertNotContains('filtered2@example.com', $result->message()); $this->assertNotContains('filtered2@example.com', $result->getMessages());
// test valid email addresses pass validation // test valid email addresses pass validation
$recipient = $this->objFromFixture( $recipient = $this->objFromFixture(
@ -500,7 +501,7 @@ class UserDefinedFormTest extends FunctionalTest
'valid-recipient-list' 'valid-recipient-list'
); );
$result = $recipient->validate(); $result = $recipient->validate();
$this->assertTrue($result->valid()); $this->assertTrue($result->isValid());
$this->assertEmpty($result->message()); $this->assertEmpty($result->getMessages());
} }
} }