Fix - load factories using absolute paths

mnabialek · Sep 22, 2016 · af65ecd · af65ecd
1 parent cde0ced
commit af65ecd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Release notes
 
+### v0.2.4 (2016-09-22)
+
+- fix using absolute paths when loading factories
+
 ### v0.2.3 (2016-09-04)
 
 - fix using absolute paths to verify whether files exists

diff --git a/phpunit.xml b/phpunit.xml
@@ -9,7 +9,7 @@
          processIsolation="false"
          stopOnFailure="false">
     <testsuites>
-        <testsuite name="LaravelEloquentFilter">
+        <testsuite name="Tests">
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>

diff --git a/src/Services/Modular.php b/src/Services/Modular.php
@@ -83,7 +83,8 @@ public function loadFactories($factory)
     {
         $this->withFactories()->each(function ($module) use ($factory) {
             /* @var Module $module */
-            $this->loadFactoryFile($module->factoryFilePath(), $factory);
+            $this->loadFactoryFile($this->app->basePath() . DIRECTORY_SEPARATOR .
+                $module->factoryFilePath(), $factory);
         });
     }
 

diff --git a/tests/Services/ModularTest.php b/tests/Services/ModularTest.php
@@ -132,12 +132,15 @@ protected function verifyCorrectLoadingRoutesForType($type)
     /** @test */
     public function it_loads_valid_factories()
     {
+        $basePath = 'base/path';
         $moduleAFactoryFile = 'moduleA/factory.php';
         $moduleBFactoryFile = 'moduleB/factory.php';
 
         $moduleA = m::mock(stdClass::class);
         $moduleB = m::mock(stdClass::class);
 
+        $this->app->shouldReceive('basePath')->times(2)->andReturn($basePath);
+
         $factory = new Factory(new Faker());
 
         $this->modular->shouldReceive('withFactories')->once()
@@ -147,13 +150,13 @@ public function it_loads_valid_factories()
             ->withNoArgs()->andReturn($moduleAFactoryFile);
 
         $this->modular->shouldReceive('loadFactoryFile')->once()
-            ->with($moduleAFactoryFile, $factory);
+            ->with($basePath . DIRECTORY_SEPARATOR . $moduleAFactoryFile, $factory);
 
         $moduleB->shouldReceive('factoryFilePath')->once()
             ->withNoArgs()->andReturn($moduleBFactoryFile);
 
         $this->modular->shouldReceive('loadFactoryFile')->once()
-            ->with($moduleBFactoryFile, $factory);
+            ->with($basePath . DIRECTORY_SEPARATOR .$moduleBFactoryFile, $factory);
 
         $this->assertSame(null, $this->modular->loadFactories($factory));
     }