Preserve protocol in standard links

[rails.git] / test / controllers / oauth_clients_controller_test.rb

diff --git a/test/controllers/oauth_clients_controller_test.rb b/test/controllers/oauth_clients_controller_test.rb
index 5b2c5b6e47d76be9cfc75a81a325b1abc9796619..020521bacd97c57462eec9cb5d6c05ac5acf505b 100644 (file)
--- a/test/controllers/oauth_clients_controller_test.rb
+++ b/test/controllers/oauth_clients_controller_test.rb
@@ -1,7 +1,7 @@
-require 'test_helper'
+require "test_helper"

 
 class OauthClientsControllerTest < ActionController::TestCase
 
 class OauthClientsControllerTest < ActionController::TestCase

-  fixtures :users, :client_applications
+  fixtures :users

 
   ##
   # test all routes which lead to this controller
 
   ##
   # test all routes which lead to this controller


@@ -38,8 +38,9 @@ class OauthClientsControllerTest < ActionController::TestCase
 
   def test_index
     user = users(:public_user)
 
   def test_index
     user = users(:public_user)

+    create_list(:client_application, 2, :user => user)

 
 

-    get :index, { :display_name => user.display_name }
+    get :index, :display_name => user.display_name

     assert_response :redirect
     assert_redirected_to login_path(:referer => oauth_clients_path(:display_name => user.display_name))
 
     assert_response :redirect
     assert_redirected_to login_path(:referer => oauth_clients_path(:display_name => user.display_name))
 


@@ -52,7 +53,7 @@ class OauthClientsControllerTest < ActionController::TestCase
   def test_new
     user = users(:public_user)
 
   def test_new
     user = users(:public_user)
 

-    get :new, { :display_name => user.display_name }
+    get :new, :display_name => user.display_name

     assert_response :redirect
     assert_redirected_to login_path(:referer => new_oauth_client_path(:display_name => user.display_name))
 
     assert_response :redirect
     assert_redirected_to login_path(:referer => new_oauth_client_path(:display_name => user.display_name))
 


@@ -74,7 +75,7 @@ class OauthClientsControllerTest < ActionController::TestCase
     user = users(:public_user)
 
     assert_difference "ClientApplication.count", 0 do
     user = users(:public_user)
 
     assert_difference "ClientApplication.count", 0 do

-      post :create, { :display_name => user.display_name }
+      post :create, :display_name => user.display_name

     end
     assert_response :forbidden
 
     end
     assert_response :forbidden
 


@@ -82,11 +83,9 @@ class OauthClientsControllerTest < ActionController::TestCase
       post :create, {
         :display_name => user.display_name,
         :client_application => {
       post :create, {
         :display_name => user.display_name,
         :client_application => {

-        :name => "Test Application"
+          :name => "Test Application"

         }
         }

-      }, {
-        :user => user
-      }
+      }, { :user => user }

     end
     assert_response :success
     assert_template "new"
     end
     assert_response :success
     assert_template "new"


@@ -98,23 +97,22 @@ class OauthClientsControllerTest < ActionController::TestCase
           :name => "Test Application",
           :url => "http://test.example.com/"
         }
           :name => "Test Application",
           :url => "http://test.example.com/"
         }

-      }, {
-        :user => user
-      }
+      }, { :user => user }

     end
     assert_response :redirect
     end
     assert_response :redirect

-    assert_redirected_to oauth_client_path(:id => ClientApplication.find_by_name("Test Application").id)
+    assert_redirected_to oauth_client_path(:id => ClientApplication.find_by(:name => "Test Application").id)

   end
 
   def test_show
     user = users(:public_user)
   end
 
   def test_show
     user = users(:public_user)

-    client = client_applications(:oauth_web_app)
+    client = create(:client_application, :user => user)
+    other_client = create(:client_application)

 
 

-    get :show, { :display_name => user.display_name, :id => client.id }
+    get :show, :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))
 
     assert_response :redirect
     assert_redirected_to login_path(:referer => oauth_client_path(:display_name => user.display_name, :id => client.id))
 

