Merge pull request #27 from givebutter/get-to-green

Finish fixing factories + bug fixes in tests

Author: bastones-adeva

composer.json

@@ -34,7 +34,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Givebutter\\Tests\\": "tests/"
+            "Givebutter\\Tests\\": "tests/",
+            "Database\\": "database/"
         }
     },
     "scripts": {

tests/Feature/CustomFieldControllerTest.php

@@ -19,7 +19,7 @@ public function valid_data_passes_controller_validation()
     {
         $survey = Survey::create();
         $survey->customfields()->save(
-            factory(CustomField::class)->make([
+            CustomField::factory()->make([
                 'title' => 'email',
                 'type' => 'text',
             ])
@@ -45,15 +45,15 @@ public function invalid_data_throws_validation_exception()
     {
         $survey = Survey::create();
         $survey->customfields()->save(
-            factory(CustomField::class)->make([
+            CustomField::factory()->make([
                 'title' => 'favorite_album',
                 'type' => 'select',
                 'answers' => ['Tha Carter', 'Tha Carter II', 'Tha Carter III'],
             ])
         );
 
         Route::post("/surveys/{$survey->id}/responses", function (Request $request) use ($survey) {
-            $validator = $survey->validateCustomFields($request);
+            $validator = $survey->validateCustomFields($request->custom_fields);
 
             if ($validator->fails()) {
                 return ['errors' => $validator->errors()];
@@ -77,7 +77,7 @@ public function non_required_fields_can_be_left_null_for_validation()
     {
         $survey = Survey::create();
         $survey->customfields()->save(
-            factory(CustomField::class)->make([
+            CustomField::factory()->make([
                 'title' => 'favorite_album',
                 'type' => 'select',
                 'answers' => ['Tha Carter', 'Tha Carter II', 'Tha Carter III'],
@@ -111,7 +111,7 @@ public function checkbox_can_pass_validation()
         $survey = Survey::create();
         $surveyResponse = SurveyResponse::create();
         $survey->customfields()->save(
-            factory(CustomField::class)->make([
+            CustomField::factory()->make([
                 'title' => 'favorite_album',
                 'type' => 'checkbox',
             ])
@@ -147,7 +147,7 @@ public function fields_can_be_saved_from_request_with_convenience_method()
         $survey = Survey::create();
         $surveyResponse = SurveyResponse::create();
         $survey->customfields()->save(
-            factory(CustomField::class)->make([
+            CustomField::factory()->make([
                 'title' => 'favorite_album',
                 'type' => 'select',
                 'answers' => ['Tha Carter', 'Tha Carter II', 'Tha Carter III'],

tests/Feature/HasCustomFieldResponsesTest.php

@@ -19,7 +19,7 @@ public function custom_fields_responses_can_be_created_and_accessed_on_models_wi
         $customFieldModel = Survey::create();
         $customFieldResponseModel = SurveyResponse::create();
 
-        $customField = factory(CustomField::class)->make([
+        $customField = CustomField::factory()->make([
             'model_id' => $customFieldModel->id,
             'model_type' => get_class($customFieldModel),
         ]);
@@ -46,7 +46,7 @@ public function whereField_method_allows_filtering_responses()
         $firstResponseModel = SurveyResponse::create();
         $secondResponseModel = SurveyResponse::create();
 
-        $firstField = factory(CustomField::class)->create([
+        $firstField = CustomField::factory()->create([
             'model_id' => $customFieldModel->id,
             'model_type' => get_class($customFieldModel),
         ]);
@@ -82,7 +82,7 @@ public function value_getter_and_setter_work_fine()
         $customFieldModel = Survey::create();
         $customFieldResponseModel = SurveyResponse::create();
 
-        $customField = factory(CustomField::class)->make([
+        $customField = CustomField::factory()->make([
             'model_id' => $customFieldModel->id,
             'model_type' => get_class($customFieldModel),
             'type' => 'text',

tests/Feature/HasCustomFieldsTest.php

@@ -16,7 +16,7 @@ public function custom_fields_can_be_created_and_accessed_on_models_with_trait()
     {
         $model = Survey::create();
 
-        $customField = factory(CustomField::class)->make([
+        $customField = CustomField::factory()->make([
             'model_id' => $model->id,
             'model_type' => get_class($model),
             'description' => 'Lil Wayne',

tests/Feature/OrderingTest.php

@@ -18,11 +18,11 @@ public function new_fields_are_ordered_by_default()
     {
         $survey = Survey::create();
         $survey->customfields()->saveMany([
-            factory(CustomField::class)->make([
+            CustomField::factory()->make([
                 'title' => 'email',
                 'type' => 'text',
             ]),
-            factory(CustomField::class)->make([
+            CustomField::factory()->make([
                 'title' => 'phone',
                 'type' => 'text',
             ]),
@@ -37,11 +37,11 @@ public function order_function_replaces_field_orders()
     {
         $survey = Survey::create();
         $survey->customfields()->saveMany([
-            factory(CustomField::class)->make([
+            CustomField::factory()->make([
                 'title' => 'email',
                 'type' => 'text',
             ]),
-            factory(CustomField::class)->make([
+            CustomField::factory()->make([
                 'title' => 'phone',
                 'type' => 'text',
             ]),
@@ -58,11 +58,11 @@ public function order_function_throws_exception_for_wrong_number_of_ids()
     {
         $survey = Survey::create();
         $survey->customfields()->saveMany([
-            factory(CustomField::class)->make([
+            CustomField::factory()->make([
                 'title' => 'email',
                 'type' => 'text',
             ]),
-            factory(CustomField::class)->make([
+            CustomField::factory()->make([
                 'title' => 'phone',
                 'type' => 'text',
             ]),
@@ -79,23 +79,23 @@ public function order_function_throws_exception_if_passed_fields_not_belonging_t
     {
         $survey1 = Survey::create();
         $survey1->customfields()->saveMany([
-            factory(CustomField::class)->make([
+            CustomField::factory()->make([
                 'title' => 'email',
                 'type' => 'text',
             ]),
-            factory(CustomField::class)->make([
+            CustomField::factory()->make([
                 'title' => 'phone',
                 'type' => 'text',
             ]),
         ]);
 
         $survey2 = Survey::create();
         $survey2->customfields()->saveMany([
-            factory(CustomField::class)->make([
+            CustomField::factory()->make([
                 'title' => 'fax',
                 'type' => 'text',
             ]),
-            factory(CustomField::class)->make([
+            CustomField::factory()->make([
                 'title' => 'telegraph',
                 'type' => 'text',
             ]),

tests/Support/Factories/CustomFieldFactory.php

@@ -3,7 +3,9 @@
 namespace Givebutter\Tests;
 
 use Givebutter\LaravelCustomFields\LaravelCustomFieldsServiceProvider;
+use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Str;
 use Orchestra\Testbench\TestCase as OrchestraTestCase;
 
 class TestCase extends OrchestraTestCase
@@ -12,7 +14,14 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->withFactories(__DIR__ . '/Support/Factories');
+        Factory::guessFactoryNamesUsing(function (string $modelName) {
+            $namespace = 'Database\\Factories\\';
+
+            $modelName = Str::afterLast($modelName, '\\');
+
+            return $namespace.$modelName.'Factory';
+        });
+
         $this->setUpDatabase($this->app);
         $this->withoutExceptionHandling();
     }