Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Skip database page if config ok (fixes #25)

Browse Source
This commit is contained in:
Pig Fang 2019-03-17 12:05:31 +08:00
parent 36f2e86a42
commit 34441f587e
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/SetupController.php
View File

@ -18,6 +18,15 @@ class SetupController extends Controller
{ {
public function database(Request $request) public function database(Request $request)
{ {
if ($request->isMethod('get')) {
try {
DB::getPdo();
return redirect('setup/info');
} catch (\Exception $e) {
return view('setup.wizard.database');
}
}
config([ config([
'database.connections.temp.driver' => $request->input('type'), 'database.connections.temp.driver' => $request->input('type'),
'database.connections.temp.host' => $request->input('host'), 'database.connections.temp.host' => $request->input('host'),
@ -273,7 +282,7 @@ class SetupController extends Controller
} }
if (count($existingTables) == count($tables)) { if (count($existingTables) == count($tables)) {
return true; return $returnExistingTables ? $existingTables : true;
} else { } else {
return $returnExistingTables ? $existingTables : false; return $returnExistingTables ? $existingTables : false;
} }

3
routes/setup.php
View File

@ -17,8 +17,7 @@
Route::group(['prefix' => 'setup'], function () { Route::group(['prefix' => 'setup'], function () {
Route::group(['middleware' => 'setup'], function () { Route::group(['middleware' => 'setup'], function () {
Route::view('/', 'setup.wizard.welcome'); Route::view('/', 'setup.wizard.welcome');
Route::view('/database', 'setup.wizard.database'); Route::any('/database', 'SetupController@database');
Route::post('/database', 'SetupController@database');
Route::get('/info', 'SetupController@info'); Route::get('/info', 'SetupController@info');
Route::post('/finish', 'SetupController@finish'); Route::post('/finish', 'SetupController@finish');
}); });

6
tests/SetupControllerTest.php
View File

@ -2,6 +2,7 @@
namespace Tests; namespace Tests;
use DB;
use Mockery; use Mockery;
use Exception; use Exception;
use CreateAllTables; use CreateAllTables;
@ -61,6 +62,11 @@ class SetupControllerTest extends TestCase
File::shouldReceive('get')->with('..'.DIRECTORY_SEPARATOR.'.env')->andReturn(''); File::shouldReceive('get')->with('..'.DIRECTORY_SEPARATOR.'.env')->andReturn('');
File::shouldReceive('put')->with('..'.DIRECTORY_SEPARATOR.'.env', ''); File::shouldReceive('put')->with('..'.DIRECTORY_SEPARATOR.'.env', '');
$this->post('/setup/database', $fake)->assertRedirect('/setup/info'); $this->post('/setup/database', $fake)->assertRedirect('/setup/info');
$this->get('/setup/database')->assertRedirect('/setup/info');
DB::shouldReceive('getPdo')->andThrow(new Exception());
DB::shouldReceive('disconnect')->andReturn(true);
$this->get('/setup/database')->assertViewIs('setup.wizard.database');
} }
public function testReportDatabaseConnectionError() public function testReportDatabaseConnectionError()