Replace lookup_user_by_id with load_resource

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

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 2db0f43b334531a4028e8035d3425cafb9bcb67c..4ff9e76f6763bf4e967bc5b80b9ecd6f0eac68e9 100644 (file)
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -416,7 +416,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
   # information for the user
   def test_show
     # Test a non-existent user
   # information for the user
   def test_show
     # Test a non-existent user

-    get user_path(:display_name => "unknown")
+    get user_path("unknown")

     assert_response :not_found
 
     # Test a normal user
     assert_response :not_found
 
     # Test a normal user


@@ -618,19 +618,19 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     get users_path
     assert_response :success
     assert_template :index
     get users_path
     assert_response :success
     assert_template :index

-    assert_select "table#user_list tr", :count => 7 + 1
+    assert_select "table#user_list tbody tr", :count => 7

 
     # Should be able to limit by status
     get users_path, :params => { :status => "suspended" }
     assert_response :success
     assert_template :index
 
     # Should be able to limit by status
     get users_path, :params => { :status => "suspended" }
     assert_response :success
     assert_template :index

-    assert_select "table#user_list tr", :count => 1 + 1
+    assert_select "table#user_list tbody tr", :count => 1

 
     # Should be able to limit by IP address
     get users_path, :params => { :ip => "1.2.3.4" }
     assert_response :success
     assert_template :index
 
     # Should be able to limit by IP address
     get users_path, :params => { :ip => "1.2.3.4" }
     assert_response :success
     assert_template :index

-    assert_select "table#user_list tr", :count => 1 + 1
+    assert_select "table#user_list tbody tr", :count => 1

   end
 
   def test_index_get_paginated
   end
 
   def test_index_get_paginated


@@ -648,17 +648,17 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     get users_path
     assert_response :success
     assert_template :index
     get users_path
     assert_response :success
     assert_template :index

-    assert_select "table#user_list tr", :count => 51
+    assert_select "table#user_list tbody tr", :count => 50

 
     get users_path, :params => { :page => 2 }
     assert_response :success
     assert_template :index
 
     get users_path, :params => { :page => 2 }
     assert_response :success
     assert_template :index

-    assert_select "table#user_list tr", :count => 51
+    assert_select "table#user_list tbody tr", :count => 50

 
     get users_path, :params => { :page => 3 }
     assert_response :success
     assert_template :index
 
     get users_path, :params => { :page => 3 }
     assert_response :success
     assert_template :index

-    assert_select "table#user_list tr", :count => 3
+    assert_select "table#user_list tbody tr", :count => 2

   end
 
   def test_index_post_confirm
   end
 
   def test_index_post_confirm