Merge remote-tracking branch 'upstream/pull/4586'

diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb
index b2f14a127ea163d29f0d7bb2a5c7534027872db9..5a920349a077903c0372b1f1fbe4c176ab849bcb 100644 (file)
--- a/test/controllers/notes_controller_test.rb
+++ b/test/controllers/notes_controller_test.rb
@@ -40,14 +40,13 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
       create(:note_comment, :note => note, :author => second_user)
     end
 
-    # Note that the table rows include a header row
     get user_notes_path(:display_name => first_user.display_name)
     assert_response :success
-    assert_select "table.note_list tr", :count => 2
+    assert_select "table.note_list tbody tr", :count => 1
 
     get user_notes_path(:display_name => second_user.display_name)
     assert_response :success
-    assert_select "table.note_list tr", :count => 2
+    assert_select "table.note_list tbody tr", :count => 1
 
     get user_notes_path(:display_name => "non-existent")
     assert_response :not_found
@@ -56,11 +55,11 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
 
     get user_notes_path(:display_name => first_user.display_name)
     assert_response :success
-    assert_select "table.note_list tr", :count => 2
+    assert_select "table.note_list tbody tr", :count => 1
 
     get user_notes_path(:display_name => second_user.display_name)
     assert_response :success
-    assert_select "table.note_list tr", :count => 3
+    assert_select "table.note_list tbody tr", :count => 2
 
     get user_notes_path(:display_name => "non-existent")
     assert_response :not_found
@@ -75,11 +74,11 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
 
     get user_notes_path(:display_name => user.display_name)
     assert_response :success
-    assert_select "table.note_list tr", :count => 11
+    assert_select "table.note_list tbody tr", :count => 10
 
     get user_notes_path(:display_name => user.display_name, :page => 2)
     assert_response :success
-    assert_select "table.note_list tr", :count => 11
+    assert_select "table.note_list tbody tr", :count => 10
   end
 
   def test_empty_page

diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb
index 9aafa3001931d79653c042576f7bba218ffbb9b2..b74e3de460283c4ce1bb662f890ca29a34d138b5 100644 (file)
--- a/test/controllers/user_blocks_controller_test.rb
+++ b/test/controllers/user_blocks_controller_test.rb
@@ -88,14 +88,14 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
 
     get user_blocks_path
     assert_response :success
-    assert_select "table#block_list", :count => 1 do
-      assert_select "tr", :count => 21
+    assert_select "table#block_list tbody", :count => 1 do
+      assert_select "tr", :count => 20
     end
 
     get user_blocks_path(:page => 2)
     assert_response :success
-    assert_select "table#block_list", :count => 1 do
-      assert_select "tr", :count => 21
+    assert_select "table#block_list tbody", :count => 1 do
+      assert_select "tr", :count => 20
     end
   end
 
@@ -513,14 +513,14 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
 
     get user_blocks_on_path(:display_name => user.display_name)
     assert_response :success
-    assert_select "table#block_list", :count => 1 do
-      assert_select "tr", :count => 21
+    assert_select "table#block_list tbody", :count => 1 do
+      assert_select "tr", :count => 20
     end
 
     get user_blocks_on_path(:display_name => user.display_name, :page => 2)
     assert_response :success
-    assert_select "table#block_list", :count => 1 do
-      assert_select "tr", :count => 21
+    assert_select "table#block_list tbody", :count => 1 do
+      assert_select "tr", :count => 20
     end
   end
 
@@ -572,14 +572,14 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
 
     get user_blocks_by_path(:display_name => user.display_name)
     assert_response :success
-    assert_select "table#block_list", :count => 1 do
-      assert_select "tr", :count => 21
+    assert_select "table#block_list tbody", :count => 1 do
+      assert_select "tr", :count => 20
     end
 
     get user_blocks_by_path(:display_name => user.display_name, :page => 2)
     assert_response :success
-    assert_select "table#block_list", :count => 1 do
-      assert_select "tr", :count => 21
+    assert_select "table#block_list tbody", :count => 1 do
+      assert_select "tr", :count => 20
     end
   end
 end

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 2db0f43b334531a4028e8035d3425cafb9bcb67c..a8feab6d22848ce9b2ad80224bfaf2c11f0dbbab 100644 (file)
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -618,19 +618,19 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     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
-    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
-    assert_select "table#user_list tr", :count => 1 + 1
+    assert_select "table#user_list tbody tr", :count => 1
   end
 
   def test_index_get_paginated
@@ -648,17 +648,17 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     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
-    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
-    assert_select "table#user_list tr", :count => 3
+    assert_select "table#user_list tbody tr", :count => 2
   end
 
   def test_index_post_confirm