raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-24 05:38:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6037 from arku/fix/hash-diff-deprecation

Browse Source 
Remove Hash#diff from cancan helper
This commit is contained in:
Luis Ramos
2020-09-19 20:21:24 +01:00
committed by GitHub
parent 8f98fb830a 08604ae8fd
commit 714bfafede
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spec/support/cancan_helper.rb
View File

@@ -13,7 +13,8 @@ module Spree
ability_hash.each do |action, _true_or_false|
@ability_result[action] = ability.can?(action, target)
end
ability_hash.diff(@ability_result).none?
expect(ability_hash).to eq(@ability_result)
end
failure_message do |user|
@@ -21,7 +22,7 @@ module Spree
ability_hash = { ability_hash => true } if ability_hash.is_a? Symbol # e.g.: :create
ability_hash = ability_hash.inject({}){ |member, i| member.merge(i => true) } if ability_hash.is_a? Array # e.g.: [:create, :read] => {:create=>true, :read=>true}
target = options[:for]
message = "expected User:#{user} to have ability:#{ability_hash} for #{target}, but actual result is #{@ability_result}"
message = "expected User:#{user} to have ability: #{ability_hash} for #{target}, but actual result is #{@ability_result}"
end
# to clean up output of RSpec Documentation format