Fix deprecation: You are passing an instance of ActiveRecord::Base to find

This commit is contained in:
Jasper Maes 2018-11-26 23:14:59 +01:00
parent deaf3af7e5
commit 82077dbdb7
2 changed files with 6 additions and 1 deletions

View File

@ -0,0 +1,5 @@
---
title: 'Fix deprecation: You are passing an instance of ActiveRecord::Base to'
merge_request: 23369
author: Jasper Maes
type: other

View File

@ -19,7 +19,7 @@ describe RebaseWorker, '#perform' do
expect(MergeRequests::RebaseService)
.to receive(:new).with(forked_project, merge_request.author).and_call_original
subject.perform(merge_request, merge_request.author)
subject.perform(merge_request.id, merge_request.author.id)
end
end
end