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

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

diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb
index 5cffbd702f8ebcfbf4b8eabe09094462e5ca1b0a..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
 
       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
     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
 
     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
 
     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
 
     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
 
     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
 
     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
 
     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
 
     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
   end
 
   def test_empty_page


@@ -144,9 +143,7 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
 
   def test_read_closed_note
     user = create(:user)
 
   def test_read_closed_note
     user = create(:user)

-    closed_note = create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc, :comments_count => 2) do |note|
-      create(:note_comment, :event => "closed", :note => note, :author => user)
-    end
+    closed_note = create(:note_with_comments, :closed, :closed_by => user, :comments_count => 2)

 
     browse_check :note_path, closed_note.id, "notes/show"
     assert_select "div.note-comments ul li", :count => 2
 
     browse_check :note_path, closed_note.id, "notes/show"
     assert_select "div.note-comments ul li", :count => 2