Skip to content

Commit 1f4f94c

Browse files
Merge pull request #1446 from liberu-genealogy/copilot/fix-dna-triangulation-service-error
Fix PHPUnit 12 test discovery and dna_matchings nullable image column
2 parents a58bca0 + 2668f01 commit 1f4f94c

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

database/migrations/2021_10_09_172842_create_dna_matchings_table.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public function up()
1515
Schema::create('dna_matchings', function (Blueprint $table) {
1616
$table->bigIncrements('id');
1717
$table->foreignId('user_id')->constrained('users');
18-
$table->string('image');
18+
$table->string('image')->nullable();
1919
$table->string('file1');
2020
$table->string('file2');
2121
$table->string('total_shared_cm')->nullable();

tests/Feature/ModuleSystemTest.php

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,20 @@ protected function setUp(): void
1818
$this->moduleManager = app(ModuleManager::class);
1919
}
2020

21-
/** @test */
22-
public function it_can_list_all_modules()
21+
public function test_it_can_list_all_modules(): void
2322
{
2423
$modules = $this->moduleManager->all();
2524
$this->assertNotEmpty($modules);
2625
}
2726

28-
/** @test */
29-
public function it_can_get_module_by_name()
27+
public function test_it_can_get_module_by_name(): void
3028
{
3129
$module = $this->moduleManager->get('Core');
3230
$this->assertNotNull($module);
3331
$this->assertEquals('Core', $module->getName());
3432
}
3533

36-
/** @test */
37-
public function it_can_enable_and_disable_modules()
34+
public function test_it_can_enable_and_disable_modules(): void
3835
{
3936
// First enable Core since other modules depend on it
4037
$coreModule = $this->moduleManager->get('Core');
@@ -57,8 +54,7 @@ public function it_can_enable_and_disable_modules()
5754
$this->assertFalse($module->isEnabled());
5855
}
5956

60-
/** @test */
61-
public function it_can_get_module_info()
57+
public function test_it_can_get_module_info(): void
6258
{
6359
$info = $this->moduleManager->getModuleInfo('Core');
6460

@@ -68,8 +64,7 @@ public function it_can_get_module_info()
6864
$this->assertEquals('Core', $info['name']);
6965
}
7066

71-
/** @test */
72-
public function it_returns_false_for_non_existent_modules()
67+
public function test_it_returns_false_for_non_existent_modules(): void
7368
{
7469
$result = $this->moduleManager->enable('NonExistentModule');
7570
$this->assertFalse($result);

0 commit comments

Comments
 (0)