X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/32ab099c3504c0a9de14ae857c0fe76990bdfc37..4c21a09b32f3335be2c8d7c70f6b3c4adabfb63d:/test/controllers/notes_controller_test.rb

diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb
index 99886c80f..5ecece0f4 100644
--- a/test/controllers/notes_controller_test.rb
+++ b/test/controllers/notes_controller_test.rb
@@ -93,25 +93,25 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
   def test_read_note
     open_note = create(:note_with_comments)
 
-    browse_check :note_path, open_note.id, "notes/show"
+    sidebar_browse_check :note_path, open_note.id, "notes/show"
   end
 
   def test_read_hidden_note
     hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
 
-    get note_path(:id => hidden_note_with_comment)
+    get note_path(hidden_note_with_comment)
     assert_response :not_found
     assert_template "browse/not_found"
     assert_template :layout => "map"
 
-    get note_path(:id => hidden_note_with_comment), :xhr => true
+    get note_path(hidden_note_with_comment), :xhr => true
     assert_response :not_found
     assert_template "browse/not_found"
     assert_template :layout => "xhr"
 
     session_for(create(:moderator_user))
 
-    browse_check :note_path, hidden_note_with_comment.id, "notes/show"
+    sidebar_browse_check :note_path, hidden_note_with_comment.id, "notes/show"
   end
 
   def test_read_note_hidden_comments
@@ -119,12 +119,12 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
       create(:note_comment, :note => note, :visible => false)
     end
 
-    browse_check :note_path, note_with_hidden_comment.id, "notes/show"
+    sidebar_browse_check :note_path, note_with_hidden_comment.id, "notes/show"
     assert_select "div.note-comments ul li", :count => 1
 
     session_for(create(:moderator_user))
 
-    browse_check :note_path, note_with_hidden_comment.id, "notes/show"
+    sidebar_browse_check :note_path, note_with_hidden_comment.id, "notes/show"
     assert_select "div.note-comments ul li", :count => 2
   end
 
@@ -134,12 +134,12 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
       create(:note_comment, :note => note, :author => hidden_user)
     end
 
-    browse_check :note_path, note_with_hidden_user_comment.id, "notes/show"
+    sidebar_browse_check :note_path, note_with_hidden_user_comment.id, "notes/show"
     assert_select "div.note-comments ul li", :count => 1
 
     session_for(create(:moderator_user))
 
-    browse_check :note_path, note_with_hidden_user_comment.id, "notes/show"
+    sidebar_browse_check :note_path, note_with_hidden_user_comment.id, "notes/show"
     assert_select "div.note-comments ul li", :count => 1
   end
 
@@ -147,7 +147,7 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
     user = create(:user)
     closed_note = create(:note_with_comments, :closed, :closed_by => user, :comments_count => 2)
 
-    browse_check :note_path, closed_note.id, "notes/show"
+    sidebar_browse_check :note_path, closed_note.id, "notes/show"
     assert_select "div.note-comments ul li", :count => 2
     assert_select "div.details", /Resolved by #{user.display_name}/
 
@@ -155,7 +155,7 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
 
     reset!
 
-    browse_check :note_path, closed_note.id, "notes/show"
+    sidebar_browse_check :note_path, closed_note.id, "notes/show"
     assert_select "div.note-comments ul li", :count => 1
     assert_select "div.details", /Resolved by deleted/
   end
@@ -165,42 +165,4 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "notes/new"
   end
-
-  private
-
-  # This is a convenience method for most of the above checks
-  # First we check that when we don't have an id, it will correctly return a 404
-  # then we check that we get the correct 404 when a non-existant id is passed
-  # then we check that it will get a successful response, when we do pass an id
-  def browse_check(path, id, template)
-    path_method = method(path)
-
-    assert_raise ActionController::UrlGenerationError do
-      get path_method.call
-    end
-
-    # assert_raise ActionController::UrlGenerationError do
-    #   get path_method.call(:id => -10) # we won't have an id that's negative
-    # end
-
-    get path_method.call(:id => 0)
-    assert_response :not_found
-    assert_template "browse/not_found"
-    assert_template :layout => "map"
-
-    get path_method.call(:id => 0), :xhr => true
-    assert_response :not_found
-    assert_template "browse/not_found"
-    assert_template :layout => "xhr"
-
-    get path_method.call(:id => id)
-    assert_response :success
-    assert_template template
-    assert_template :layout => "map"
-
-    get path_method.call(:id => id), :xhr => true
-    assert_response :success
-    assert_template template
-    assert_template :layout => "xhr"
-  end
 end