diff --git a/src/Auditable.php b/src/Auditable.php index 873fa127..15de2308 100644 --- a/src/Auditable.php +++ b/src/Auditable.php @@ -63,7 +63,7 @@ trait Auditable */ public static function bootAuditable() { - if (!self::$auditingDisabled && static::isAuditingEnabled()) { + if (static::isAuditingEnabled()) { static::observe(new AuditableObserver()); } } diff --git a/tests/Functional/AuditingTest.php b/tests/Functional/AuditingTest.php index f96e06d2..607c3aac 100644 --- a/tests/Functional/AuditingTest.php +++ b/tests/Functional/AuditingTest.php @@ -407,6 +407,31 @@ public function itDisablesAndEnablesAuditingBackAgain() $this->assertSame(3, Article::count()); } + /** + * @test + */ + public function itDisablesAndEnablesAuditingBackAgainViaFacade() + { + // Auditing is enabled by default + $this->assertFalse(Article::$auditingDisabled); + + Article::disableAuditing(); + + factory(Article::class)->create(); + + $this->assertSame(1, Article::count()); + $this->assertSame(0, Audit::count()); + + // Enable Auditing + Article::enableAuditing(); + $this->assertFalse(Article::$auditingDisabled); + + factory(Article::class)->create(); + + $this->assertSame(2, Article::count()); + $this->assertSame(1, Audit::count()); + } + /** * @test * @return void diff --git a/tests/Unit/AuditableTest.php b/tests/Unit/AuditableTest.php index 1b5f77d2..2488d942 100644 --- a/tests/Unit/AuditableTest.php +++ b/tests/Unit/AuditableTest.php @@ -75,15 +75,16 @@ public function itWillAlwaysAuditModelsWhenNotRunningFromTheConsole() * @group Auditable::bootAuditable * @test */ - public function itWillNotBootTraitWhenStaticFlagIsSet() + public function itWillBootTraitWhenStaticFlagIsSet() { App::spy(); Article::$auditingDisabled = true; - new Article(); + $article = new Article(); - App::shouldNotHaveReceived('runningInConsole'); + $this->assertFalse($article->readyForAuditing()); + App::shouldReceive('runningInConsole'); Article::$auditingDisabled = false; }