diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-15 09:09:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-15 09:09:36 +0300 |
commit | 024f77efd68833bb78540ff9b4c7b4ec4b9dfe39 (patch) | |
tree | 4b564d2de286b3032907c66cabee92fe6b6754fc /spec/workers | |
parent | b291dca0e5062e05572e0f106ea499b47d908d35 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers')
-rw-r--r-- | spec/workers/background_migration/ci_database_worker_spec.rb | 3 | ||||
-rw-r--r-- | spec/workers/background_migration_worker_spec.rb | 3 | ||||
-rw-r--r-- | spec/workers/integrations/slack_event_worker_spec.rb | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/spec/workers/background_migration/ci_database_worker_spec.rb b/spec/workers/background_migration/ci_database_worker_spec.rb index 3f2977a0aaa..496e7830c94 100644 --- a/spec/workers/background_migration/ci_database_worker_spec.rb +++ b/spec/workers/background_migration/ci_database_worker_spec.rb @@ -2,7 +2,8 @@ require 'spec_helper' -RSpec.describe BackgroundMigration::CiDatabaseWorker, :clean_gitlab_redis_shared_state, feature_category: :database do +RSpec.describe BackgroundMigration::CiDatabaseWorker, :clean_gitlab_redis_shared_state, + :clean_gitlab_redis_cluster_shared_state, feature_category: :database do before do skip_if_shared_database(:ci) end diff --git a/spec/workers/background_migration_worker_spec.rb b/spec/workers/background_migration_worker_spec.rb index 32ee6708736..4cffbe5be97 100644 --- a/spec/workers/background_migration_worker_spec.rb +++ b/spec/workers/background_migration_worker_spec.rb @@ -2,6 +2,7 @@ require 'spec_helper' -RSpec.describe BackgroundMigrationWorker, :clean_gitlab_redis_shared_state, feature_category: :database do +RSpec.describe BackgroundMigrationWorker, :clean_gitlab_redis_shared_state, + :clean_gitlab_redis_cluster_shared_state, feature_category: :database do it_behaves_like 'it runs background migration jobs', 'main' end diff --git a/spec/workers/integrations/slack_event_worker_spec.rb b/spec/workers/integrations/slack_event_worker_spec.rb index 6754801a2bd..019d68b40e0 100644 --- a/spec/workers/integrations/slack_event_worker_spec.rb +++ b/spec/workers/integrations/slack_event_worker_spec.rb @@ -2,7 +2,8 @@ require 'spec_helper' -RSpec.describe Integrations::SlackEventWorker, :clean_gitlab_redis_shared_state, feature_category: :integrations do +RSpec.describe Integrations::SlackEventWorker, :clean_gitlab_redis_shared_state, + :clean_gitlab_redis_cluster_shared_state, feature_category: :integrations do describe '.event?' do subject { described_class.event?(event) } |