Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 3 insertions, 11 deletions

diff --git a/spec/support/helpers/snowplow_helpers.rb b/spec/support/helpers/snowplow_helpers.rb
index 3bde01c6fbf..15eac1b24fc 100644
--- a/spec/support/helpers/snowplow_helpers.rb
+++ b/spec/support/helpers/snowplow_helpers.rb
@@ -32,16 +32,8 @@ module SnowplowHelpers
   #     end
   #   end
   def expect_snowplow_event(category:, action:, **kwargs)
-    # This check will no longer be needed with Ruby 2.7 which
-    # would not pass any arguments when using **kwargs.
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/263430
-    if kwargs.present?
-      expect(Gitlab::Tracking).to have_received(:event)
-        .with(category, action, **kwargs).at_least(:once)
-    else
-      expect(Gitlab::Tracking).to have_received(:event)
-        .with(category, action).at_least(:once)
-    end
+    expect(Gitlab::Tracking).to have_received(:event) # rubocop:disable RSpec/ExpectGitlabTracking
+      .with(category, action, **kwargs).at_least(:once)
   end
 
   # Asserts that no call to `Gitlab::Tracking#event` was made.
@@ -56,6 +48,6 @@ module SnowplowHelpers
   #     end
   #   end
   def expect_no_snowplow_event
-    expect(Gitlab::Tracking).not_to have_received(:event)
+    expect(Gitlab::Tracking).not_to have_received(:event) # rubocop:disable RSpec/ExpectGitlabTracking
   end
 end