Compare commits

..

1 Commits

Author SHA1 Message Date
Guy Sartorelli
dc84a231b9
ENH Update code to reflect changes in template layer 2024-10-14 16:00:54 +13:00
3 changed files with 15 additions and 36 deletions

6
_config.php Normal file
View File

@ -0,0 +1,6 @@
<?php
use SilverStripe\Admin\CMSMenu;
use SilverStripe\UserForms\Control\UserDefinedFormAdmin;
CMSMenu::remove_menu_class(UserDefinedFormAdmin::class);

View File

@ -47,8 +47,6 @@ class UserDefinedFormAdmin extends LeftAndMain
private static $url_segment = 'user-forms'; private static $url_segment = 'user-forms';
private static $ignore_menuitem = true;
/** /**
* @var string The name of the folder where form submissions will be placed by default * @var string The name of the folder where form submissions will be placed by default
*/ */

View File

@ -584,41 +584,16 @@ class UserDefinedFormControllerTest extends FunctionalTest
public static function provideValidEmailsToArray() public static function provideValidEmailsToArray()
{ {
return [ return [
[[], [null]],
[[], [' , , ']],
[[], ['broken.email, broken@.email, broken2.@email']],
[ [
'input' => [ ['broken@email', 'correctemail@email.com'],
null [', broken@email, email@-email.com,correctemail@email.com,']
],
'expected' => [],
], ],
[ [
'input' => [ ['correctemail1@email.com', 'correctemail2@email.com', 'correctemail3@email.com'],
' , , ' ['correctemail1@email.com, correctemail2@email.com, correctemail3@email.com']
],
'expected' => [],
],
[
'input' => [
'broken.email, broken@.email, broken2.@email'
],
'expected' => [],
],
[
'input' => [
', broken@email, email@-email.com,correctemail@email.com,'
],
'expected' => [
'correctemail@email.com'
],
],
[
'input' => [
'correctemail1@email.com, correctemail2@email.com, correctemail3@email.com'
],
'expected' => [
'correctemail1@email.com',
'correctemail2@email.com',
'correctemail3@email.com'
],
] ]
]; ];
} }
@ -627,7 +602,7 @@ class UserDefinedFormControllerTest extends FunctionalTest
* Test that provided email is valid * Test that provided email is valid
*/ */
#[DataProvider('provideValidEmailsToArray')] #[DataProvider('provideValidEmailsToArray')]
public function testValidEmailsToArray(array $input, array $expected) public function testValidEmailsToArray(array $expectedOutput, array $input)
{ {
$class = new ReflectionClass(UserDefinedFormController::class); $class = new ReflectionClass(UserDefinedFormController::class);
$method = $class->getMethod('validEmailsToArray'); $method = $class->getMethod('validEmailsToArray');
@ -635,6 +610,6 @@ class UserDefinedFormControllerTest extends FunctionalTest
$controller = new UserDefinedFormController(); $controller = new UserDefinedFormController();
$this->assertEquals($expected, $method->invokeArgs($controller, $input)); $this->assertEquals($expectedOutput, $method->invokeArgs($controller, $input));
} }
} }