diff options
Diffstat (limited to 'tests/app')
3 files changed, 14 insertions, 13 deletions
diff --git a/tests/app/Http/Controllers/Admin/FixLevel0MediaControllerTest.php b/tests/app/Http/Controllers/Admin/FixLevel0MediaControllerTest.php index 78735e1e32..27bff403ff 100644 --- a/tests/app/Http/Controllers/Admin/FixLevel0MediaControllerTest.php +++ b/tests/app/Http/Controllers/Admin/FixLevel0MediaControllerTest.php @@ -17,6 +17,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\Controllers\Admin; +use Fisharebest\Webtrees\Services\DatatablesService; use Fisharebest\Webtrees\Tree; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -46,7 +47,7 @@ class FixLevel0MediaControllerTest extends \Fisharebest\Webtrees\TestCase */ public function testFixLevel0MediaAction(): void { - $tree = Tree::create('name', 'title'); + $tree = Tree::create('name', 'title'); $request = new Request(['tree_id' => $tree->id()]); $controller = new FixLevel0MediaController(); @@ -60,11 +61,12 @@ class FixLevel0MediaControllerTest extends \Fisharebest\Webtrees\TestCase */ public function testFixLevel0MediaData(): void { - $tree = Tree::create('name', 'title'); - $controller = new FixLevel0MediaController(); - // Can't test this yet - the query uses MySQL-specific functions - //$response = $controller->fixLevel0MediaData(); + $datatables_service = new DatatablesService(); + $tree = Tree::create('name', 'title'); + $request = new Request(['tree_id' => $tree->id()]); + $controller = new FixLevel0MediaController(); + $response = $controller->fixLevel0MediaData($request, $datatables_service); - //$this->assertSame(Response::HTTP_OK, $response->getStatusCode()); + $this->assertSame(Response::HTTP_OK, $response->getStatusCode()); } } diff --git a/tests/app/Http/Controllers/Admin/ImportThumbnailsControllerTest.php b/tests/app/Http/Controllers/Admin/ImportThumbnailsControllerTest.php index 137698da29..864099f1ae 100644 --- a/tests/app/Http/Controllers/Admin/ImportThumbnailsControllerTest.php +++ b/tests/app/Http/Controllers/Admin/ImportThumbnailsControllerTest.php @@ -56,10 +56,9 @@ class ImportThumbnailsControllerTest extends \Fisharebest\Webtrees\TestCase */ public function testWebtrees1ThumbnailsData(): void { - // This function still uses MySQL-specific code. - //$controller = new ImportThumbnailsController(); - //$response = $controller->webtrees1ThumbnailsData(new Request()); + $controller = new ImportThumbnailsController(); + $response = $controller->webtrees1ThumbnailsData(new Request()); - //$this->assertSame(Response::HTTP_OK, $response->getStatusCode()); + $this->assertSame(Response::HTTP_OK, $response->getStatusCode()); } } diff --git a/tests/app/Services/ModuleServiceTest.php b/tests/app/Services/ModuleServiceTest.php index 29c55c17f5..bbc99d90a1 100644 --- a/tests/app/Services/ModuleServiceTest.php +++ b/tests/app/Services/ModuleServiceTest.php @@ -107,17 +107,17 @@ class ModuleServiceTest extends TestCase } /** - * @covers \Fisharebest\Webtrees\Services\ModuleService::configOnlyModules + * @covers \Fisharebest\Webtrees\Services\ModuleService::otherModules * @return void */ - public function testOtherOnlyModules(): void + public function testOtherModules(): void { app()->instance(Tree::class, Tree::create('name', 'title')); DB::table('module')->insert(['module_name' => 'not-a-module']); $module_service = new ModuleService(); - $this->assertSame(4, $module_service->otherModules()->count()); + $this->assertSame(5, $module_service->otherModules()->count()); } /** |