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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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