ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rails 6: fix any_instantiation_of 

Change-Id: I559d8593b658babc535818a2838b6ae2c37e1ab0
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/250444
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
QA-Review: Ethan Vizitei <evizitei@instructure.com>
Product-Review: Ethan Vizitei <evizitei@instructure.com>
This commit is contained in:
Cody Cutrer 2020-10-19 11:44:17 -06:00
parent 837e589cf4
commit 566a8b3cf8
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spec/rspec_mock_extensions.rb
View File

@ -39,8 +39,16 @@ module RspecMockAnyInstantiation
ar_obj
end
def instantiate(*args)
if obj = @@any_instantiation[[base_class, args.first['id'].to_i]]
def instantiate(record, column_types = {}, &block)
if obj = @@any_instantiation[[base_class, record['id'].to_i]]
obj
else
super
end
end
def instantiate_instance_of(klass, record, column_types = {}, &block)
if obj = @@any_instantiation[[klass, record['id'].to_i]]
obj
else
super