diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 21:13:27 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 21:13:27 +0300 |
commit | 13f6669657483134a697b7ec7b701563165bc9d5 (patch) | |
tree | 4d6e9161ab8d060abcdc2a4c6180c9d8cb868b70 /spec/workers/concerns | |
parent | 068b3a417794ab8506b2e149301b3a60c01df078 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers/concerns')
-rw-r--r-- | spec/workers/concerns/application_worker_spec.rb | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/spec/workers/concerns/application_worker_spec.rb b/spec/workers/concerns/application_worker_spec.rb index 7608b5f49a1..85731de2a45 100644 --- a/spec/workers/concerns/application_worker_spec.rb +++ b/spec/workers/concerns/application_worker_spec.rb @@ -287,12 +287,6 @@ RSpec.describe ApplicationWorker do end context 'different kinds of push_bulk' do - shared_context 'disable the `sidekiq_push_bulk_in_batches` feature flag' do - before do - stub_feature_flags(sidekiq_push_bulk_in_batches: false) - end - end - shared_context 'set safe limit beyond the number of jobs to be enqueued' do before do stub_const("#{described_class}::SAFE_PUSH_BULK_LIMIT", args.count + 1) @@ -408,27 +402,6 @@ RSpec.describe ApplicationWorker do it_behaves_like 'returns job_id of all enqueued jobs' it_behaves_like 'does not schedule the jobs for any specific time' end - - context 'when the feature flag `sidekiq_push_bulk_in_batches` is disabled' do - include_context 'disable the `sidekiq_push_bulk_in_batches` feature flag' - - context 'when the number of jobs to be enqueued does not exceed the safe limit' do - include_context 'set safe limit beyond the number of jobs to be enqueued' - - it_behaves_like 'enqueues jobs in one go' - it_behaves_like 'logs bulk insertions' - it_behaves_like 'returns job_id of all enqueued jobs' - it_behaves_like 'does not schedule the jobs for any specific time' - end - - context 'when the number of jobs to be enqueued exceeds safe limit' do - include_context 'set safe limit below the number of jobs to be enqueued' - - it_behaves_like 'enqueues jobs in one go' - it_behaves_like 'returns job_id of all enqueued jobs' - it_behaves_like 'does not schedule the jobs for any specific time' - end - end end end @@ -476,26 +449,6 @@ RSpec.describe ApplicationWorker do it_behaves_like 'returns job_id of all enqueued jobs' it_behaves_like 'schedules all the jobs at a specific time' end - - context 'when the feature flag `sidekiq_push_bulk_in_batches` is disabled' do - include_context 'disable the `sidekiq_push_bulk_in_batches` feature flag' - - context 'when the number of jobs to be enqueued does not exceed the safe limit' do - include_context 'set safe limit beyond the number of jobs to be enqueued' - - it_behaves_like 'enqueues jobs in one go' - it_behaves_like 'returns job_id of all enqueued jobs' - it_behaves_like 'schedules all the jobs at a specific time' - end - - context 'when the number of jobs to be enqueued exceeds safe limit' do - include_context 'set safe limit below the number of jobs to be enqueued' - - it_behaves_like 'enqueues jobs in one go' - it_behaves_like 'returns job_id of all enqueued jobs' - it_behaves_like 'schedules all the jobs at a specific time' - end - end end end @@ -575,26 +528,6 @@ RSpec.describe ApplicationWorker do it_behaves_like 'returns job_id of all enqueued jobs' it_behaves_like 'schedules all the jobs at a specific time, per batch' end - - context 'when the feature flag `sidekiq_push_bulk_in_batches` is disabled' do - include_context 'disable the `sidekiq_push_bulk_in_batches` feature flag' - - context 'when the number of jobs to be enqueued does not exceed the safe limit' do - include_context 'set safe limit beyond the number of jobs to be enqueued' - - it_behaves_like 'enqueues jobs in one go' - it_behaves_like 'returns job_id of all enqueued jobs' - it_behaves_like 'schedules all the jobs at a specific time, per batch' - end - - context 'when the number of jobs to be enqueued exceeds safe limit' do - include_context 'set safe limit below the number of jobs to be enqueued' - - it_behaves_like 'enqueues jobs in one go' - it_behaves_like 'returns job_id of all enqueued jobs' - it_behaves_like 'schedules all the jobs at a specific time, per batch' - end - end end end end |