Fix conflicts

christophrumpel · Feb 5, 2020 · c764689 · c764689
2 parents 5f4a603 + 76352c0
commit c764689
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 27 deletions.
diff --git a/src/Commands/MakeFactoryReloadedCommand.php b/src/Commands/MakeFactoryReloadedCommand.php
@@ -59,7 +59,8 @@ public function handle()
         $this->makeDirectory($classPath);
 
         $this->files->put($classPath, $this->sortImports($this->buildClass($this->fullClassName)));
-        $this->info($this->type.' created successfully.');
+
+        $this->info(config('factories-reloaded.factories_namespace') . '\\' . $this->className.$this->type . ' created successfully.');
     }
 
     /**

diff --git a/tests/Factories/tmp/GroupFactory.php b/tests/Factories/tmp/GroupFactory.php
diff --git a/tests/FactoryCommandTest.php b/tests/FactoryCommandTest.php
@@ -27,7 +27,7 @@ public function it_creates_factory_for_chosen_model()
         $this->artisan('make:factoryReloaded')
             ->expectsQuestion('Please pick a model',
                 '<href=file://'.__DIR__.'/Models/Group.php>Christophrumpel\LaravelFactoriesReloaded\Tests\Models\Group</>')
-            ->expectsOutput('Factory created successfully.')
+            ->expectsOutput('Tests\Factories\GroupFactory created successfully.')
             ->assertExitCode(0);
 
         $this->assertTrue(File::exists(__DIR__.'/Factories/tmp/GroupFactory.php'));