From aa9decf6fd23615ae543cd10506f08dfd7d5a8f8 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Mon, 5 Sep 2016 15:15:26 +0800
Subject: [PATCH] Remove `DiscourseEvent.clear`.

---
 lib/discourse_event.rb                   | 4 ----
 spec/components/discourse_event_spec.rb  | 8 --------
 spec/components/discourse_plugin_spec.rb | 8 ++++----
 spec/components/plugin/instance_spec.rb  | 2 +-
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/lib/discourse_event.rb b/lib/discourse_event.rb
index 2c1110a63..cc6a1f65d 100644
--- a/lib/discourse_event.rb
+++ b/lib/discourse_event.rb
@@ -21,8 +21,4 @@ module DiscourseEvent
     events[event_name].delete(block)
   end
 
-  def self.clear
-    @events = nil
-  end
-
 end
diff --git a/spec/components/discourse_event_spec.rb b/spec/components/discourse_event_spec.rb
index 2a262822a..0792d828a 100644
--- a/spec/components/discourse_event_spec.rb
+++ b/spec/components/discourse_event_spec.rb
@@ -16,14 +16,6 @@ describe DiscourseEvent do
     end
   end
 
-  describe ".clear" do
-    it "clears out events" do
-      DiscourseEvent.events["event42"] << "test event"
-      DiscourseEvent.clear
-      expect(DiscourseEvent.events).to be_empty
-    end
-  end
-
   context 'when calling events' do
 
     let(:harvey) {
diff --git a/spec/components/discourse_plugin_spec.rb b/spec/components/discourse_plugin_spec.rb
index 699447d74..3cd2a9d06 100644
--- a/spec/components/discourse_plugin_spec.rb
+++ b/spec/components/discourse_plugin_spec.rb
@@ -14,10 +14,6 @@ describe DiscoursePlugin do
   let(:registry) { mock }
   let(:plugin) { TestPlugin.new(registry) }
 
-  after do
-    DiscourseEvent.clear
-  end
-
   describe ".mixins" do
     it "finds its mixins" do
       expect(TestPlugin.mixins).to eq([TestPlugin::TestMixin])
@@ -45,6 +41,10 @@ describe DiscoursePlugin do
       plugin.listen_for(:hello)
     end
 
+    after do
+      DiscourseEvent.off(:hello)
+    end
+
     it "calls the method when it is triggered" do
       plugin.expects(:hello).with('there')
       DiscourseEvent.trigger(:hello, 'there')
diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb
index bc38f465e..a6d850ba1 100644
--- a/spec/components/plugin/instance_spec.rb
+++ b/spec/components/plugin/instance_spec.rb
@@ -56,7 +56,7 @@ describe Plugin::Instance do
       end
 
       after do
-        DiscourseEvent.clear
+        DiscourseEvent.off(:hello)
       end
 
       it "checks enabled/disabled functionality for extensions" do