Add JSHint to travis configuration

[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 a1df9f0f2a7db0f8654ecf1aaa2f640d83f1179f..1c3c14f86a632d03f51c51ae125361a85dc53f5e 100644 (file)
--- a/test/controllers/oauth_clients_controller_test.rb
+++ b/test/controllers/oauth_clients_controller_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"

 
 class OauthClientsControllerTest < ActionController::TestCase
   fixtures :users, :client_applications
 
 class OauthClientsControllerTest < ActionController::TestCase
   fixtures :users, :client_applications


@@ -39,7 +39,7 @@ class OauthClientsControllerTest < ActionController::TestCase
   def test_index
     user = users(:public_user)
 
   def test_index
     user = users(:public_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 +52,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 +74,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,15 +82,13 @@ 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
     end
     assert_response :success

-    assert_template "new"  
-    
+    assert_template "new"
+

     assert_difference "ClientApplication.count", 1 do
       post :create, {
         :display_name => user.display_name,
     assert_difference "ClientApplication.count", 1 do
       post :create, {
         :display_name => user.display_name,


@@ -98,9 +96,7 @@ 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
     assert_redirected_to oauth_client_path(:id => ClientApplication.find_by_name("Test Application").id)
     end
     assert_response :redirect
     assert_redirected_to oauth_client_path(:id => ClientApplication.find_by_name("Test Application").id)


@@ -110,7 +106,7 @@ class OauthClientsControllerTest < ActionController::TestCase
     user = users(:public_user)
     client = client_applications(:oauth_web_app)
 
     user = users(:public_user)
     client = client_applications(:oauth_web_app)
 

-    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))
 


@@ -127,7 +123,7 @@ class OauthClientsControllerTest < ActionController::TestCase
     user = users(:public_user)
     client = client_applications(:oauth_web_app)
 
     user = users(:public_user)
     client = client_applications(:oauth_web_app)
 

-    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))
 


@@ -153,7 +149,7 @@ class OauthClientsControllerTest < ActionController::TestCase
     user = users(:public_user)
     client = client_applications(:oauth_web_app)
 
     user = users(:public_user)
     client = client_applications(:oauth_web_app)
 

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

     assert_response :forbidden
 
     put :update, { :display_name => user.display_name, :id => client_applications(:normal_user_app).id }, { :user => user }
     assert_response :forbidden
 
     put :update, { :display_name => user.display_name, :id => client_applications(:normal_user_app).id }, { :user => user }


@@ -161,28 +157,24 @@ class OauthClientsControllerTest < ActionController::TestCase
     assert_template "not_found"
 
     put :update, {
     assert_template "not_found"
 
     put :update, {

-      :display_name => user.display_name, 
+      :display_name => user.display_name,

       :id => client.id,
       :client_application => {
         :name => "New Name",
         :url => nil
       }
       :id => client.id,
       :client_application => {
         :name => "New Name",
         :url => nil
       }

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

     assert_response :success
     assert_template "edit"
 
     put :update, {
     assert_response :success
     assert_template "edit"
 
     put :update, {

-      :display_name => user.display_name, 
+      :display_name => user.display_name,

       :id => client.id,
       :client_application => {
         :name => "New Name",
         :url => "http://new.example.com/url"
       }
       :id => client.id,
       :client_application => {
         :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
     assert_response :redirect
     assert_redirected_to oauth_client_path(:id => client.id)
   end


@@ -192,7 +184,7 @@ class OauthClientsControllerTest < ActionController::TestCase
     client = client_applications(:oauth_web_app)
 
     assert_difference "ClientApplication.count", 0 do
     client = client_applications(:oauth_web_app)
 
     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
 
     end
     assert_response :forbidden