From a35b668aeef92488099e71ff5077da9c472f84b8 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 1 Nov 2016 15:38:43 -0500 Subject: [PATCH] working on tests --- cli/Valet/Configuration.php | 1 + tests/BrewTest.php | 2 +- tests/CaddyTest.php | 108 ------------------------------------ tests/ConfigurationTest.php | 2 +- tests/PhpFpmTest.php | 2 +- 5 files changed, 4 insertions(+), 111 deletions(-) delete mode 100644 tests/CaddyTest.php diff --git a/cli/Valet/Configuration.php b/cli/Valet/Configuration.php index ebde717..432cbb5 100644 --- a/cli/Valet/Configuration.php +++ b/cli/Valet/Configuration.php @@ -90,6 +90,7 @@ function createExtensionsDirectory() function createLogDirectory() { $this->files->ensureDirExists(VALET_HOME_PATH.'/Log', user()); + $this->files->touch(VALET_HOME_PATH.'/Log/nginx-error.log'); } diff --git a/tests/BrewTest.php b/tests/BrewTest.php index e2fc34f..9f0a6b0 100644 --- a/tests/BrewTest.php +++ b/tests/BrewTest.php @@ -173,7 +173,7 @@ public function test_install_or_fail_can_install_taps() swap(CommandLine::class, $cli); $brew = Mockery::mock(Brew::class.'[tap]', [$cli, new Filesystem]); $brew->shouldReceive('tap')->once()->with(['test/tap']); - $brew->installOrFail('dnsmasq', ['test/tap']); + $brew->installOrFail('dnsmasq', [], ['test/tap']); } diff --git a/tests/CaddyTest.php b/tests/CaddyTest.php deleted file mode 100644 index df12e4b..0000000 --- a/tests/CaddyTest.php +++ /dev/null @@ -1,108 +0,0 @@ -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(); - } -} diff --git a/tests/ConfigurationTest.php b/tests/ConfigurationTest.php index fa59d15..8c77dfd 100644 --- a/tests/ConfigurationTest.php +++ b/tests/ConfigurationTest.php @@ -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->shouldReceive('ensureDirExists')->with(VALET_HOME_PATH.'/Log', user()); - $files->shouldReceive('touch')->twice(); + $files->shouldReceive('touch')->once(); swap(Filesystem::class, $files); resolve(Configuration::class)->createLogDirectory(); } diff --git a/tests/PhpFpmTest.php b/tests/PhpFpmTest.php index f16c728..012964b 100644 --- a/tests/PhpFpmTest.php +++ b/tests/PhpFpmTest.php @@ -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'); $this->assertTrue(strpos($contents, sprintf("\nuser = %s", user())) !== 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); } }