X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/84765f2e6de42bc188139cfa9fae77a233df2d68..06d03c8acccfadfe7e2bf441c9fbd0044e7a2fcf:/test/controllers/api/permissions_controller_test.rb diff --git a/test/controllers/api/permissions_controller_test.rb b/test/controllers/api/permissions_controller_test.rb index 3bc13cc04..2a7ac5e12 100644 --- a/test/controllers/api/permissions_controller_test.rb +++ b/test/controllers/api/permissions_controller_test.rb @@ -32,36 +32,10 @@ module Api assert_equal 0, js["permissions"].count end - def test_permissions_basic_auth - auth_header = basic_authorization_header create(:user).email, "test" - get permissions_path, :headers => auth_header - assert_response :success - assert_select "osm > permissions", :count => 1 do - assert_select "permission", :count => Oauth.scopes.size - Oauth.scopes.each do |p| - assert_select "permission[name='allow_#{p.name}']", :count => 1 - end - end - - # Test json - get permissions_path(:format => "json"), :headers => auth_header - assert_response :success - assert_equal "application/json", @response.media_type - - js = ActiveSupport::JSON.decode(@response.body) - assert_not_nil js - assert_equal Oauth.scopes.size, js["permissions"].count - Oauth.scopes.each do |p| - assert_includes js["permissions"], "allow_#{p.name}" - end - end - def test_permissions_oauth2 user = create(:user) - token = create(:oauth_access_token, - :resource_owner_id => user.id, - :scopes => %w[read_prefs write_api]) - get permissions_path, :headers => bearer_authorization_header(token.token) + auth_header = bearer_authorization_header(user, :scopes => %w[read_prefs write_api]) + get permissions_path, :headers => auth_header assert_response :success assert_select "osm > permissions", :count => 1 do assert_select "permission", :count => 2