Commit 15842c74 authored by Mark Chao's avatar Mark Chao

Fill timestamp for Approver bulk insertion

parent 096ddf92
...@@ -60,11 +60,15 @@ module EE ...@@ -60,11 +60,15 @@ module EE
return if users.empty? return if users.empty?
return unless merge_request.approvers_overwritten? return unless merge_request.approvers_overwritten?
now = Time.now
rows = users.map do |user| rows = users.map do |user|
{ {
target_id: merge_request.id, target_id: merge_request.id,
target_type: merge_request.class.name, target_type: merge_request.class.name,
user_id: user.id user_id: user.id,
created_at: now,
updated_at: now
} }
end end
......
...@@ -119,8 +119,12 @@ describe MergeRequests::RefreshService do ...@@ -119,8 +119,12 @@ describe MergeRequests::RefreshService do
it 'creates Approver' do it 'creates Approver' do
expect { subject }.to change { Approver.count }.by(1) expect { subject }.to change { Approver.count }.by(1)
new_approver = merge_request.approvers.last
expect(merge_request.approvers.first.user).to eq(existing_approver) expect(merge_request.approvers.first.user).to eq(existing_approver)
expect(merge_request.approvers.last.user).to eq(owner) expect(new_approver.user).to eq(owner)
expect(new_approver.created_at).to be_present
expect(new_approver.updated_at).to be_present
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment