diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-20 18:10:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-20 18:10:13 +0300 |
commit | e45c8a7e74d4c1a1f7e12504df3611f797620166 (patch) | |
tree | abf7e30bdc0c5a5b998fab295c887db1dc6d9e48 /spec/workers | |
parent | a32e60a7ea976c65d0bcb8a9aed90e2b7ed56966 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers')
-rw-r--r-- | spec/workers/container_expiration_policy_worker_spec.rb | 13 | ||||
-rw-r--r-- | spec/workers/merge_requests/assignees_change_worker_spec.rb | 59 | ||||
-rw-r--r-- | spec/workers/web_hook_worker_spec.rb | 5 |
3 files changed, 18 insertions, 59 deletions
diff --git a/spec/workers/container_expiration_policy_worker_spec.rb b/spec/workers/container_expiration_policy_worker_spec.rb index e8f9a972f10..26eb7f4523d 100644 --- a/spec/workers/container_expiration_policy_worker_spec.rb +++ b/spec/workers/container_expiration_policy_worker_spec.rb @@ -193,5 +193,18 @@ RSpec.describe ContainerExpirationPolicyWorker do end end end + + context 'process stale ongoing cleanups' do + let_it_be(:stuck_cleanup) { create(:container_repository, :cleanup_ongoing, expiration_policy_started_at: 1.day.ago) } + let_it_be(:container_repository) { create(:container_repository, :cleanup_scheduled) } + let_it_be(:container_repository) { create(:container_repository, :cleanup_unfinished) } + + it 'set them as unfinished' do + expect { subject } + .to change { ContainerRepository.cleanup_ongoing.count }.from(1).to(0) + .and change { ContainerRepository.cleanup_unfinished.count }.from(1).to(2) + expect(stuck_cleanup.reload).to be_cleanup_unfinished + end + end end end diff --git a/spec/workers/merge_requests/assignees_change_worker_spec.rb b/spec/workers/merge_requests/assignees_change_worker_spec.rb deleted file mode 100644 index 33478daf8d3..00000000000 --- a/spec/workers/merge_requests/assignees_change_worker_spec.rb +++ /dev/null @@ -1,59 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -RSpec.describe MergeRequests::AssigneesChangeWorker do - include AfterNextHelpers - - let_it_be(:merge_request) { create(:merge_request) } - let_it_be(:user) { create(:user) } - let_it_be(:old_assignees) { create_list(:user, 3) } - - let(:user_ids) { old_assignees.map(&:id).to_a } - let(:worker) { described_class.new } - - it_behaves_like 'an idempotent worker' do - let(:job_args) { [merge_request.id, user.id, user_ids] } - end - - describe '#perform' do - context 'with a non-existing merge request' do - it 'does nothing' do - expect(::MergeRequests::HandleAssigneesChangeService).not_to receive(:new) - - worker.perform(non_existing_record_id, user.id, user_ids) - end - end - - context 'with a non-existing user' do - it 'does nothing' do - expect(::MergeRequests::HandleAssigneesChangeService).not_to receive(:new) - - worker.perform(merge_request.id, non_existing_record_id, user_ids) - end - end - - context 'when there are no changes' do - it 'does nothing' do - expect(::MergeRequests::HandleAssigneesChangeService).not_to receive(:new) - - worker.perform(merge_request.id, user.id, merge_request.assignee_ids) - end - end - - context 'when the old users cannot be found' do - it 'does nothing' do - expect(::MergeRequests::HandleAssigneesChangeService).not_to receive(:new) - - worker.perform(merge_request.id, user.id, [non_existing_record_id]) - end - end - - it 'gets MergeRequests::UpdateAssigneesService to handle the changes' do - expect_next(::MergeRequests::HandleAssigneesChangeService) - .to receive(:execute).with(merge_request, match_array(old_assignees), execute_hooks: true) - - worker.perform(merge_request.id, user.id, user_ids) - end - end -end diff --git a/spec/workers/web_hook_worker_spec.rb b/spec/workers/web_hook_worker_spec.rb index becc7461f2a..066f4f67cb9 100644 --- a/spec/workers/web_hook_worker_spec.rb +++ b/spec/workers/web_hook_worker_spec.rb @@ -14,5 +14,10 @@ RSpec.describe WebHookWorker do subject.perform(project_hook.id, data, hook_name) end + + it_behaves_like 'worker with data consistency', + described_class, + feature_flag: :load_balancing_for_web_hook_worker, + data_consistency: :delayed end end |