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

[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 f4e157f6607e082e13c3deefabb1c53237da044f..19f60035b89dc9fcc91b29315a794dbdf6be2328 100644 (file)
--- a/test/controllers/browse_controller_test.rb
+++ b/test/controllers/browse_controller_test.rb
@@ -75,10 +75,13 @@ 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
 

-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id

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


@@ -103,7 +106,7 @@ class BrowseControllerTest < ActionController::TestCase
     assert_template "browse/not_found"
     assert_template :layout => "xhr"
 
     assert_template "browse/not_found"
     assert_template :layout => "xhr"
 

-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id

 
     browse_check "note", hidden_note_with_comment.id, "browse/note"
   end
 
     browse_check "note", hidden_note_with_comment.id, "browse/note"
   end


@@ -116,7 +119,7 @@ class BrowseControllerTest < ActionController::TestCase
     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
 

-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id

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