@@ -40,7 +40,7 @@ public function testItMergesFieldValidationWithRequestValidation()
4040 return (new Route ('POST ' , 'users ' , ['Backpack\CRUD\Tests\Unit\Http\Controllers\UserCrudController ' , 'create ' ]))->bind ($ request );
4141 });
4242
43- $ this ->crudPanel ->addFields (
43+ $ this ->crudPanel ->addFields ([
4444 [
4545 'name ' => 'email ' ,
4646 'validationRules ' => 'required ' ,
@@ -51,10 +51,10 @@ public function testItMergesFieldValidationWithRequestValidation()
5151 [
5252 'name ' => 'password ' ,
5353 ]
54- );
54+ ] );
5555
5656 $ this ->crudPanel ->setRequest ($ request );
57-
57+
5858 $ this ->crudPanel ->validateRequest ();
5959
6060 $ this ->assertEquals (['email ' ], array_keys ($ this ->crudPanel ->getOperationSetting ('validationRules ' )));
@@ -69,17 +69,18 @@ public function testItMergesAllKindsOfValidation()
6969 'password ' => 'required ' ,
7070 ]);
7171 $ this ->crudPanel ->setValidation (UserRequest::class);
72+
7273 $ request = request ()->create ('users/ ' , 'POST ' , [
73- 'name ' => 'test name ' ,
74- 75- 'password ' => 'test ' ,
74+ 'name ' => '' ,
75+ 'password ' => '' ,
76+ 'email ' => '' ,
7677 ]);
7778
7879 $ request ->setRouteResolver (function () use ($ request ) {
7980 return (new Route ('POST ' , 'users ' , ['Backpack\CRUD\Tests\Unit\Http\Controllers\UserCrudController ' , 'create ' ]))->bind ($ request );
8081 });
8182
82- $ this ->crudPanel ->addFields (
83+ $ this ->crudPanel ->addFields ([
8384 [
8485 'name ' => 'email ' ,
8586 'validationRules ' => 'required ' ,
@@ -90,13 +91,18 @@ public function testItMergesAllKindsOfValidation()
9091 [
9192 'name ' => 'password ' ,
9293 ]
93- );
94+ ] );
9495
9596 $ this ->crudPanel ->setRequest ($ request );
9697
97- $ validatedRequest = $ this ->crudPanel -> validateRequest ( );
98+ $ this ->expectException (\ Illuminate \ Validation \ValidationException::class );
9899
99- $ this ->assertEquals (['password ' , 'email ' ], array_keys ($ this ->crudPanel ->getOperationSetting ('validationRules ' )));
100+ try {
101+ $ this ->crudPanel ->validateRequest ();
102+ }catch (\Illuminate \Validation \ValidationException $ e ){
103+ $ this ->assertEquals (['password ' , 'email ' , 'name ' ], array_keys ($ e ->errors ()));
104+ throw $ e ;
105+ }
100106 }
101107
102108 public function testItCanGetTheValidationFromFields ()
@@ -149,7 +155,7 @@ public function testItCanGetTheValidationFromFields()
149155 $ this ->assertEquals (['email ' , 'name ' , 'password.*.test ' ], array_keys ($ this ->crudPanel ->getOperationSetting ('validationRules ' )));
150156 }
151157
152- public function testItThrowsExceptionWithInvalidaValidationClass ()
158+ public function testItThrowsExceptionWithInvalidValidationClass ()
153159 {
154160 $ this ->crudPanel ->setModel (User::class);
155161 $ this ->crudPanel ->setOperation ('create ' );
0 commit comments