X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b96391e456fd7bddf28b8e283d74f081b5d3ec99..8383fd0928a3a431dc58c48d42bf1d19bc43ea34:/test/controllers/api_controller_test.rb?ds=inline diff --git a/test/controllers/api_controller_test.rb b/test/controllers/api_controller_test.rb index 9fc0c1567..3f4196ffb 100644 --- a/test/controllers/api_controller_test.rb +++ b/test/controllers/api_controller_test.rb @@ -18,10 +18,6 @@ class ApiControllerTest < ActionController::TestCase ## # test all routes which lead to this controller def test_routes - assert_routing( - { :path => "/api/0.6/permissions", :method => :get }, - { :controller => "api", :action => "permissions" } - ) assert_routing( { :path => "/api/0.6/map", :method => :get }, { :controller => "api", :action => "map" } @@ -276,41 +272,4 @@ class ApiControllerTest < ActionController::TestCase get :changes, :params => { :start => "2010-04-03 09:55:00", :end => "2010-04-03 10:55:00" } assert_response :success end - - def test_permissions_anonymous - get :permissions - assert_response :success - assert_select "osm > permissions", :count => 1 do - assert_select "permission", :count => 0 - end - end - - def test_permissions_basic_auth - basic_authorization create(:user).email, "test" - get :permissions - 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 - - def test_permissions_oauth - @request.env["oauth.token"] = AccessToken.new do |token| - # Just to test a few - token.allow_read_prefs = true - token.allow_write_api = true - token.allow_read_gpx = false - end - get :permissions - 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 - end end