Merge remote-tracking branch 'upstream/pull/4464'

[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 b927ca703af30e9c10907dd9b3ca27b0254caf15..2a7ac5e121d9113b309fdc890a247852e92515d6 100644 (file)
--- 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,26 +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
+      assert_equal "application/json", @response.media_type
+
+      js = ActiveSupport::JSON.decode(@response.body)
+      assert_not_nil js
+      assert_equal 0, js["permissions"].count
     end
 
-    def test_permissions_oauth
-      token = create(:access_token,
-                     :allow_read_prefs => true,
-                     :allow_write_api => true,
-                     :allow_read_gpx => false)
-      signed_get permissions_path, :oauth => { :token => token }
+    def test_permissions_oauth2
+      user = create(:user)
+      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