phpmon/laravel-valet
1
0
Fork 0
mirror of https://github.com/laravel/valet.git synced 2026-02-05 00:20:08 +01:00
Code Activity

Fix PHPFpm tests

Browse Source 
- Fix the isolated directories test given new table shape
- Updated useVersion test to no longer hit the real filesystem

Co-Authored-By: Jacob Baker-Kretzmar <18192441+bakerkretzmar@users.noreply.github.com>
This commit is contained in:
Matt Stauffer
2022-03-14 13:57:45 -04:00
parent 984d7eb699
commit ce4682f897
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/PhpFpmTest.php
View File

@@ -116,13 +116,14 @@ public function test_it_lists_isolated_directories()
{
$fileSystemMock = Mockery::mock(Filesystem::class);
$nginxMock = Mockery::mock(Nginx::class);
$site = Mockery::mock(Site::class);
$phpFpmMock = Mockery::mock(PhpFpm::class, [
Mockery::mock(Brew::class),
Mockery::mock(CommandLine::class),
$fileSystemMock,
resolve(Configuration::class),
Mockery::mock(Site::class),
$site,
$nginxMock,
])->makePartial();
@@ -132,6 +133,11 @@ public function test_it_lists_isolated_directories()
->once()
->andReturn(collect(['isolated-site-71.test', 'isolated-site-72.test', 'not-isolated-site.test']));
$site->shouldReceive('customPhpVersion')->with('isolated-site-71.test')->andReturn('71');
$site->shouldReceive('customPhpVersion')->with('isolated-site-72.test')->andReturn('72');
$site->shouldReceive('normalizePhpVersion')->with('71')->andReturn('php@7.1');
$site->shouldReceive('normalizePhpVersion')->with('72')->andReturn('php@7.2');
$sites = [
[
'site' => 'isolated-site-71.test',
@@ -151,7 +157,16 @@ public function test_it_lists_isolated_directories()
$fileSystemMock->shouldReceive('get')->once()->with(VALET_HOME_PATH.'/Nginx/'.$site['site'])->andReturn($site['conf']);
}
$this->assertEquals(['isolated-site-71.test', 'isolated-site-72.test'], resolve(PhpFpm::class)->isolatedDirectories()->pluck('url')->toArray());
$this->assertEquals([
[
'url' => 'isolated-site-71.test',
'version' => 'php@7.1',
],
[
'url' => 'isolated-site-72.test',
'version' => 'php@7.2',
]
], resolve(PhpFpm::class)->isolatedDirectories()->toArray());
}
public function test_stop_unused_php_versions()
@@ -215,14 +230,17 @@ public function test_stopRunning_will_pass_filtered_result_of_getRunningServices
public function test_use_version_will_convert_passed_php_version()
{
// @todo mock CLI and filesystem so real valet.sock files aren't deleted
$brewMock = Mockery::mock(Brew::class);
$nginxMock = Mockery::mock(Nginx::class);
$siteMock = Mockery::mock(Site::class);
$filesystem = Mockery::mock(Filesystem::class);
$cli = Mockery::mock(CommandLine::class);
$phpFpmMock = Mockery::mock(PhpFpm::class, [
$brewMock,
resolve(CommandLine::class),
resolve(Filesystem::class),
$cli,
$filesystem,
resolve(Configuration::class),
$siteMock,
$nginxMock,
@@ -245,6 +263,10 @@ public function test_use_version_will_convert_passed_php_version()
$nginxMock->shouldReceive('restart');
$filesystem->shouldReceive('unlink')->with(VALET_HOME_PATH.'/valet.sock');
$cli->shouldReceive('quietly')->with('sudo rm '.VALET_HOME_PATH.'/valet.sock');
// Test both non prefixed and prefixed
$this->assertSame('php@7.2', $phpFpmMock->useVersion('php7.2'));
$this->assertSame('php@7.2', $phpFpmMock->useVersion('php72'));