cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert tests using OAuth 1 tokens to use OAuth 2 tokens

Browse source
This commit is contained in:
Tom Hughes 2024-07-24 19:11:12 +01:00
parent 083c37fead
commit 1a7d68ccbc
4 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

30
test/abilities/api_capability_test.rb
View file

@ -4,7 +4,7 @@ require "test_helper"
class ChangesetCommentApiCapabilityTest < ActiveSupport::TestCase
test "as a normal user with permissionless token" do
token = create(:access_token)
token = create(:oauth_access_token)
capability = ApiCapability.new token
[:create, :destroy, :restore].each do |action|
@ -12,8 +12,8 @@ class ChangesetCommentApiCapabilityTest < ActiveSupport::TestCase
end
end
test "as a normal user with allow_write_api token" do
token = create(:access_token, :allow_write_api => true)
test "as a normal user with write_api token" do
token = create(:oauth_access_token, :scopes => %w[write_api])
capability = ApiCapability.new token
[:destroy, :restore].each do |action|
@ -26,7 +26,7 @@ class ChangesetCommentApiCapabilityTest < ActiveSupport::TestCase
end
test "as a moderator with permissionless token" do
token = create(:access_token, :user => create(:moderator_user))
token = create(:oauth_access_token, :resource_owner_id => create(:moderator_user).id)
capability = ApiCapability.new token
[:create, :destroy, :restore].each do |action|
@ -34,8 +34,8 @@ class ChangesetCommentApiCapabilityTest < ActiveSupport::TestCase
end
end
test "as a moderator with allow_write_api token" do
token = create(:access_token, :user => create(:moderator_user), :allow_write_api => true)
test "as a moderator with write_api token" do
token = create(:oauth_access_token, :resource_owner_id => create(:moderator_user).id, :scopes => %w[write_api])
capability = ApiCapability.new token
[:create, :destroy, :restore].each do |action|
@ -46,7 +46,7 @@ end
class NoteApiCapabilityTest < ActiveSupport::TestCase
test "as a normal user with permissionless token" do
token = create(:access_token)
token = create(:oauth_access_token)
capability = ApiCapability.new token
[:create, :comment, :close, :reopen, :destroy].each do |action|
@ -54,8 +54,8 @@ class NoteApiCapabilityTest < ActiveSupport::TestCase
end
end
test "as a normal user with allow_write_notes token" do
token = create(:access_token, :allow_write_notes => true)
test "as a normal user with write_notes token" do
token = create(:oauth_access_token, :scopes => %w[write_notes])
capability = ApiCapability.new token
[:destroy].each do |action|
@ -68,7 +68,7 @@ class NoteApiCapabilityTest < ActiveSupport::TestCase
end
test "as a moderator with permissionless token" do
token = create(:access_token, :user => create(:moderator_user))
token = create(:oauth_access_token, :resource_owner_id => create(:moderator_user).id)
capability = ApiCapability.new token
[:destroy].each do |action|
@ -76,8 +76,8 @@ class NoteApiCapabilityTest < ActiveSupport::TestCase
end
end
test "as a moderator with allow_write_notes token" do
token = create(:access_token, :user => create(:moderator_user), :allow_write_notes => true)
test "as a moderator with write_notes token" do
token = create(:oauth_access_token, :resource_owner_id => create(:moderator_user).id, :scopes => %w[write_notes])
capability = ApiCapability.new token
[:destroy].each do |action|
@ -95,14 +95,14 @@ class UserApiCapabilityTest < ActiveSupport::TestCase
end
# A user with empty tokens
token = create(:access_token)
token = create(:oauth_access_token)
capability = ApiCapability.new token
[:index, :show, :update_all, :update, :destroy].each do |act|
assert capability.cannot? act, UserPreference
end
token = create(:access_token, :allow_read_prefs => true)
token = create(:oauth_access_token, :scopes => %w[read_prefs])
capability = ApiCapability.new token
[:update_all, :update, :destroy].each do |act|
@ -113,7 +113,7 @@ class UserApiCapabilityTest < ActiveSupport::TestCase
assert capability.can? act, UserPreference
end
token = create(:access_token, :allow_write_prefs => true)
token = create(:oauth_access_token, :scopes => %w[write_prefs])
capability = ApiCapability.new token
[:index, :show].each do |act|