{{ trans('errors.exception.detail', {msg: exception.message ?: trans('errors.http.msg-503')}) }}
- {% if not auth_check() %} - - {% endif %} {% endblock %} diff --git a/resources/views/setup/updates/success.twig b/resources/views/setup/updates/success.twig deleted file mode 100644 index 2dfaeed8..00000000 --- a/resources/views/setup/updates/success.twig +++ /dev/null @@ -1,16 +0,0 @@ -{% extends 'setup.base' %} - -{% block title %}{{ trans('setup.updates.master.title') }}{% endblock %} - -{% block subtitle %}{{ trans('setup.updates.success.title') }}{% endblock %} - -{% block content %} -- {{ trans('setup.updates.success.text', {version: config('app.version')}) }} -
-- - {{ trans('setup.updates.welcome.button') }} - -
-{% endblock %} diff --git a/resources/views/setup/updates/welcome.twig b/resources/views/setup/updates/welcome.twig deleted file mode 100644 index e10fdadb..00000000 --- a/resources/views/setup/updates/welcome.twig +++ /dev/null @@ -1,16 +0,0 @@ -{% extends 'setup.base' %} - -{% block title %}{{ trans('setup.updates.master.title') }}{% endblock %} - -{% block subtitle %}{{ trans('setup.updates.welcome.title') }}{% endblock %} - -{% block content %} -- {{ trans('setup.updates.welcome.text', {version: config('app.version')})|nl2br }} -
- -{% endblock %} diff --git a/routes/web.php b/routes/web.php index 7b11b1b9..91d0175c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -204,9 +204,4 @@ Route::prefix('setup')->group(function () { Route::view('info', 'setup.wizard.info'); Route::post('finish', 'SetupController@finish'); }); - - Route::middleware('authorize')->group(function () { - Route::view('update', 'setup.updates.welcome')->middleware('setup'); - Route::any('exec-update', 'UpdateController@update')->middleware('setup'); - }); }); diff --git a/tests/CommandsTest/UpdateCommandTest.php b/tests/CommandsTest/UpdateCommandTest.php index 49d99405..6ebce5d0 100644 --- a/tests/CommandsTest/UpdateCommandTest.php +++ b/tests/CommandsTest/UpdateCommandTest.php @@ -4,6 +4,8 @@ namespace Tests; use Illuminate\Filesystem\Filesystem; use Illuminate\Foundation\Testing\DatabaseTransactions; +use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\Event; class UpdateCommandTest extends TestCase { @@ -11,25 +13,23 @@ class UpdateCommandTest extends TestCase public function testUpdate() { + Event::fake(); $this->mock(Filesystem::class, function ($mock) { - $mock->shouldReceive('exists') - ->with(storage_path('install.lock')) - ->andReturn(true); - $mock->shouldReceive('put') ->with(storage_path('install.lock'), '') ->once() ->andReturn(true); - - $mock->shouldReceive('files') - ->with(database_path('update_scripts')) - ->once() - ->andReturn([]); }); - config(['app.version' => '100.0.0']); + Cache::partialMock()->shouldReceive('flush')->once(); + option(['version' => '0.0.0']); + config([ + 'app.version' => '0.0.1', + 'translation-loader.translation_loaders' => [], + ]); $this->artisan('update') ->expectsOutput(trans('setup.updates.success.title')); - $this->assertEquals('100.0.0', option('version')); + $this->assertEquals('0.0.1', option('version')); + Event::assertDispatched('__0.0.1'); } } diff --git a/tests/HttpTest/ControllersTest/UpdateControllerTest.php b/tests/HttpTest/ControllersTest/UpdateControllerTest.php index a5cd8613..e8f6a499 100644 --- a/tests/HttpTest/ControllersTest/UpdateControllerTest.php +++ b/tests/HttpTest/ControllersTest/UpdateControllerTest.php @@ -3,11 +3,8 @@ namespace Tests; use App\Services\Unzip; -use Illuminate\Contracts\Console\Kernel as Artisan; -use Illuminate\Filesystem\Filesystem; use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Support\Facades\Http; -use Symfony\Component\Finder\SplFileInfo; class UpdateControllerTest extends TestCase { @@ -71,51 +68,6 @@ class UpdateControllerTest extends TestCase ->assertJson(['code' => 0, 'message' => trans('admin.update.complete')]); } - public function testUpdate() - { - $this->mock(Filesystem::class, function ($mock) { - $mock->shouldReceive('exists') - ->with(storage_path('install.lock')) - ->andReturn(true); - - $mock->shouldReceive('put') - ->with(storage_path('install.lock'), '') - ->once() - ->andReturn(true); - - $mock->shouldReceive('files') - ->with(database_path('update_scripts')) - ->once() - ->andReturn([ - new SplFileInfo('/1.0.0.php', '', ''), - new SplFileInfo('/99.0.0.php', '', ''), - new SplFileInfo('/100.0.0.php', '', ''), - ]); - - $mock->shouldNotReceive('getRequire')->with('/1.0.0.php'); - - $mock->shouldReceive('getRequire') - ->with('/99.0.0.php') - ->once(); - - $mock->shouldReceive('getRequire') - ->with('/100.0.0.php') - ->once(); - }); - $this->spy(Artisan::class, function ($spy) { - $spy->shouldReceive('call') - ->with('migrate', ['--force' => true]) - ->once(); - $spy->shouldReceive('call')->with('view:clear')->once(); - }); - config(['app.version' => '100.0.0']); - - $this->actingAs(factory(\App\Models\User::class)->states('superAdmin')->create()) - ->get('/setup/exec-update') - ->assertViewIs('setup.updates.success'); - $this->assertEquals('100.0.0', option('version')); - } - protected function fakeUpdateInfo(string $version, $extra = []) { return array_merge([ diff --git a/tests/HttpTest/MiddlewareTest/CheckInstallationTest.php b/tests/HttpTest/MiddlewareTest/CheckInstallationTest.php index 88d56f14..eccb76d8 100644 --- a/tests/HttpTest/MiddlewareTest/CheckInstallationTest.php +++ b/tests/HttpTest/MiddlewareTest/CheckInstallationTest.php @@ -19,22 +19,10 @@ class CheckInstallationTest extends TestCase ->with(storage_path('install.lock')) ->twice() ->andReturn(false); - $mock->shouldReceive('exists') - ->with(base_path('.env')) - ->andReturn(true); }); $this->get('/setup')->assertSee(trans( 'setup.wizard.welcome.text', ['version' => config('app.version')] )); - - $this->actingAs(factory(User::class)->states('superAdmin')->make()); - $this->mock(Filesystem::class, function ($mock) { - $mock->shouldReceive('exists') - ->with(storage_path('install.lock')) - ->andReturn(true); - }); - config(['app.version' => '100.0.0']); - $this->get('/setup/update')->assertSee(trans('setup.updates.welcome.title')); } } diff --git a/tests/HttpTest/MiddlewareTest/RedirectToSetupTest.php b/tests/HttpTest/MiddlewareTest/RedirectToSetupTest.php index 45b238a4..5269fb76 100644 --- a/tests/HttpTest/MiddlewareTest/RedirectToSetupTest.php +++ b/tests/HttpTest/MiddlewareTest/RedirectToSetupTest.php @@ -2,9 +2,9 @@ namespace Tests; -use App\Models\User; use Illuminate\Filesystem\Filesystem; use Illuminate\Foundation\Testing\DatabaseTransactions; +use Illuminate\Support\Facades\Artisan; class RedirectToSetupTest extends TestCase { @@ -12,23 +12,16 @@ class RedirectToSetupTest extends TestCase public function testHandle() { - $superAdmin = factory(User::class)->states('superAdmin')->create(); - $current = config('app.version'); config(['app.version' => '100.0.0']); - $this->get('/')->assertStatus(503); - $this->get('/auth/login')->assertViewIs('auth.login'); - $this->actingAs($superAdmin)->get('/')->assertRedirect('/setup/update'); + Artisan::shouldReceive('call')->with('update')->once(); + $this->get('/'); config(['app.version' => $current]); $this->mock(Filesystem::class, function ($mock) { $mock->shouldReceive('exists') ->with(storage_path('install.lock')) ->andReturn(true, false, false); - - $mock->shouldReceive('exists') - ->with(base_path('.env')) - ->andReturn(true); }); $this->get('/')->assertViewIs('home'); $this->get('/setup')->assertViewIs('setup.wizard.welcome');