Merge remote-tracking branch 'openstreetmap/pull/1426'

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

diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb
index 661d0640172092ca9a054f71b35c4278ecbc4032..c5f1eef5c93bc1d1327707e296e91757596588dd 100644 (file)
--- a/test/controllers/browse_controller_test.rb
+++ b/test/controllers/browse_controller_test.rb
@@ -75,6 +75,9 @@ class BrowseControllerTest < ActionController::TestCase
   end
 
   def test_read_changeset_hidden_comments
   end
 
   def test_read_changeset_hidden_comments

+    create_list(:changeset_comment, 3)
+    create(:changeset_comment, :visible => false)
+

     browse_check "changeset", changesets(:normal_user_closed_change).id, "browse/changeset"
     assert_select "div.changeset-comments ul li", :count => 3
 
     browse_check "changeset", changesets(:normal_user_closed_change).id, "browse/changeset"
     assert_select "div.changeset-comments ul li", :count => 3
 


@@ -85,15 +88,13 @@ class BrowseControllerTest < ActionController::TestCase
   end
 
   def test_read_note
   end
 
   def test_read_note

-    open_note = create(:note)
-    create(:note_comment, :note => open_note)
+    open_note = create(:note_with_comments)

 
     browse_check "note", open_note.id, "browse/note"
   end
 
   def test_read_hidden_note
 
     browse_check "note", open_note.id, "browse/note"
   end
 
   def test_read_hidden_note

-    hidden_note_with_comment = create(:note, :status => "hidden")
-    create(:note_comment, :note => hidden_note_with_comment)
+    hidden_note_with_comment = create(:note_with_comments, :status => "hidden")

 
     get :note, :id => hidden_note_with_comment.id
     assert_response :not_found
 
     get :note, :id => hidden_note_with_comment.id
     assert_response :not_found


@@ -111,10 +112,9 @@ class BrowseControllerTest < ActionController::TestCase
   end
 
   def test_read_note_hidden_comments
   end
 
   def test_read_note_hidden_comments

-    note_with_hidden_comment = create(:note)
-    create(:note_comment, :note => note_with_hidden_comment)
-    create(:note_comment, :note => note_with_hidden_comment)
-    create(:note_comment, :note => note_with_hidden_comment, :visible => false)
+    note_with_hidden_comment = create(:note_with_comments, :comments_count => 2) do |note|
+      create(:note_comment, :note => note, :visible => false)
+    end

 
     browse_check "note", note_with_hidden_comment.id, "browse/note"
     assert_select "div.note-comments ul li", :count => 1
 
     browse_check "note", note_with_hidden_comment.id, "browse/note"
     assert_select "div.note-comments ul li", :count => 1