Skip to content

Commit fc98eaa

Browse files
committed
Merge pull request #19 from jasonlewis/fix/tests-windows-ds
Fix path issues for Windows environments.
2 parents b41112d + ca50a4b commit fc98eaa

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

tests/Foundation/ClassLoaderTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ public function tearDown()
1515
public function testProperFilesAreCheckedByLoader()
1616
{
1717
$loader = new ClassLoader(array(__DIR__, __DIR__.'/Models'), $files = m::mock('Illuminate\Filesystem\Filesystem'));
18-
$files->shouldReceive('exists')->once()->with(__DIR__.'/User/Model.php')->andReturn(false);
19-
$files->shouldReceive('exists')->once()->with(__DIR__.'/Models/User/Model.php')->andReturn(true);
20-
$files->shouldReceive('requireOnce')->once()->with(__DIR__.'/Models/User/Model.php');
18+
$files->shouldReceive('exists')->once()->with(__DIR__.'/User'.DIRECTORY_SEPARATOR.'Model.php')->andReturn(false);
19+
$files->shouldReceive('exists')->once()->with(__DIR__.'/Models/User'.DIRECTORY_SEPARATOR.'Model.php')->andReturn(true);
20+
$files->shouldReceive('requireOnce')->once()->with(__DIR__.'/Models/User'.DIRECTORY_SEPARATOR.'Model.php');
2121

2222
$this->assertTrue($loader->load('\\User\\Model'));
2323
}

tests/Pagination/EnvironmentTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ protected function getEnvironment()
7979
$request = m::mock('Illuminate\Http\Request');
8080
$view = m::mock('Illuminate\View\Environment');
8181
$trans = m::mock('Symfony\Component\Translation\TranslatorInterface');
82-
83-
$view->shouldReceive('addNamespace')->once()->with('pagination', realpath(__DIR__.'/../../src/Illuminate/Pagination/views'));
82+
$view->shouldReceive('addNamespace')->once()->with('pagination', realpath(__DIR__.'/../../src/Illuminate/Pagination').'/views');
8483

8584
return new Environment($request, $view, $trans);
8685
}

0 commit comments

Comments
 (0)