Add latest changes from gitlab-org/gitlab@master

3 files changed, 2 insertions, 4 deletions

diff --git a/spec/workers/every_sidekiq_worker_spec.rb b/spec/workers/every_sidekiq_worker_spec.rb
index 8a0e05e6fb6..07a51e92c98 100644
--- a/spec/workers/every_sidekiq_worker_spec.rb
+++ b/spec/workers/every_sidekiq_worker_spec.rb
@@ -408,6 +408,7 @@ RSpec.describe 'Every Sidekiq worker', feature_category: :shared do
         'PostReceive' => 3,
         'ProcessCommitWorker' => 3,
         'ProductAnalytics::InitializeAnalyticsWorker' => 3,
+        'ProductAnalytics::InitializeSnowplowProductAnalyticsWorker' => 1,
         'ProjectCacheWorker' => 3,
         'ProjectDestroyWorker' => 3,
         'ProjectExportWorker' => false,
diff --git a/spec/workers/update_highest_role_worker_spec.rb b/spec/workers/update_highest_role_worker_spec.rb
index 3e4a2f6be36..d0a7a1e3a40 100644
--- a/spec/workers/update_highest_role_worker_spec.rb
+++ b/spec/workers/update_highest_role_worker_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe UpdateHighestRoleWorker, :clean_gitlab_redis_shared_state, featur
       let(:active_attributes) do
         {
           state: 'active',
-          user_type: nil
+          user_type: :human
         }
       end
 
diff --git a/spec/workers/users/deactivate_dormant_users_worker_spec.rb b/spec/workers/users/deactivate_dormant_users_worker_spec.rb
index fdcbb624562..39d282a6e18 100644
--- a/spec/workers/users/deactivate_dormant_users_worker_spec.rb
+++ b/spec/workers/users/deactivate_dormant_users_worker_spec.rb
@@ -35,7 +35,6 @@ RSpec.describe Users::DeactivateDormantUsersWorker, feature_category: :seat_cost
 
       where(:user_type, :expected_state) do
         :human             | 'deactivated'
-        :human_deprecated  | 'deactivated'
         :support_bot       | 'active'
         :alert_bot         | 'active'
         :visual_review_bot | 'active'
@@ -58,13 +57,11 @@ RSpec.describe Users::DeactivateDormantUsersWorker, feature_category: :seat_cost
 
       it 'does not deactivate non-active users' do
         human_user = create(:user, user_type: :human, state: :blocked, last_activity_on: Gitlab::CurrentSettings.deactivate_dormant_users_period.days.ago.to_date)
-        human_user2 = create(:user, user_type: :human_deprecated, state: :blocked, last_activity_on: Gitlab::CurrentSettings.deactivate_dormant_users_period.days.ago.to_date)
         service_user = create(:user, user_type: :service_user, state: :blocked, last_activity_on: Gitlab::CurrentSettings.deactivate_dormant_users_period.days.ago.to_date)
 
         worker.perform
 
         expect(human_user.reload.state).to eq('blocked')
-        expect(human_user2.reload.state).to eq('blocked')
         expect(service_user.reload.state).to eq('blocked')
       end