61 lines
2.3 KiB
Ruby
61 lines
2.3 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'spec_helper'
|
|
|
|
RSpec.describe StuckMergeJobsWorker, feature_category: :code_review_workflow do
|
|
describe 'perform' do
|
|
let(:worker) { described_class.new }
|
|
|
|
context 'merge job identified as completed' do
|
|
it 'updates merge request to merged when locked but has merge_commit_sha' do
|
|
allow(Gitlab::SidekiqStatus).to receive(:completed_jids).and_return(%w(123 456))
|
|
mr_with_sha = create(:merge_request, :locked, merge_jid: '123', state: :locked, merge_commit_sha: 'foo-bar-baz')
|
|
mr_without_sha = create(:merge_request, :locked, merge_jid: '123', state: :locked, merge_commit_sha: nil)
|
|
|
|
worker.perform
|
|
|
|
mr_with_sha.reload
|
|
mr_without_sha.reload
|
|
expect(mr_with_sha).to be_merged
|
|
expect(mr_without_sha).to be_opened
|
|
expect(mr_with_sha.merge_jid).to be_present
|
|
expect(mr_without_sha.merge_jid).to be_nil
|
|
end
|
|
|
|
it 'updates merge request to opened when locked but has not been merged', :sidekiq_might_not_need_inline do
|
|
allow(Gitlab::SidekiqStatus).to receive(:completed_jids).and_return(%w(123))
|
|
merge_request = create(:merge_request, :locked, merge_jid: '123', state: :locked)
|
|
pipeline = create(:ci_empty_pipeline, project: merge_request.project, ref: merge_request.source_branch, sha: merge_request.source_branch_sha)
|
|
|
|
worker.perform
|
|
|
|
merge_request.reload
|
|
expect(merge_request).to be_opened
|
|
expect(merge_request.head_pipeline).to eq(pipeline)
|
|
end
|
|
|
|
it 'logs updated stuck merge job ids' do
|
|
allow(Gitlab::SidekiqStatus).to receive(:completed_jids).and_return(%w(123 456))
|
|
|
|
create(:merge_request, :locked, merge_jid: '123')
|
|
create(:merge_request, :locked, merge_jid: '456')
|
|
|
|
expect(described_class).to receive_message_chain(:logger, :info)
|
|
.with('Updated state of locked merge jobs. JIDs: 123, 456')
|
|
|
|
worker.perform
|
|
end
|
|
end
|
|
|
|
context 'merge job not identified as completed' do
|
|
it 'does not change merge request state when job is not completed yet' do
|
|
allow(Gitlab::SidekiqStatus).to receive(:completed_jids).and_return([])
|
|
|
|
merge_request = create(:merge_request, :locked, merge_jid: '123')
|
|
|
|
expect { worker.perform }.not_to change { merge_request.reload.state }.from('locked')
|
|
end
|
|
end
|
|
end
|
|
end
|