diff --git a/tests/Functional/AuditingTest.php b/tests/Functional/AuditingTest.php index c73898e1..d75f7ba8 100644 --- a/tests/Functional/AuditingTest.php +++ b/tests/Functional/AuditingTest.php @@ -124,6 +124,8 @@ public function itWillAuditTheRetrievedEvent() $audit = Audit::first(); + $this->assertNotNull($audit); + $this->assertEmpty($audit->old_values); $this->assertEmpty($audit->new_values); @@ -147,6 +149,8 @@ public function itWillAuditTheCreatedEvent() $audit = Audit::first(); + $this->assertNotNull($audit); + $this->assertEmpty($audit->old_values); Assert::assertArraySubset([ @@ -184,6 +188,8 @@ public function itWillAuditTheUpdatedEvent() $audit = Audit::first(); + $this->assertNotNull($audit); + Assert::assertArraySubset([ 'content' => 'N/A', 'published_at' => null, @@ -217,6 +223,8 @@ public function itWillAuditTheDeletedEvent() $audit = Audit::first(); + $this->assertNotNull($audit); + Assert::assertArraySubset([ 'title' => 'How To Audit Eloquent Models', 'content' => 'N/A', @@ -249,6 +257,8 @@ public function itWillAuditTheRestoredEvent() $audit = Audit::first(); + $this->assertNotNull($audit); + $this->assertEmpty($audit->old_values); Assert::assertArraySubset([ @@ -349,6 +359,8 @@ public function itWillAuditUsingTheDefaultDriver() $audit = Audit::first(); + $this->assertNotNull($audit); + $this->assertEmpty($audit->old_values); Assert::assertArraySubset([ @@ -444,8 +456,10 @@ public function itHandlesJsonColumnsCorrectly() $article->config = ['articleIsGood' => false, 'authorsJob' => 'vampire']; $article->save(); - /** @var Audit $audit */ $audit = $article->audits()->skip(1)->first(); + + $this->assertNotNull($audit); + $this->assertSame(false, $audit->getModified()['config']['new']['articleIsGood']); $this->assertSame(true, $audit->getModified()['config']['old']['articleIsGood']); } @@ -464,6 +478,9 @@ public function canAddAdditionalResolver() $this->assertTrue(true); $audit = $article->audits()->first(); + + $this->assertNotNull($audit); + $this->assertSame(1, (int) $audit->tenant_id); } @@ -480,6 +497,9 @@ public function canDisableResolver() $article = Article::factory()->create(); $audit = $article->audits()->first(); + + $this->assertNotNull($audit); + $this->assertEmpty($audit->ip_address); } diff --git a/tests/Unit/AuditTest.php b/tests/Unit/AuditTest.php index ba7c0303..31b1918c 100644 --- a/tests/Unit/AuditTest.php +++ b/tests/Unit/AuditTest.php @@ -32,8 +32,10 @@ public function itResolvesAuditData() 'published_at' => $now, ]); - /** @var Audit $audit */ $audit = $article->audits()->first(); + + $this->assertNotNull($audit); + $resolvedData = $audit->resolveData(); $this->assertCount(15, $resolvedData); @@ -83,6 +85,8 @@ public function itResolvesAuditDataIncludingUserAttributes() $audit = $article->audits()->first(); + $this->assertNotNull($audit); + $this->assertCount(21, $resolvedData = $audit->resolveData()); Assert::assertArraySubset([ @@ -132,6 +136,8 @@ public function itReturnsTheAppropriateAuditableDataValues() 'published_at' => Carbon::now(), ])->audits()->first(); + $this->assertNotNull($audit); + // Resolve data, making it available to the getDataValue() method $this->assertCount(21, $audit->resolveData()); @@ -198,6 +204,8 @@ public function itReturnsAuditMetadataAsArray() { $audit = Article::factory()->create()->audits()->first(); + $this->assertNotNull($audit); + $this->assertCount(10, $metadata = $audit->getMetadata()); Assert::assertArraySubset([ @@ -225,6 +233,8 @@ public function itReturnsProperCommandLineInUrlAuditMetadata() { $audit = factory(Article::class)->create()->audits()->first(); + $this->assertNotNull($audit); + self::Assert()::assertEquals($audit->getMetadata()['audit_url'], 'vendor/bin/phpunit tests/Unit/AuditTest.php --group command-line-url-resolver'); } @@ -244,9 +254,10 @@ public function itReturnsAuditMetadataIncludingUserAttributesAsArray() $this->actingAs($user); - /** @var Audit $audit */ $audit = Article::factory()->create()->audits()->first(); + $this->assertNotNull($audit); + $this->assertCount(16, $metadata = $audit->getMetadata()); Assert::assertArraySubset([ @@ -278,6 +289,8 @@ public function itReturnsAuditMetadataAsJsonString() { $audit = Article::factory()->create()->audits()->first(); + $this->assertNotNull($audit); + $metadata = $audit->getMetadata(true, JSON_PRETTY_PRINT); $created_at = $audit->getSerializedDate($audit->created_at); @@ -316,6 +329,8 @@ public function itReturnsAuditMetadataIncludingUserAttributesAsJsonString() $audit = Article::factory()->create()->audits()->first(); + $this->assertNotNull($audit); + $metadata = $audit->getMetadata(true, JSON_PRETTY_PRINT); $created_at = $audit->getSerializedDate($audit->created_at); @@ -360,6 +375,8 @@ public function itReturnsAuditableModifiedAttributesAsArray() 'published_at' => $now, ])->audits()->first(); + $this->assertNotNull($audit); + $this->assertCount(5, $modified = $audit->getModified()); Assert::assertArraySubset([ @@ -390,7 +407,6 @@ public function itReturnsAuditableModifiedAttributesAsJsonString() { $now = Carbon::now()->second(0)->microsecond(0); - /** @var Audit $audit */ $audit = Article::factory()->create([ 'title' => 'How To Audit Eloquent Models', 'content' => 'First step: install the laravel-auditing package.', @@ -398,6 +414,8 @@ public function itReturnsAuditableModifiedAttributesAsJsonString() 'published_at' => $now, ])->audits()->first(); + $this->assertNotNull($audit); + $modified = $audit->getModified(true, JSON_PRETTY_PRINT); $serializedDate = $audit->getSerializedDate($now); diff --git a/tests/Unit/AuditableTest.php b/tests/Unit/AuditableTest.php index a11f55f7..b8695c26 100644 --- a/tests/Unit/AuditableTest.php +++ b/tests/Unit/AuditableTest.php @@ -762,8 +762,10 @@ public function itExcludesAttributesFromExclude() $model->reviewed = 1; $model->save(); - /** @var Audit $audit */ $audit = Audit::all()->first(); + + $this->assertNotNull($audit); + $this->assertArrayNotHasKey('title', $audit->getModified()); } @@ -1051,6 +1053,9 @@ public function itFailsToTransitionWhenTheAuditAuditableIdDoesNotMatchTheModelId $firstModel = Article::factory()->create(); $firstAudit = $firstModel->audits()->first(); + + $this->assertNotNull($firstAudit); + $firstAudit->auditable_id = $firstModel->id; $secondModel = Article::factory()->create();