X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cb87f02642d0097ebc067ca1f9371dde274a41e3..212fe75b6fd26d01dfacf31650e7f71eb7f06a63:/test/controllers/oauth_clients_controller_test.rb?ds=sidebyside

diff --git a/test/controllers/oauth_clients_controller_test.rb b/test/controllers/oauth_clients_controller_test.rb
index 81ab290b9..c4dd4a181 100644
--- a/test/controllers/oauth_clients_controller_test.rb
+++ b/test/controllers/oauth_clients_controller_test.rb
@@ -1,6 +1,6 @@
 require "test_helper"
 
-class OauthClientsControllerTest < ActionController::TestCase
+class OauthClientsControllerTest < ActionDispatch::IntegrationTest
   ##
   # test all routes which lead to this controller
   def test_routes
@@ -37,31 +37,28 @@ class OauthClientsControllerTest < ActionController::TestCase
   def test_index
     user = create(:user)
     create_list(:client_application, 2, :user => user)
+    create_list(:access_token, 2, :user => user)
 
-    get :index,
-        :params => { :display_name => user.display_name }
-    assert_response :redirect
-    assert_redirected_to login_path(:referer => oauth_clients_path(:display_name => user.display_name))
+    get oauth_clients_path(user)
+    assert_redirected_to login_path(:referer => oauth_clients_path(user))
 
-    get :index,
-        :params => { :display_name => user.display_name },
-        :session => { :user => user }
+    session_for(user)
+
+    get oauth_clients_path(user)
     assert_response :success
     assert_template "index"
-    assert_select "div.client_application", 2
+    assert_select "li.client_application", 2
   end
 
   def test_new
     user = create(:user)
 
-    get :new,
-        :params => { :display_name => user.display_name }
-    assert_response :redirect
-    assert_redirected_to login_path(:referer => new_oauth_client_path(:display_name => user.display_name))
+    get new_oauth_client_path(user)
+    assert_redirected_to login_path(:referer => new_oauth_client_path(user))
+
+    session_for(user)
 
-    get :new,
-        :params => { :display_name => user.display_name },
-        :session => { :user => user }
+    get new_oauth_client_path(user)
     assert_response :success
     assert_template "new"
     assert_select "form", 1 do
@@ -75,31 +72,40 @@ class OauthClientsControllerTest < ActionController::TestCase
     end
   end
 
+  def test_new_disabled
+    user = create(:user)
+
+    with_settings(:oauth_10_registration => false) do
+      get new_oauth_client_path(user)
+      assert_redirected_to login_path(:referer => new_oauth_client_path(user))
+
+      session_for(user)
+
+      get new_oauth_client_path(user)
+      assert_redirected_to oauth_clients_path(user)
+    end
+  end
+
   def test_create
     user = create(:user)
 
     assert_difference "ClientApplication.count", 0 do
-      post :create, :params => { :display_name => user.display_name }
+      post oauth_clients_path(user)
     end
     assert_response :forbidden
 
+    session_for(user)
+
     assert_difference "ClientApplication.count", 0 do
-      post :create,
-           :params => { :display_name => user.display_name,
-                        :client_application => { :name => "Test Application" } },
-           :session => { :user => user }
+      post oauth_clients_path(user, :client_application => { :name => "Test Application" })
     end
     assert_response :success
     assert_template "new"
 
     assert_difference "ClientApplication.count", 1 do
-      post :create,
-           :params => { :display_name => user.display_name,
-                        :client_application => { :name => "Test Application",
-                                                 :url => "http://test.example.com/" } },
-           :session => { :user => user }
+      post oauth_clients_path(user, :client_application => { :name => "Test Application",
+                                                             :url => "http://test.example.com/" })
     end
-    assert_response :redirect
     assert_redirected_to oauth_client_path(:id => ClientApplication.find_by(:name => "Test Application").id)
   end
 
@@ -108,20 +114,16 @@ class OauthClientsControllerTest < ActionController::TestCase
     client = create(:client_application, :user => user)
     other_client = create(:client_application)
 
