Add latest changes from gitlab-org/gitlab@master

2 files changed, 16 insertions, 0 deletions

diff --git a/spec/lib/gitlab/sidekiq_config_spec.rb b/spec/lib/gitlab/sidekiq_config_spec.rb
index 00b1666106f..5885151ecb5 100644
--- a/spec/lib/gitlab/sidekiq_config_spec.rb
+++ b/spec/lib/gitlab/sidekiq_config_spec.rb
@@ -18,6 +18,14 @@ RSpec.describe Gitlab::SidekiqConfig do
   end
 
   describe '.cron_jobs' do
+    around do |example|
+      described_class.clear_memoization(:cron_jobs)
+
+      example.run
+
+      described_class.clear_memoization(:cron_jobs)
+    end
+
     it 'renames job_class to class and removes incomplete jobs' do
       expect(Gitlab)
         .to receive(:config)
diff --git a/spec/lib/gitlab/usage_data_counters/work_item_activity_unique_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/work_item_activity_unique_counter_spec.rb
index aaf509b6f81..0ab5dec8ecf 100644
--- a/spec/lib/gitlab/usage_data_counters/work_item_activity_unique_counter_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/work_item_activity_unique_counter_spec.rb
@@ -44,4 +44,12 @@ RSpec.describe Gitlab::UsageDataCounters::WorkItemActivityUniqueCounter, :clean_
 
     it_behaves_like 'work item unique counter'
   end
+
+  describe '.track_work_item_todo_marked_action' do
+    subject(:track_event) { described_class.track_work_item_mark_todo_action(author: user) }
+
+    let(:event_name) { described_class::WORK_ITEM_TODO_MARKED }
+
+    it_behaves_like 'work item unique counter'
+  end
 end