improve test

Author: deer-wmde

app/Metrics/App/WikiMetrics.php

@@ -75,7 +75,7 @@ protected function getNumberOfActions(string $interval): null|int
                 ]
         )) { return null; }
 
-        $wikiDb = Wiki::with('wikiDb')->where('id', $this->wiki->id)->first()->wikiDb;
+        $wikiDb = Wiki::withTrashed()->with('wikiDb')->where('id', $this->wiki->id)->first()->wikiDb;
         $tableRecentChanges = $wikiDb->name . '.' . $wikiDb->prefix . '_recentchanges';
         $tableActor = $wikiDb->name . '.' . $wikiDb->prefix . '_actor';
 

tests/Metrics/WikiMetricsTest.php

@@ -4,7 +4,9 @@
 
 use App\Metrics\App\WikiMetrics;
 use App\Wiki;
+use App\WikiDb;
 use App\WikiDailyMetrics;
+use App\Jobs\ProvisionWikiDbJob;
 use Carbon\Carbon;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
@@ -13,25 +15,39 @@ class WikiMetricsTest extends TestCase
 {
     use RefreshDatabase;
 
+    public function setUp(): void      {
+        parent::setUp();
+        $manager = $this->app->make('db');
+        $job = new ProvisionWikiDbJob();
+        $job->handle($manager);
+    }
 
     public function testSuccessfullyAddRecords()
     {
         $wiki = Wiki::factory()->create([
             'domain' => 'thisfake.wikibase.cloud'
         ]);
 
+        $wikiDb = WikiDb::first();
+        $wikiDb->update( ['wiki_id' => $wiki->id] );
+
         (new WikiMetrics())->saveMetrics($wiki);
         // Assert the metric is updated in the database
         $this->assertDatabaseHas('wiki_daily_metrics', [
             'date' => now()->toDateString()
         ]);
     }
 
+
     public function testDoesNotAddDuplicateRecordsWithOnlyDateChange()
     {
         $wiki = Wiki::factory()->create([
             'domain' => 'thisfake.wikibase.cloud'
         ]);
+
+        $wikiDb = WikiDb::first();
+        $wikiDb->update( ['wiki_id' => $wiki->id] );
+
         //Insert an old metric value for a wiki
         WikiDailyMetrics::create([
             'id' => $wiki->id. '_'. Carbon::yesterday()->toDateString(),
@@ -54,6 +70,10 @@ public function testAddRecordsWikiIsDeleted()
         $wiki = Wiki::factory()->create([
             'domain' => 'thisfake.wikibase.cloud'
         ]);
+
+        $wikiDb = WikiDb::first();
+        $wikiDb->update( ['wiki_id' => $wiki->id] );
+
         //Insert an old metric value for a wiki
         WikiDailyMetrics::create([
             'id' => $wiki->id. '_'. Carbon::yesterday()->toDateString(),