From f4b569f2fd8dc82376e2f525441c1e5ac752ee83 Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@alt-three.com>
Date: Mon, 14 Sep 2015 09:13:42 +0100
Subject: [PATCH] Updated tests

---
 tests/Events/AbstractEventTestCase.php      | 16 +++++++++++++---
 tests/Events/User/UserWasAddedEventTest.php |  5 +++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/tests/Events/AbstractEventTestCase.php b/tests/Events/AbstractEventTestCase.php
index 3dd75ce0..513157e7 100644
--- a/tests/Events/AbstractEventTestCase.php
+++ b/tests/Events/AbstractEventTestCase.php
@@ -27,6 +27,11 @@ abstract class AbstractEventTestCase extends AbstractAnemicTestCase
         return false;
     }
 
+    protected function objectHasHandlers()
+    {
+        return true;
+    }
+
     public function testEventImplementsTheCorrectInterfaces()
     {
         $event = $this->getObjectAndParams()['object'];
@@ -36,7 +41,7 @@ abstract class AbstractEventTestCase extends AbstractAnemicTestCase
         }
     }
 
-    /*public function testEventHasRegisteredHandlers()
+    public function testEventHasRegisteredHandlers()
     {
         $property = (new ReflectionClass(EventServiceProvider::class))->getProperty('listen');
         $property->setAccessible(true);
@@ -45,10 +50,15 @@ abstract class AbstractEventTestCase extends AbstractAnemicTestCase
         $mappings = $property->getValue(new EventServiceProvider($this->app));
 
         $this->assertTrue(isset($mappings[$class]));
-        $this->assertGreaterThan(0, count($mappings[$class]));
+
+        if ($this->objectHasHandlers()) {
+            $this->assertGreaterThan(0, count($mappings[$class]));
+        } else {
+            $this->assertSame(0, count($mappings[$class]));
+        }
 
         foreach ($mappings[$class] as $handler) {
             $this->assertInstanceOf($handler, $this->app->make($handler));
         }
-    }*/
+    }
 }
diff --git a/tests/Events/User/UserWasAddedEventTest.php b/tests/Events/User/UserWasAddedEventTest.php
index 124e1d1d..50ce6561 100644
--- a/tests/Events/User/UserWasAddedEventTest.php
+++ b/tests/Events/User/UserWasAddedEventTest.php
@@ -16,6 +16,11 @@ use CachetHQ\Cachet\Models\User;
 
 class UserWasAddedEventTest extends AbstractUserEventTestCase
 {
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
     protected function getObjectAndParams()
     {
         $params = ['user' => new User()];