X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/90360df6d76627d29eeaee7f1d1c2819e5d206b2..6094a97ce6297d390e5bbf733f5c2b4cc6b2076c:/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 3101abee2..2a7ac5e12 100644 --- a/test/controllers/api/permissions_controller_test.rb +++ b/test/controllers/api/permissions_controller_test.rb @@ -9,6 +9,10 @@ module Api { :path => "/api/0.6/permissions", :method => :get }, { :controller => "api/permissions", :action => "show" } ) + assert_routing( + { :path => "/api/0.6/permissions.json", :method => :get }, + { :controller => "api/permissions", :action => "show", :format => "json" } + ) end def test_permissions_anonymous @@ -17,41 +21,21 @@ module Api assert_select "osm > permissions", :count => 1 do assert_select "permission", :count => 0 end - end - def test_permissions_basic_auth - auth_header = basic_authorization_header create(:user).email, "test" - get permissions_path, :headers => auth_header + # Test json + get permissions_path(:format => "json") assert_response :success - assert_select "osm > permissions", :count => 1 do - assert_select "permission", :count => ClientApplication.all_permissions.size - ClientApplication.all_permissions.each do |p| - assert_select "permission[name='#{p}']", :count => 1 - end - end - end + assert_equal "application/json", @response.media_type - def test_permissions_oauth1 - token = create(:access_token, - :allow_read_prefs => true, - :allow_write_api => true, - :allow_read_gpx => false) - signed_get permissions_path, :oauth => { :token => token } - assert_response :success - assert_select "osm > permissions", :count => 1 do - assert_select "permission", :count => 2 - assert_select "permission[name='allow_read_prefs']", :count => 1 - assert_select "permission[name='allow_write_api']", :count => 1 - assert_select "permission[name='allow_read_gpx']", :count => 0 - end + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal 0, js["permissions"].count 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