X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e731dd71a77ad4ad1e9db22535e89444bb98e5d9..4c21a09b32f3335be2c8d7c70f6b3c4adabfb63d:/test/controllers/notes_controller_test.rb?ds=sidebyside

diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb
index 82821de6c..5ecece0f4 100644
--- a/test/controllers/notes_controller_test.rb
+++ b/test/controllers/notes_controller_test.rb
@@ -1,7 +1,8 @@
 require "test_helper"
 
-class NotesControllerTest < ActionController::TestCase
+class NotesControllerTest < ActionDispatch::IntegrationTest
   def setup
+    super
     # Stub nominatim response for note locations
     stub_request(:get, %r{^https://nominatim\.openstreetmap\.org/reverse\?})
       .to_return(:status => 404)
@@ -12,11 +13,19 @@ class NotesControllerTest < ActionController::TestCase
   def test_routes
     assert_routing(
       { :path => "/user/username/notes", :method => :get },
-      { :controller => "notes", :action => "mine", :display_name => "username" }
+      { :controller => "notes", :action => "index", :display_name => "username" }
+    )
+    assert_routing(
+      { :path => "/note/1", :method => :get },
+      { :controller => "notes", :action => "show", :id => "1" }
+    )
+    assert_routing(
+      { :path => "/note/new", :method => :get },
+      { :controller => "notes", :action => "new" }
     )
   end
 
-  def test_mine_success
+  def test_index_success
     first_user = create(:user)
     second_user = create(:user)
     moderator_user = create(:moderator_user)
@@ -31,45 +40,129 @@ class NotesControllerTest < ActionController::TestCase
       create(:note_comment, :note => note, :author => second_user)
     end
 
-    # Note that the table rows include a header row
-    get :mine, :params => { :display_name => first_user.display_name }
+    get user_notes_path(first_user)
     assert_response :success
-    assert_select "table.note_list tr", :count => 2
+    assert_select ".content-heading a[href='#{user_path first_user}']", :text => first_user.display_name
+    assert_select "table.note_list tbody tr", :count => 1
 
-    get :mine, :params => { :display_name => second_user.display_name }
+    get user_notes_path(second_user)
     assert_response :success
-    assert_select "table.note_list tr", :count => 2
+    assert_select ".content-heading a[href='#{user_path second_user}']", :text => second_user.display_name
+    assert_select "table.note_list tbody tr", :count => 1
 
-    get :mine, :params => { :display_name => "non-existent" }
+    get user_notes_path("non-existent")
     assert_response :not_found
 
-    session[:user] = moderator_user.id
+    session_for(moderator_user)
 
-    get :mine, :params => { :display_name => first_user.display_name }
+    get user_notes_path(first_user)
     assert_response :success
-    assert_select "table.note_list tr", :count => 2
+    assert_select "table.note_list tbody tr", :count => 1
 
-    get :mine, :params => { :display_name => second_user.display_name }
+    get user_notes_path(second_user)
     assert_response :success
-    assert_select "table.note_list tr", :count => 3
+    assert_select "table.note_list tbody tr", :count => 2
 
-    get :mine, :params => { :display_name => "non-existent" }
+    get user_notes_path("non-existent")
     assert_response :not_found
   end
 
-  def test_mine_paged
+  def test_index_paged
     user = create(:user)
 
     create_list(:note, 50) do |note|
       create(:note_comment, :note => note, :author => user)
     end
 
-    get :mine, :params => { :display_name => user.display_name }
+    get user_notes_path(user)
+    assert_response :success
+    assert_select "table.note_list tbody tr", :count => 10
+
+    get user_notes_path(user, :page => 2)
     assert_response :success
-    assert_select "table.note_list tr", :count => 11
+    assert_select "table.note_list tbody tr", :count => 10
+  end
+
+  def test_empty_page
+    user = create(:user)
+    get user_notes_path(user)
+    assert_response :success
+    assert_select "h4", :html => "No notes"
+  end
+
+  def test_read_note
+    open_note = create(:note_with_comments)
+
+    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(hidden_note_with_comment)
+    assert_response :not_found
+    assert_template "browse/not_found"
+    assert_template :layout => "map"
+
+    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))
+
+    sidebar_browse_check :note_path, hidden_note_with_comment.id, "notes/show"
+  end
+
+  def test_read_note_hidden_comments
+    note_with_hidden_comment = create(:note_with_comments, :comments_count => 2) do |note|
+      create(:note_comment, :note => note, :visible => false)
+    end
+
+    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))
+
+    sidebar_browse_check :note_path, note_with_hidden_comment.id, "notes/show"
+    assert_select "div.note-comments ul li", :count => 2
+  end
+
+  def test_read_note_hidden_user_comment
+    hidden_user = create(:user, :deleted)
+    note_with_hidden_user_comment = create(:note_with_comments, :comments_count => 2) do |note|
+      create(:note_comment, :note => note, :author => hidden_user)
+    end
+
+    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))
+
+    sidebar_browse_check :note_path, note_with_hidden_user_comment.id, "notes/show"
+    assert_select "div.note-comments ul li", :count => 1
+  end
+
+  def test_read_closed_note
+    user = create(:user)
+    closed_note = create(:note_with_comments, :closed, :closed_by => user, :comments_count => 2)
+
+    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}/
+
+    user.soft_destroy!
+
+    reset!
+
+    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
 
-    get :mine, :params => { :display_name => user.display_name, :page => 2 }
+  def test_new_note
+    get new_note_path
     assert_response :success
-    assert_select "table.note_list tr", :count => 11
+    assert_template "notes/new"
   end
 end