phpmon/laravel-valet
1
0
Fork 0
mirror of https://github.com/laravel/valet.git synced 2026-02-06 16:50:09 +01:00
Code Activity

working on tests

Browse Source
This commit is contained in:
Taylor Otwell
2016-11-01 15:38:43 -05:00
committed by Adam Wathan
parent fba8eb7602
commit a35b668aee
5 changed files with 4 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cli/Valet/Configuration.php
View File

@@ -90,6 +90,7 @@ function createExtensionsDirectory()
function createLogDirectory() function createLogDirectory()
{ {
$this->files->ensureDirExists(VALET_HOME_PATH.'/Log', user()); $this->files->ensureDirExists(VALET_HOME_PATH.'/Log', user());
$this->files->touch(VALET_HOME_PATH.'/Log/nginx-error.log'); $this->files->touch(VALET_HOME_PATH.'/Log/nginx-error.log');
} }

2
tests/BrewTest.php
View File

@@ -173,7 +173,7 @@ public function test_install_or_fail_can_install_taps()
swap(CommandLine::class, $cli); swap(CommandLine::class, $cli);
$brew = Mockery::mock(Brew::class.'[tap]', [$cli, new Filesystem]); $brew = Mockery::mock(Brew::class.'[tap]', [$cli, new Filesystem]);
$brew->shouldReceive('tap')->once()->with(['test/tap']); $brew->shouldReceive('tap')->once()->with(['test/tap']);
$brew->installOrFail('dnsmasq', ['test/tap']); $brew->installOrFail('dnsmasq', [], ['test/tap']);
} }

108
tests/CaddyTest.php
View File

@@ -1,108 +0,0 @@
<?php
use Valet\Site;
use Valet\Caddy;
use Valet\Filesystem;
use Valet\Configuration;
use Illuminate\Container\Container;
class CaddyTest extends PHPUnit_Framework_TestCase
{
public function setUp()
{
$_SERVER['SUDO_USER'] = user();
Container::setInstance(new Container);
}
public function tearDown()
{
Mockery::close();
}
public function test_install_caddy_file_places_stub_in_valet_home_directory()
{
$files = Mockery::mock(Filesystem::class.'[putAsUser]');
$files->shouldReceive('putAsUser')->andReturnUsing(function ($path, $contents) {
$this->assertSame(VALET_HOME_PATH.'/Caddyfile', $path);
$this->assertTrue(strpos($contents, 'import '.VALET_HOME_PATH.'/Caddy/*') !== false);
})->once();
swap(Filesystem::class, $files);
$caddy = resolve(Caddy::class);
$caddy->installCaddyFile();
}
public function test_install_caddy_directories_creates_location_for_site_specific_configuration()
{
$files = Mockery::mock(Filesystem::class);
$files->shouldReceive('isDir')->with(VALET_HOME_PATH.'/Caddy')->andReturn(false);
$files->shouldReceive('mkdirAsUser')->with(VALET_HOME_PATH.'/Caddy')->once();
$files->shouldReceive('putAsUser')->with(VALET_HOME_PATH.'/Caddy/.keep', "\n")->once();
swap(Filesystem::class, $files);
swap(Configuration::class, Mockery::spy(Configuration::class));
swap(Site::class, Mockery::spy(Site::class));
$caddy = resolve(Caddy::class);
$caddy->installCaddyDirectory();
}
public function test_caddy_directory_is_never_created_if_it_already_exists()
{
$files = Mockery::mock(Filesystem::class);
$files->shouldReceive('isDir')->with(VALET_HOME_PATH.'/Caddy')->andReturn(true);
$files->shouldReceive('mkdirAsUser')->never();
$files->shouldReceive('putAsUser')->with(VALET_HOME_PATH.'/Caddy/.keep', "\n")->once();
swap(Filesystem::class, $files);
swap(Configuration::class, Mockery::spy(Configuration::class));
swap(Site::class, Mockery::spy(Site::class));
$caddy = resolve(Caddy::class);
$caddy->installCaddyDirectory();
}
public function test_install_caddy_directories_rewrites_secure_caddy_files()
{
$files = Mockery::mock(Filesystem::class);
$files->shouldReceive('isDir')->with(VALET_HOME_PATH.'/Caddy')->andReturn(false);
$files->shouldReceive('mkdirAsUser')->with(VALET_HOME_PATH.'/Caddy')->once();
$files->shouldReceive('putAsUser')->with(VALET_HOME_PATH.'/Caddy/.keep', "\n")->once();
swap(Filesystem::class, $files);
swap(Configuration::class, $config = Mockery::spy(Configuration::class, ['read' => ['domain' => 'dev']]));
swap(Site::class, $site = Mockery::spy(Site::class));
$caddy = resolve(Caddy::class);
$caddy->installCaddyDirectory();
$site->shouldHaveReceived('resecureForNewDomain', ['dev', 'dev']);
}
public function test_caddy_daemon_is_placed_in_correct_location()
{
$files = Mockery::mock(Filesystem::class.'[put]');
swap(Filesystem::class, $files);
swap(Configuration::class, Mockery::spy(Configuration::class));
swap(Site::class, Mockery::spy(Site::class));
$caddy = resolve(Caddy::class);
$files->shouldReceive('put')->andReturnUsing(function ($path, $contents) use ($caddy) {
$this->assertSame($caddy->daemonPath, $path);
$this->assertTrue(strpos($contents, VALET_HOME_PATH) !== false);
})->once();
$caddy->installCaddyDaemon();
}
}

2
tests/ConfigurationTest.php
View File

@@ -43,7 +43,7 @@ public function test_log_directory_is_created_with_log_files_if_it_doesnt_exist(
{ {
$files = Mockery::mock(Filesystem::class.'[ensureDirExists,touch]'); $files = Mockery::mock(Filesystem::class.'[ensureDirExists,touch]');
$files->shouldReceive('ensureDirExists')->with(VALET_HOME_PATH.'/Log', user()); $files->shouldReceive('ensureDirExists')->with(VALET_HOME_PATH.'/Log', user());
$files->shouldReceive('touch')->twice(); $files->shouldReceive('touch')->once();
swap(Filesystem::class, $files); swap(Filesystem::class, $files);
resolve(Configuration::class)->createLogDirectory(); resolve(Configuration::class)->createLogDirectory();
} }

2
tests/PhpFpmTest.php
View File

@@ -29,7 +29,7 @@ public function test_fpm_is_configured_with_the_correct_user_group_and_port()
$contents = file_get_contents(__DIR__.'/output/fpm.conf'); $contents = file_get_contents(__DIR__.'/output/fpm.conf');
$this->assertTrue(strpos($contents, sprintf("\nuser = %s", user())) !== false); $this->assertTrue(strpos($contents, sprintf("\nuser = %s", user())) !== false);
$this->assertTrue(strpos($contents, "\ngroup = staff") !== false); $this->assertTrue(strpos($contents, "\ngroup = staff") !== false);
$this->assertTrue(strpos($contents, "\nlisten = 127.0.0.1:9000") !== false); $this->assertTrue(strpos($contents, "\nlisten = /Users/".user()."/.valet/valet.sock") !== false);
} }
} }