X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/eab2eeaa47b2aa8c7f52371f9bfdd60711a41fb6..1a1d924ae060f82567599b25b090a729d5c721e9:/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 a1df9f0f2..76f366e3d 100644
--- a/test/controllers/oauth_clients_controller_test.rb
+++ b/test/controllers/oauth_clients_controller_test.rb
@@ -1,8 +1,6 @@
-require 'test_helper'
+require "test_helper"
 
 class OauthClientsControllerTest < ActionController::TestCase
-  fixtures :users, :client_applications
-
   ##
   # test all routes which lead to this controller
   def test_routes
@@ -37,9 +35,10 @@ class OauthClientsControllerTest < ActionController::TestCase
   end
 
   def test_index
-    user = users(:public_user)
+    user = create(: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))
 
@@ -50,9 +49,9 @@ class OauthClientsControllerTest < ActionController::TestCase
   end
 
   def test_new
-    user = users(:public_user)
+    user = create(: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))
 
@@ -71,10 +70,10 @@ class OauthClientsControllerTest < ActionController::TestCase
   end
 
   def test_create
-    user = users(:public_user)
+    user = create(: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
 
@@ -82,15 +81,13 @@ class OauthClientsControllerTest < ActionController::TestCase
       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"  
-    
+    assert_template "new"
+
     assert_difference "ClientApplication.count", 1 do
       post :create, {
         :display_name => user.display_name,
@@ -98,23 +95,22 @@ class OauthClientsControllerTest < ActionController::TestCase
           :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)
+    assert_redirected_to oauth_client_path(:id => ClientApplication.find_by(:name => "Test Application").id)
   end
 
   def test_show
-    user = users(:public_user)
-    client = client_applications(:oauth_web_app)
+    user = create(:user)
+    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))
 
-    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"
 
@@ -124,14 +120,15 @@ class OauthClientsControllerTest < ActionController::TestCase
   end
 
   def test_edit
-    user = users(:public_user)
-    client = client_applications(:oauth_web_app)
+    user = create(:user)
+    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))
 
-    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"
 
@@ -150,54 +147,52 @@ class OauthClientsControllerTest < ActionController::TestCase
   end
 
   def test_update
-    user = users(:public_user)
-    client = client_applications(:oauth_web_app)
+    user = create(:user)
+    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
 
-    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"
 
     put :update, {
-      :display_name => user.display_name, 
+      :display_name => user.display_name,
       :id => client.id,
       :client_application => {
         :name => "New Name",
         :url => nil
       }
-    }, {
-      :user => user
-    }
+    }, { :user => user }
     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"
       }
-    }, {
-      :user => user
-    }
+    }, { :user => 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)
+    user = create(:user)
+    client = create(:client_application, :user => user)
+    other_client = create(:client_application)
 
     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
-      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"