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

rails4: fix mocha instantiation 

refs #CNVS-21596

Change-Id: I6fa10ad374bea1cde4442bb666183a42de32ac97
Reviewed-on: https://gerrit.instructure.com/57440
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
This commit is contained in:
James Williams 2015-06-30 09:09:02 -06:00
parent 698e0ab736
commit 4135f4259d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spec/mocha_extensions.rb
View File

@ -49,11 +49,11 @@ class ActiveRecord::Base
ar_obj ar_obj
end end
def self.instantiate_with_any_instantiation(a) def self.instantiate_with_any_instantiation(*args)
if obj = @@any_instantiation[[base_class, a['id'].to_i]] if obj = @@any_instantiation[[base_class, args.first['id'].to_i]]
obj obj
else else
instantiate_without_any_instantiation(a) instantiate_without_any_instantiation(*args)
end end
end end
class << self class << self