Merge branch 'pull/5297'

[rails.git] / 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 3bc13cc04b4634041c315aad601464d113b7319e..2a7ac5e121d9113b309fdc890a247852e92515d6 100644 (file)
--- 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