X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d6f8302eaeac711f8738c956f46c92de9743fed3..06d03c8acccfadfe7e2bf441c9fbd0044e7a2fcf:/test/controllers/api/permissions_controller_test.rb?ds=sidebyside

diff --git a/test/controllers/api/permissions_controller_test.rb b/test/controllers/api/permissions_controller_test.rb
index cca85b404..2a7ac5e12 100644
--- a/test/controllers/api/permissions_controller_test.rb
+++ b/test/controllers/api/permissions_controller_test.rb
@@ -32,51 +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 => ClientApplication.all_permissions.size
-        ClientApplication.all_permissions.each do |p|
-          assert_select "permission[name='#{p}']", :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 ClientApplication.all_permissions.size, js["permissions"].count
-      ClientApplication.all_permissions.each do |p|
-        assert_includes js["permissions"], p.to_s
-      end
-    end
-
-    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
-    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