Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 0 deletions

diff --git a/spec/lib/api/helpers_spec.rb b/spec/lib/api/helpers_spec.rb
index 0624c25e734..81c4563feb6 100644
--- a/spec/lib/api/helpers_spec.rb
+++ b/spec/lib/api/helpers_spec.rb
@@ -174,4 +174,18 @@ describe API::Helpers do
       end
     end
   end
+
+  describe '#track_event' do
+    it "creates a gitlab tracking event" do
+      expect(Gitlab::Tracking).to receive(:event).with('foo', 'my_event', {})
+
+      subject.track_event('my_event', category: 'foo')
+    end
+
+    it "logs an exception" do
+      expect(Rails.logger).to receive(:warn).with(/Tracking event failed/)
+
+      subject.track_event('my_event', category: nil)
+    end
+  end
 end