X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/037585db3933a2954b43bd4b30ea5e30ade00be2..3123822bba5865e81e8c10be16452a0a8b5362f9:/test/controllers/browse_controller_test.rb

diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb
index d0cbeb796..661d06401 100644
--- a/test/controllers/browse_controller_test.rb
+++ b/test/controllers/browse_controller_test.rb
@@ -85,32 +85,43 @@ class BrowseControllerTest < ActionController::TestCase
   end
 
   def test_read_note
-    browse_check "note", notes(:open_note).id, "browse/note"
+    open_note = create(:note)
+    create(:note_comment, :note => open_note)
+
+    browse_check "note", open_note.id, "browse/note"
   end
 
   def test_read_hidden_note
-    get :note, :id => notes(:hidden_note_with_comment).id
+    hidden_note_with_comment = create(:note, :status => "hidden")
+    create(:note_comment, :note => hidden_note_with_comment)
+
+    get :note, :id => hidden_note_with_comment.id
     assert_response :not_found
     assert_template "browse/not_found"
     assert_template :layout => "map"
 
-    xhr :get, :note, :id => notes(:hidden_note_with_comment).id
+    xhr :get, :note, :id => hidden_note_with_comment.id
     assert_response :not_found
     assert_template "browse/not_found"
     assert_template :layout => "xhr"
 
     session[:user] = users(:moderator_user).id
 
-    browse_check "note", notes(:hidden_note_with_comment).id, "browse/note"
+    browse_check "note", hidden_note_with_comment.id, "browse/note"
   end
 
   def test_read_note_hidden_comments
-    browse_check "note", notes(:note_with_hidden_comment).id, "browse/note"
+    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)
+
+    browse_check "note", note_with_hidden_comment.id, "browse/note"
     assert_select "div.note-comments ul li", :count => 1
 
     session[:user] = users(:moderator_user).id
 
-    browse_check "note", notes(:note_with_hidden_comment).id, "browse/note"
+    browse_check "note", note_with_hidden_comment.id, "browse/note"
     assert_select "div.note-comments ul li", :count => 2
   end