Skip to content

Fix installer tests and database connection check logic #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juzaweb merged 2 commits into from
Feb 8, 2026
Merged

Fix installer tests and database connection check logic #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d9f178
Fix installer tests and database connection check logic
google-labs-jules[bot] Feb 8, 2026
22081a4
Fix CI workflow dependency installation
google-labs-jules[bot] Feb 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:

- name: Install dependencies
run: |
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --dev --no-interaction --no-update
composer update --${{ matrix.stability }} --prefer-dist --no-interaction

- name: List Installed Dependencies
Expand Down
29 changes: 14 additions & 15 deletions src/Http/Controllers/EnvironmentController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,26 +67,25 @@ private function checkDatabaseConnection(Request $request)

$settings = config("database.connections.{$connection}");

if (!is_array($settings)) {
$settings = [];
}

config([
'database' => [
'default' => $connection,
'connections' => [
$connection => array_merge($settings, [
'driver' => $connection,
'host' => $request->input('database_hostname'),
'port' => $request->input('database_port'),
'database' => $request->input('database_name'),
'username' => $request->input('database_username'),
'password' => $request->input('database_password'),
]),
],
],
"database.connections.{$connection}" => array_merge($settings, [
'driver' => $connection,
'host' => $request->input('database_hostname'),
'port' => $request->input('database_port'),
'database' => $request->input('database_name'),
'username' => $request->input('database_username'),
'password' => $request->input('database_password'),
]),
]);

DB::purge();
DB::purge($connection);

try {
DB::connection()->getPdo();
DB::connection($connection)->getPdo();

return true;
} catch (Exception $e) {
Expand Down
5 changes: 5 additions & 0 deletions tests/Feature/EnvironmentPostTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@

class EnvironmentPostTest extends TestCase
{
protected function defineDatabaseMigrations(): void
{
// Do nothing to prevent migrations from running
}

/** @test */
public function it_validates_required_database_fields(): void
{
Expand Down
17 changes: 17 additions & 0 deletions tests/TestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,27 @@ protected function setUp(): void
protected function getPackageProviders($app): array
{
return [
\Juzaweb\Modules\Core\Providers\CoreServiceProvider::class,
\Juzaweb\QueryCache\QueryCacheServiceProvider::class,
InstallerServiceProvider::class,
];
}

protected function getPackageAliases($app): array
{
return [
'Field' => \Juzaweb\Modules\Core\Facades\Field::class,
'Module' => \Juzaweb\Modules\Core\Facades\Module::class,
'Theme' => \Juzaweb\Modules\Core\Facades\Theme::class,
'Widget' => \Juzaweb\Modules\Core\Facades\Widget::class,
'Sidebar' => \Juzaweb\Modules\Core\Facades\Sidebar::class,
'PageTemplate' => \Juzaweb\Modules\Core\Facades\PageTemplate::class,
'PageBlock' => \Juzaweb\Modules\Core\Facades\PageBlock::class,
'Chart' => \Juzaweb\Modules\Core\Facades\Chart::class,
'Breadcrumb' => \Juzaweb\Modules\Core\Facades\Breadcrumb::class,
];
}

/**
* Define environment setup.
*
Expand Down