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

Merge pull request #6950 from open-sausages/revert-6941-pulls/phpunit-pretty-print

Browse Source 
Revert 6941 pulls/phpunit pretty print
This commit is contained in:
Chris Joe 2017-05-23 09:54:09 +12:00 committed by GitHub
commit 93e92e49c5
6 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -46,7 +46,6 @@
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^5.7", "phpunit/phpunit": "^5.7",
"scriptfusion/phpunit-immediate-exception-printer": "^1",
"silverstripe/versioned": "^1.0@dev", "silverstripe/versioned": "^1.0@dev",
"silverstripe/behat-extension": "^3", "silverstripe/behat-extension": "^3",
"silverstripe/serve": "dev-master", "silverstripe/serve": "dev-master",

4
phpunit.xml.dist
View File

@ -3,9 +3,7 @@
Standard module phpunit configuration. Standard module phpunit configuration.
Requires PHPUnit ^5.7 Requires PHPUnit ^5.7
--> -->
<phpunit printerClass="ScriptFUSION\PHPUnitImmediateExceptionPrinter\ImmediateExceptionPrinter" <phpunit bootstrap="tests/bootstrap.php" colors="true">
bootstrap="tests/bootstrap.php"
colors="true">
<testsuite name="Default"> <testsuite name="Default">
<directory>tests/php</directory> <directory>tests/php</directory>
</testsuite> </testsuite>

5
tests/php/Forms/CheckboxFieldTest.php
View File

@ -197,7 +197,10 @@ class CheckboxFieldTest extends SapphireTest
$field = new CheckboxField('RequiredField', 'myRequiredField'); $field = new CheckboxField('RequiredField', 'myRequiredField');
$form = new Form( $form = new Form(
Controller::curr(), "form", new FieldList($field), new FieldList(), Controller::curr(),
"form",
new FieldList($field),
new FieldList(),
new RequiredFields(["RequiredField"]) new RequiredFields(["RequiredField"])
); );
$this->assertTrue($field->Required()); $this->assertTrue($field->Required());

5
tests/php/Forms/CheckboxSetFieldTest.php
View File

@ -379,7 +379,10 @@ class CheckboxSetFieldTest extends SapphireTest
$field = new CheckboxSetField('RequiredField', 'myRequiredField'); $field = new CheckboxSetField('RequiredField', 'myRequiredField');
$form = new Form( $form = new Form(
Controller::curr(), "form", new FieldList($field), new FieldList(), Controller::curr(),
"form",
new FieldList($field),
new FieldList(),
new RequiredFields(["RequiredField"]) new RequiredFields(["RequiredField"])
); );
$this->assertTrue($field->Required()); $this->assertTrue($field->Required());

5
tests/php/Forms/DropdownFieldTest.php
View File

@ -508,7 +508,10 @@ class DropdownFieldTest extends SapphireTest
$field = new \SilverStripe\Forms\DropdownField("RequiredField", "dropdown", ["item 1", "item 2"]); $field = new \SilverStripe\Forms\DropdownField("RequiredField", "dropdown", ["item 1", "item 2"]);
$form = new Form( $form = new Form(
Controller::curr(), "form", new FieldList($field), new FieldList(), Controller::curr(),
"form",
new FieldList($field),
new FieldList(),
new RequiredFields(["RequiredField"]) new RequiredFields(["RequiredField"])
); );

5
tests/php/Forms/OptionsetFieldTest.php
View File

@ -110,7 +110,10 @@ class OptionsetFieldTest extends SapphireTest
$field = new OptionsetField('RequiredField', 'myRequiredField'); $field = new OptionsetField('RequiredField', 'myRequiredField');
$form = new Form( $form = new Form(
Controller::curr(), "form", new FieldList($field), new FieldList(), Controller::curr(),
"form",
new FieldList($field),
new FieldList(),
new RequiredFields(["RequiredField"]) new RequiredFields(["RequiredField"])
); );
$this->assertTrue($field->Required()); $this->assertTrue($field->Required());