Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed test.

Browse source
This commit is contained in:
Martin Edenhofer 2015-09-26 00:38:59 +02:00
parent 01680a8ad3
commit 17e3ecde92
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/unit/assets_test.rb
View file

@ -247,7 +247,7 @@ class AssetsTest < ActiveSupport::TestCase
attributes['password'] = '' attributes['password'] = ''
attributes.delete('token_ids') attributes.delete('token_ids')
attributes.delete('authorization_ids') attributes.delete('authorization_ids')
assert( !diff(attributes, assets[:User][user_new_2.id]), 'check assets' ) assert( diff(attributes, assets[:User][user_new_2.id]), 'check assets' )
# check new assets lookup # check new assets lookup
assets = org_new.assets({}) assets = org_new.assets({})
@ -266,12 +266,14 @@ class AssetsTest < ActiveSupport::TestCase
def diff(o1, o2) def diff(o1, o2)
return true if o1 == o2 return true if o1 == o2
if o1['updated_at'] %w(updated_at created_at).each {|item|
o1['updated_at'] = o1['updated_at'].to_s if o1[item]
o1[item] = o1[item].to_s
end end
if o2['updated_at'] if o2[item]
o2['updated_at'] = o2['updated_at'].to_s o2[item] = o2[item].to_s
end end
}
return true if (o1.to_a - o2.to_a).empty? return true if (o1.to_a - o2.to_a).empty?
#puts "ERROR: difference \n1: #{o1.inspect}\n2: #{o2.inspect}\ndiff: #{(o1.to_a - o2.to_a).inspect}" #puts "ERROR: difference \n1: #{o1.inspect}\n2: #{o2.inspect}\ndiff: #{(o1.to_a - o2.to_a).inspect}"
false false