-    get :show,
-        :params => { :display_name => user.display_name, :id => client.id }
-    assert_response :redirect
-    assert_redirected_to login_path(:referer => oauth_client_path(:display_name => user.display_name, :id => client.id))
+    get oauth_client_path(user, client)
+    assert_redirected_to login_path(:referer => oauth_client_path(user, client.id))
+
+    session_for(user)
 
-    get :show,
-        :params => { :display_name => user.display_name, :id => other_client.id },
-        :session => { :user => user }
+    get oauth_client_path(user, other_client)
     assert_response :not_found
     assert_template "not_found"
 
-    get :show,
-        :params => { :display_name => user.display_name, :id => client.id },
-        :session => { :user => user }
+    get oauth_client_path(user, client)
     assert_response :success
     assert_template "show"
   end
@@ -131,20 +133,16 @@ class OauthClientsControllerTest < ActionController::TestCase
     client = create(:client_application, :user => user)
     other_client = create(:client_application)
 
-    get :edit,
-        :params => { :display_name => user.display_name, :id => client.id }
-    assert_response :redirect
-    assert_redirected_to login_path(:referer => edit_oauth_client_path(:display_name => user.display_name, :id => client.id))
+    get edit_oauth_client_path(user, client)
+    assert_redirected_to login_path(:referer => edit_oauth_client_path(user, client.id))
 
-    get :edit,
-        :params => { :display_name => user.display_name, :id => other_client.id },
-        :session => { :user => user }
+    session_for(user)
+
+    get edit_oauth_client_path(user, other_client)
     assert_response :not_found
     assert_template "not_found"
 
-    get :edit,
-        :params => { :display_name => user.display_name, :id => client.id },
-        :session => { :user => user }
+    get edit_oauth_client_path(user, client)
     assert_response :success
     assert_template "edit"
     assert_select "form", 1 do
@@ -163,30 +161,20 @@ class OauthClientsControllerTest < ActionController::TestCase
     client = create(:client_application, :user => user)
     other_client = create(:client_application)
 
-    put :update,
-        :params => { :display_name => user.display_name, :id => client.id }
+    put oauth_client_path(user, client)
     assert_response :forbidden
 
-    put :update,
-        :params => { :display_name => user.display_name, :id => other_client.id },
-        :session => { :user => user }
+    session_for(user)
+
+    put oauth_client_path(user, other_client)
     assert_response :not_found
     assert_template "not_found"
 
-    put :update,
-        :params => { :display_name => user.display_name,
-                     :id => client.id,
-                     :client_application => { :name => "New Name", :url => nil } },
-        :session => { :user => user }
+    put oauth_client_path(user, client, :client_application => { :name => "New Name", :url => nil })
     assert_response :success
     assert_template "edit"
 
-    put :update,
-        :params => { :display_name => user.display_name,
-                     :id => client.id,
-                     :client_application => { :name => "New Name", :url => "http://new.example.com/url" } },
-        :session => { :user => user }
-    assert_response :redirect
+    put oauth_client_path(user, client, :client_application => { :name => "New Name", :url => "http://new.example.com/url" })
     assert_redirected_to oauth_client_path(:id => client.id)
   end
 
@@ -196,25 +184,21 @@ class OauthClientsControllerTest < ActionController::TestCase
     other_client = create(:client_application)
 
     assert_difference "ClientApplication.count", 0 do
-      delete :destroy,
-             :params => { :display_name => user.display_name, :id => client.id }
+      delete oauth_client_path(user, client)
     end
     assert_response :forbidden
 
+    session_for(user)
+
     assert_difference "ClientApplication.count", 0 do
-      delete :destroy,
-             :params => { :display_name => user.display_name, :id => other_client.id },
-             :session => { :user => user }
+      delete oauth_client_path(user, other_client)
     end
     assert_response :not_found
     assert_template "not_found"
 
     assert_difference "ClientApplication.count", -1 do
-      delete :destroy,
-             :params => { :display_name => user.display_name, :id => client.id },
-             :session => { :user => user }
+      delete oauth_client_path(user, client)
     end
-    assert_response :redirect
-    assert_redirected_to oauth_clients_path(:display_name => user.display_name)
+    assert_redirected_to oauth_clients_path(user)
   end
 end