Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 0 deletions

diff --git a/spec/lib/gitlab/email/receiver_spec.rb b/spec/lib/gitlab/email/receiver_spec.rb
index c9fde06cbae..6b5a355e598 100644
--- a/spec/lib/gitlab/email/receiver_spec.rb
+++ b/spec/lib/gitlab/email/receiver_spec.rb
@@ -14,6 +14,7 @@ describe Gitlab::Email::Receiver do
 
       allow(handler).to receive(:execute)
       allow(handler).to receive(:metrics_params)
+      allow(handler).to receive(:metrics_event)
     end
 
     it "finds the mail key" do
@@ -46,4 +47,12 @@ describe Gitlab::Email::Receiver do
       expect { receiver.execute }.to raise_error(Gitlab::Email::AutoGeneratedEmailError)
     end
   end
+
+  it "requires all handlers to have a unique metric_event" do
+    events = Gitlab::Email::Handler.handlers.map do |handler|
+      handler.new(Mail::Message.new, 'gitlabhq/gitlabhq+auth_token').metrics_event
+    end
+
+    expect(events.uniq.count).to eq events.count
+  end
 end