From b3e4ec8e8adf4fe96c982124e91b6a05021a9cda Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 23 Oct 2019 09:06:03 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 spec/lib/gitlab/tracking_spec.rb | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'spec/lib/gitlab/tracking_spec.rb')

diff --git a/spec/lib/gitlab/tracking_spec.rb b/spec/lib/gitlab/tracking_spec.rb
index 50488dba48c..4615599be7e 100644
--- a/spec/lib/gitlab/tracking_spec.rb
+++ b/spec/lib/gitlab/tracking_spec.rb
@@ -13,14 +13,17 @@ describe Gitlab::Tracking do
 
   describe '.snowplow_options' do
     it 'returns useful client options' do
-      expect(described_class.snowplow_options(nil)).to eq(
+      expected_fields = {
         namespace: 'gl',
         hostname: 'gitfoo.com',
         cookieDomain: '.gitfoo.com',
         appId: '_abc123_',
         formTracking: true,
-        linkClickTracking: true
-      )
+        linkClickTracking: true,
+        userId: nil
+      }
+
+      expect(subject.snowplow_options(nil, nil)).to match(expected_fields)
     end
 
     it 'enables features using feature flags' do
@@ -29,11 +32,12 @@ describe Gitlab::Tracking do
         :additional_snowplow_tracking,
         '_group_'
       ).and_return(false)
-
-      expect(described_class.snowplow_options('_group_')).to include(
+      addition_feature_fields = {
         formTracking: false,
         linkClickTracking: false
-      )
+      }
+
+      expect(subject.snowplow_options('_group_', nil)).to include(addition_feature_fields)
     end
   end
 
-- 
cgit v1.2.3