Merge remote-tracking branch 'openstreetmap/pull/1347' into master

[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 d0cbeb796a9593fb425b0be53fba45f2f8f33d98..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,32 +88,40 @@ class BrowseControllerTest < ActionController::TestCase
   end
 
   def test_read_note
   end
 
   def test_read_note

-    browse_check "note", notes(:open_note).id, "browse/note"
+    open_note = create(:note_with_comments)
+
+    browse_check "note", open_note.id, "browse/note"

   end
 
   def test_read_hidden_note
   end
 
   def test_read_hidden_note

-    get :note, :id => notes(:hidden_note_with_comment).id
+    hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
+
+    get :note, :id => hidden_note_with_comment.id

     assert_response :not_found
     assert_template "browse/not_found"
     assert_template :layout => "map"
 
     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
 
     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
   end
 
   def test_read_note_hidden_comments

-    browse_check "note", notes(:note_with_hidden_comment).id, "browse/note"
+    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
 
     session[:user] = users(:moderator_user).id
 
     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
 
     assert_select "div.note-comments ul li", :count => 2
   end