-    get :show, { :display_name => user.display_name, :id => client_applications(:normal_user_app).id }, { :user => user }
+    get :show, { :display_name => user.display_name, :id => other_client.id }, { :user => user }

     assert_response :not_found
     assert_template "not_found"
 
     assert_response :not_found
     assert_template "not_found"
 


@@ -125,13 +123,14 @@ class OauthClientsControllerTest < ActionController::TestCase
 
   def test_edit
     user = users(:public_user)
 
   def test_edit
     user = users(:public_user)

-    client = client_applications(:oauth_web_app)
+    client = create(:client_application, :user => user)
+    other_client = create(:client_application)

 
 

-    get :edit, { :display_name => user.display_name, :id => client.id }
+    get :edit, :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))
 
     assert_response :redirect
     assert_redirected_to login_path(:referer => edit_oauth_client_path(:display_name => user.display_name, :id => client.id))
 

-    get :edit, { :display_name => user.display_name, :id => client_applications(:normal_user_app).id }, { :user => user }
+    get :edit, { :display_name => user.display_name, :id => other_client.id }, { :user => user }

     assert_response :not_found
     assert_template "not_found"
 
     assert_response :not_found
     assert_template "not_found"
 


@@ -151,12 +150,13 @@ class OauthClientsControllerTest < ActionController::TestCase
 
   def test_update
     user = users(:public_user)
 
   def test_update
     user = users(:public_user)

-    client = client_applications(:oauth_web_app)
+    client = create(:client_application, :user => user)
+    other_client = create(:client_application)

 
 

-    put :update, { :display_name => user.display_name, :id => client.id }
+    put :update, :display_name => user.display_name, :id => client.id

     assert_response :forbidden
 
     assert_response :forbidden
 

-    put :update, { :display_name => user.display_name, :id => client_applications(:normal_user_app).id }, { :user => user }
+    put :update, { :display_name => user.display_name, :id => other_client.id }, { :user => user }

     assert_response :not_found
     assert_template "not_found"
 
     assert_response :not_found
     assert_template "not_found"
 


@@ -167,9 +167,7 @@ class OauthClientsControllerTest < ActionController::TestCase
         :name => "New Name",
         :url => nil
       }
         :name => "New Name",
         :url => nil
       }

-    }, {
-      :user => user
-    }
+    }, { :user => user }

     assert_response :success
     assert_template "edit"
 
     assert_response :success
     assert_template "edit"
 


@@ -180,24 +178,23 @@ class OauthClientsControllerTest < ActionController::TestCase
         :name => "New Name",
         :url => "http://new.example.com/url"
       }
         :name => "New Name",
         :url => "http://new.example.com/url"
       }

-    }, {
-      :user => user
-    }
+    }, { :user => user }

     assert_response :redirect
     assert_redirected_to oauth_client_path(:id => client.id)
   end
 
   def test_destroy
     user = users(:public_user)
     assert_response :redirect
     assert_redirected_to oauth_client_path(:id => client.id)
   end
 
   def test_destroy
     user = users(:public_user)

-    client = client_applications(:oauth_web_app)
+    client = create(:client_application, :user => user)
+    other_client = create(:client_application)

 
     assert_difference "ClientApplication.count", 0 do
 
     assert_difference "ClientApplication.count", 0 do

-      delete :destroy, { :display_name => user.display_name, :id => client.id }
+      delete :destroy, :display_name => user.display_name, :id => client.id

     end
     assert_response :forbidden
 
     assert_difference "ClientApplication.count", 0 do
     end
     assert_response :forbidden
 
     assert_difference "ClientApplication.count", 0 do

-      delete :destroy, { :display_name => user.display_name, :id => client_applications(:normal_user_app).id }, { :user => user }
+      delete :destroy, { :display_name => user.display_name, :id => other_client.id }, { :user => user }

     end
     assert_response :not_found
     assert_template "not_found"
     end
     assert_response :not_found
     assert_template "not_found"