tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

FIX Minor updates to unit tests to pass with HTML5 parser and various themes

Browse Source
This commit is contained in:
Robbie Averill 2018-06-01 17:47:03 +12:00
parent d0d936bc40
commit 8064ed8220
6 changed files with 92 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/php/Forms/EmailFieldTest.php
View File

@ -67,23 +67,16 @@ class EmailFieldTest extends FunctionalTest
* *
* @see SimpleTagBuilder::_createInputTag() * @see SimpleTagBuilder::_createInputTag()
*/ */
function testEmailFieldPopulation() public function testEmailFieldPopulation()
{ {
$this->get('EmailFieldTest_Controller'); $this->get('EmailFieldTest_Controller');
$this->submitForm(
$response = $this->submitForm(
'Form_Form', 'Form_Form',
null, null,
array( ['Email' => 'test@test.com']
'Email' => 'test@test.com'
)
); );
$this->assertPartialMatchBySelector( $this->assertContains('Test save was successful', $response->getBody());
'p.good',
array(
'Test save was successful'
)
);
} }
} }

36
tests/php/Forms/FormTest.php
View File

@ -2,33 +2,31 @@
namespace SilverStripe\Forms\Tests; namespace SilverStripe\Forms\Tests;
use SilverStripe\Control\Controller;
use SilverStripe\Control\HTTPRequest;
use SilverStripe\Control\Session; use SilverStripe\Control\Session;
use SilverStripe\Core\Config\Config; use SilverStripe\Dev\CSSContentParser;
use SilverStripe\Dev\FunctionalTest;
use SilverStripe\Forms\DateField;
use SilverStripe\Forms\FieldList;
use SilverStripe\Forms\FileField;
use SilverStripe\Forms\Form;
use SilverStripe\Forms\FormAction;
use SilverStripe\Forms\HeaderField;
use SilverStripe\Forms\LookupField;
use SilverStripe\Forms\NumericField;
use SilverStripe\Forms\PasswordField; use SilverStripe\Forms\PasswordField;
use SilverStripe\Forms\Tests\FormTest\TestController;
use SilverStripe\Forms\Tests\FormTest\ControllerWithSecurityToken; use SilverStripe\Forms\Tests\FormTest\ControllerWithSecurityToken;
use SilverStripe\Forms\Tests\FormTest\ControllerWithStrictPostCheck; use SilverStripe\Forms\Tests\FormTest\ControllerWithStrictPostCheck;
use SilverStripe\Forms\Tests\FormTest\Player; use SilverStripe\Forms\Tests\FormTest\Player;
use SilverStripe\Forms\Tests\FormTest\Team; use SilverStripe\Forms\Tests\FormTest\Team;
use SilverStripe\Forms\Tests\FormTest\TestController;
use SilverStripe\Forms\TextareaField;
use SilverStripe\Forms\TextField;
use SilverStripe\ORM\ValidationResult; use SilverStripe\ORM\ValidationResult;
use SilverStripe\Security\NullSecurityToken; use SilverStripe\Security\NullSecurityToken;
use SilverStripe\Security\Security;
use SilverStripe\Security\SecurityToken;
use SilverStripe\Security\RandomGenerator; use SilverStripe\Security\RandomGenerator;
use SilverStripe\Dev\CSSContentParser; use SilverStripe\Security\SecurityToken;
use SilverStripe\Dev\FunctionalTest;
use SilverStripe\Control\Controller;
use SilverStripe\Control\HTTPRequest;
use SilverStripe\Forms\TextField;
use SilverStripe\Forms\FieldList;
use SilverStripe\Forms\Form;
use SilverStripe\Forms\HeaderField;
use SilverStripe\Forms\TextareaField;
use SilverStripe\Forms\DateField;
use SilverStripe\Forms\NumericField;
use SilverStripe\Forms\LookupField;
use SilverStripe\Forms\FileField;
use SilverStripe\Forms\FormAction;
use SilverStripe\View\SSViewer; use SilverStripe\View\SSViewer;
/** /**
@ -50,6 +48,8 @@ class FormTest extends FunctionalTest
ControllerWithStrictPostCheck::class, ControllerWithStrictPostCheck::class,
]; ];
protected static $disable_themes = true;
protected function setUp() protected function setUp()
{ {
parent::setUp(); parent::setUp();

13
tests/php/Forms/GridField/GridFieldDetailFormTest.php
View File

@ -2,20 +2,19 @@
namespace SilverStripe\Forms\Tests\GridField; namespace SilverStripe\Forms\Tests\GridField;
use SilverStripe\Dev\CSSContentParser;
use SilverStripe\Dev\Debug;
use SilverStripe\Dev\FunctionalTest;
use SilverStripe\Control\Controller; use SilverStripe\Control\Controller;
use SilverStripe\Forms\HiddenField; use SilverStripe\Dev\CSSContentParser;
use SilverStripe\Forms\GridField\GridFieldDetailForm; use SilverStripe\Dev\FunctionalTest;
use SilverStripe\Forms\GridField\GridField; use SilverStripe\Forms\GridField\GridField;
use SilverStripe\Forms\GridField\GridFieldDetailForm;
use SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest; use SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest;
use SilverStripe\Forms\HiddenField;
use SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest\Category; use SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest\Category;
use SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest\CategoryController; use SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest\CategoryController;
use SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest\TestController;
use SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest\GroupController; use SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest\GroupController;
use SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest\PeopleGroup; use SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest\PeopleGroup;
use SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest\Person; use SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest\Person;
use SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest\TestController;
/** /**
* @skipUpgrade * @skipUpgrade
@ -36,6 +35,8 @@ class GridFieldDetailFormTest extends FunctionalTest
GroupController::class, GroupController::class,
]; ];
protected static $disable_themes = true;
public function testValidator() public function testValidator()
{ {
$this->logInWithPermission('ADMIN'); $this->logInWithPermission('ADMIN');

113
tests/php/Forms/LookupFieldTest.php
View File

@ -5,90 +5,85 @@ namespace SilverStripe\Forms\Tests;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
use SilverStripe\Forms\LookupField; use SilverStripe\Forms\LookupField;
use SilverStripe\Security\Member;
class LookupFieldTest extends SapphireTest class LookupFieldTest extends SapphireTest
{ {
protected static $fixture_file = 'LookupFieldTest.yml'; protected static $fixture_file = 'LookupFieldTest.yml';
public function testNullValueWithNumericArraySource() public function testNullValueWithNumericArraySource()
{ {
$source = array(1 => 'one', 2 => 'two', 3 => 'three'); $source = array(1 => 'one', 2 => 'two', 3 => 'three');
$f = new LookupField('test', 'test', $source); $field = new LookupField('test', 'test', $source);
$f->setValue(null); $field->setValue(null);
$result = trim($field->Field()->getValue());
$this->assertEquals( $this->assertContains('<span class="readonly" id="test"><i>(none)</i></span>', $result);
'<span class="readonly" id="test"><i>(none)</i></span><input type="hidden" name="test" value="" />', $this->assertContains('<input type="hidden" name="test" value="" />', $result);
trim($f->Field()->getValue())
);
} }
public function testStringValueWithNumericArraySource() public function testStringValueWithNumericArraySource()
{ {
$source = array(1 => 'one', 2 => 'two', 3 => 'three'); $source = array(1 => 'one', 2 => 'two', 3 => 'three');
$f = new LookupField('test', 'test', $source); $field = new LookupField('test', 'test', $source);
$f->setValue(1); $field->setValue(1);
$this->assertEquals( $result = trim($field->Field()->getValue());
'<span class="readonly" id="test">one</span><input type="hidden" name="test" value="1" />', $this->assertContains('<span class="readonly" id="test">one</span>', $result);
trim($f->Field()->getValue()) $this->assertContains('<input type="hidden" name="test" value="1" />', $result);
);
} }
public function testUnknownStringValueWithNumericArraySource() public function testUnknownStringValueWithNumericArraySource()
{ {
$source = array(1 => 'one', 2 => 'two', 3 => 'three'); $source = array(1 => 'one', 2 => 'two', 3 => 'three');
$f = new LookupField('test', 'test', $source); $field = new LookupField('test', 'test', $source);
$f->setValue('w00t'); $field->setValue('w00t');
$this->assertEquals( $result = trim($field->Field()->getValue());
'<span class="readonly" id="test">w00t</span><input type="hidden" name="test" value="" />',
trim($f->Field()->getValue()) $this->assertContains('<span class="readonly" id="test">w00t</span>', $result);
); $this->assertContains('<input type="hidden" name="test" value="" />', $result);
} }
public function testArrayValueWithAssociativeArraySource() public function testArrayValueWithAssociativeArraySource()
{ {
// Array values (= multiple selections) might be set e.g. from ListboxField // Array values (= multiple selections) might be set e.g. from ListboxField
$source = array('one' => 'one val', 'two' => 'two val', 'three' => 'three val'); $source = array('one' => 'one val', 'two' => 'two val', 'three' => 'three val');
$f = new LookupField('test', 'test', $source); $field = new LookupField('test', 'test', $source);
$f->setValue(array('one','two')); $field->setValue(array('one','two'));
$this->assertEquals( $result = trim($field->Field()->getValue());
'<span class="readonly" id="test">one val, two val</span>'
. '<input type="hidden" name="test" value="one, two" />', $this->assertContains('<span class="readonly" id="test">one val, two val</span>', $result);
trim($f->Field()->getValue()) $this->assertContains('<input type="hidden" name="test" value="one, two" />', $result);
);
} }
public function testArrayValueWithNumericArraySource() public function testArrayValueWithNumericArraySource()
{ {
// Array values (= multiple selections) might be set e.g. from ListboxField // Array values (= multiple selections) might be set e.g. from ListboxField
$source = array(1 => 'one', 2 => 'two', 3 => 'three'); $source = array(1 => 'one', 2 => 'two', 3 => 'three');
$f = new LookupField('test', 'test', $source); $field = new LookupField('test', 'test', $source);
$f->setValue(array(1,2)); $field->setValue(array(1,2));
$this->assertEquals( $result = trim($field->Field()->getValue());
'<span class="readonly" id="test">one, two</span><input type="hidden" name="test" value="1, 2" />',
trim($f->Field()->getValue()) $this->assertContains('<span class="readonly" id="test">one, two</span>', $result);
); $this->assertContains('<input type="hidden" name="test" value="1, 2" />', $result);
} }
public function testArrayValueWithSqlMapSource() public function testArrayValueWithSqlMapSource()
{ {
$member1 = $this->objFromFixture('SilverStripe\\Security\\Member', 'member1'); $member1 = $this->objFromFixture(Member::class, 'member1');
$member2 = $this->objFromFixture('SilverStripe\\Security\\Member', 'member2'); $member2 = $this->objFromFixture(Member::class, 'member2');
$member3 = $this->objFromFixture('SilverStripe\\Security\\Member', 'member3'); $member3 = $this->objFromFixture(Member::class, 'member3');
$source = DataObject::get('SilverStripe\\Security\\Member'); $source = DataObject::get(Member::class);
$f = new LookupField('test', 'test', $source->map('ID', 'FirstName')); $field = new LookupField('test', 'test', $source->map('ID', 'FirstName'));
$f->setValue(array($member1->ID, $member2->ID)); $field->setValue(array($member1->ID, $member2->ID));
$result = trim($field->Field()->getValue());
$this->assertEquals( $this->assertContains('<span class="readonly" id="test">member1, member2</span>', $result);
sprintf( $this->assertContains(sprintf(
'<span class="readonly" id="test">member1, member2</span>' '<input type="hidden" name="test" value="%s, %s" />',
. '<input type="hidden" name="test" value="%s, %s" />', $member1->ID,
$member1->ID, $member2->ID
$member2->ID ), $result);
),
trim($f->Field()->getValue())
);
} }
public function testWithMultiDimensionalSource() public function testWithMultiDimensionalSource()
@ -105,23 +100,17 @@ class LookupFieldTest extends SapphireTest
) )
); );
$f = new LookupField('test', 'test', $choices); $field = new LookupField('test', 'test', $choices);
$f->setValue(3); $field->setValue(3);
$result = trim($field->Field()->getValue());
$this->assertEquals( $this->assertContains('<span class="readonly" id="test">Carrots</span>', $result);
'<span class="readonly" id="test">Carrots</span><input type="hidden" name="test" value="3" />', $this->assertContains('<input type="hidden" name="test" value="3" />', $result);
trim($f->Field()->getValue())
);
$f->setValue( $field->setValue([3, 9]);
array( $result = trim($field->Field()->getValue());
3, 9
)
);
$this->assertEquals( $this->assertContains('<span class="readonly" id="test">Carrots, Vegan</span>', $result);
'<span class="readonly" id="test">Carrots, Vegan</span><input type="hidden" name="test" value="3, 9" />', $this->assertContains('<input type="hidden" name="test" value="3, 9" />', $result);
trim($f->Field()->getValue())
);
} }
} }

1
tests/php/Forms/SelectionGroupTest.php
View File

@ -58,6 +58,7 @@ class SelectionGroupTest extends SapphireTest
$field->setValue('two'); $field->setValue('two');
$parser = new CSSContentParser($field->FieldHolder()); $parser = new CSSContentParser($field->FieldHolder());
$listEls = $parser->getBySelector('li'); $listEls = $parser->getBySelector('li');
$listElOne = $listEls[0]; $listElOne = $listEls[0];
$listElTwo = $listEls[1]; $listElTwo = $listEls[1];

18
tests/php/Forms/TreeDropdownFieldTest.php
View File

@ -196,15 +196,17 @@ class TreeDropdownFieldTest extends SapphireTest
public function testReadonly() public function testReadonly()
{ {
$field = new TreeDropdownField('TestTree', 'Test tree', File::class); $field = new TreeDropdownField('TestTree', 'Test tree', File::class);
$asdf = $this->objFromFixture(File::class, 'asdf'); $fileMock = $this->objFromFixture(File::class, 'asdf');
$field->setValue($asdf->ID); $field->setValue($fileMock->ID);
$readonlyField = $field->performReadonlyTransformation(); $readonlyField = $field->performReadonlyTransformation();
$this->assertEquals( $result = (string) $readonlyField->Field();
<<<"HTML" $this->assertContains(
<span class="readonly" id="TestTree">&lt;Special &amp; characters&gt;</span><input type="hidden" name="TestTree" value="{$asdf->ID}" /> '<span class="readonly" id="TestTree">&lt;Special &amp; characters&gt;</span>',
HTML $result
, );
(string)$readonlyField->Field() $this->assertContains(
'<input type="hidden" name="TestTree" value="' . $fileMock->ID . '" />',
$result
); );
} }
} }