Skip to content
代码片段 群组 项目
提交 75b3bc26 编辑于 作者: Kerri Miller's avatar Kerri Miller 提交者: Mark Chao
浏览文件

Remove early exit to allow marking as complete

The early exit allowed some jobs to fail to be marked as complete.

Changelog: fixed
上级 5e38f7f9
No related branches found
No related tags found
无相关合并请求
...@@ -22,8 +22,6 @@ def self.eligible ...@@ -22,8 +22,6 @@ def self.eligible
def perform(start_id, end_id) def perform(start_id, end_id)
eligible_mrs = MergeRequest.eligible.where(id: start_id..end_id).pluck(:id) eligible_mrs = MergeRequest.eligible.where(id: start_id..end_id).pluck(:id)
return if eligible_mrs.empty?
eligible_mrs.each_slice(10) do |slice| eligible_mrs.each_slice(10) do |slice|
MergeRequest.where(id: slice).update_all(draft: true) MergeRequest.where(id: slice).update_all(draft: true)
end end
......
...@@ -50,5 +50,19 @@ def create_merge_request(params) ...@@ -50,5 +50,19 @@ def create_merge_request(params)
subject.perform(mr_ids.first, mr_ids.last) subject.perform(mr_ids.first, mr_ids.last)
end end
it_behaves_like 'marks background migration job records' do
let!(:non_eligible_mrs) do
Array.new(2) do
create_merge_request(
title: "Not a d-r-a-f-t 1",
draft: false,
state_id: 1
)
end
end
let(:arguments) { [non_eligible_mrs.first.id, non_eligible_mrs.last.id] }
end
end end
end end
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册