X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5047ec403db94b0d371a9a10b56801bc0a3fcf0a..30415443e95494fd9c217c7d83c9aa2d13d203fd:/test/abilities/api_capability_test.rb?ds=sidebyside diff --git a/test/abilities/api_capability_test.rb b/test/abilities/api_capability_test.rb index 58c8f7fe7..0945b6290 100644 --- a/test/abilities/api_capability_test.rb +++ b/test/abilities/api_capability_test.rb @@ -8,9 +8,9 @@ class ChangesetCommentApiCapabilityTest < ActiveSupport::TestCase scopes = Set.new ability = ApiAbility.new user, scopes - [:create, :destroy, :restore].each do |action| - assert ability.cannot? action, ChangesetComment - end + assert ability.cannot? :create, ChangesetComment + assert ability.cannot? :create, :changeset_comment_visibility + assert ability.cannot? :destroy, :changeset_comment_visibility end test "as a normal user with write_changeset_comments scope" do @@ -18,13 +18,9 @@ class ChangesetCommentApiCapabilityTest < ActiveSupport::TestCase scopes = Set.new %w[write_changeset_comments] ability = ApiAbility.new user, scopes - [:destroy, :restore].each do |action| - assert ability.cannot? action, ChangesetComment - end - - [:create].each do |action| - assert ability.can? action, ChangesetComment - end + assert ability.can? :create, ChangesetComment + assert ability.cannot? :create, :changeset_comment_visibility + assert ability.cannot? :destroy, :changeset_comment_visibility end test "as a moderator without scopes" do @@ -32,9 +28,9 @@ class ChangesetCommentApiCapabilityTest < ActiveSupport::TestCase scopes = Set.new ability = ApiAbility.new user, scopes - [:create, :destroy, :restore].each do |action| - assert ability.cannot? action, ChangesetComment - end + assert ability.cannot? :create, ChangesetComment + assert ability.cannot? :create, :changeset_comment_visibility + assert ability.cannot? :destroy, :changeset_comment_visibility end test "as a moderator with write_changeset_comments scope" do @@ -42,9 +38,9 @@ class ChangesetCommentApiCapabilityTest < ActiveSupport::TestCase scopes = Set.new %w[write_changeset_comments] ability = ApiAbility.new user, scopes - [:create, :destroy, :restore].each do |action| - assert ability.can? action, ChangesetComment - end + assert ability.can? :create, ChangesetComment + assert ability.can? :create, :changeset_comment_visibility + assert ability.can? :destroy, :changeset_comment_visibility end end