X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/03408b6294e0aa56d46823c1f44d47aaf69e226b..de29e9b3f59d7a06fbe2e32096328bd8a6ed2b3a:/test/controllers/diary_entry_controller_test.rb

diff --git a/test/controllers/diary_entry_controller_test.rb b/test/controllers/diary_entry_controller_test.rb
index 58fffb8d3..edff90625 100644
--- a/test/controllers/diary_entry_controller_test.rb
+++ b/test/controllers/diary_entry_controller_test.rb
@@ -7,7 +7,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     # Create the default language for diary entries
     create(:language, :code => "en")
     # Stub nominatim response for diary entry locations
-    stub_request(:get, %r{^http://nominatim\.openstreetmap\.org/reverse\?})
+    stub_request(:get, %r{^https://nominatim\.openstreetmap\.org/reverse\?})
       .to_return(:status => 404)
   end
 
@@ -16,23 +16,23 @@ class DiaryEntryControllerTest < ActionController::TestCase
   def test_routes
     assert_routing(
       { :path => "/diary", :method => :get },
-      { :controller => "diary_entry", :action => "list" }
+      { :controller => "diary_entry", :action => "index" }
     )
     assert_routing(
       { :path => "/diary/language", :method => :get },
-      { :controller => "diary_entry", :action => "list", :language => "language" }
+      { :controller => "diary_entry", :action => "index", :language => "language" }
     )
     assert_routing(
       { :path => "/user/username/diary", :method => :get },
-      { :controller => "diary_entry", :action => "list", :display_name => "username" }
+      { :controller => "diary_entry", :action => "index", :display_name => "username" }
     )
     assert_routing(
       { :path => "/diary/friends", :method => :get },
-      { :controller => "diary_entry", :action => "list", :friends => true }
+      { :controller => "diary_entry", :action => "index", :friends => true }
     )
     assert_routing(
       { :path => "/diary/nearby", :method => :get },
-      { :controller => "diary_entry", :action => "list", :nearby => true }
+      { :controller => "diary_entry", :action => "index", :nearby => true }
     )
 
     assert_routing(
@@ -67,7 +67,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     )
     assert_routing(
       { :path => "/user/username/diary/1", :method => :get },
-      { :controller => "diary_entry", :action => "view", :display_name => "username", :id => "1" }
+      { :controller => "diary_entry", :action => "show", :display_name => "username", :id => "1" }
     )
     assert_routing(
       { :path => "/user/username/diary/1/edit", :method => :get },
@@ -170,7 +170,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
            :session => { :user => user.id }
     end
     assert_response :redirect
-    assert_redirected_to :action => :list, :display_name => user.display_name
+    assert_redirected_to :action => :index, :display_name => user.display_name
     entry = DiaryEntry.order(:id).last
     assert_equal user.id, entry.user_id
     assert_equal "New Title", entry.title
@@ -198,7 +198,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
            :session => { :user => user.id }
     end
     assert_response :redirect
-    assert_redirected_to :action => :list, :display_name => user.display_name
+    assert_redirected_to :action => :index, :display_name => user.display_name
     entry = DiaryEntry.order(:id).last
     assert_equal user.id, entry.user_id
     assert_equal "New Title", entry.title
@@ -227,7 +227,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
            :session => { :user => user.id }
     end
     assert_response :redirect
-    assert_redirected_to :action => :list, :display_name => user.display_name
+    assert_redirected_to :action => :index, :display_name => user.display_name
     entry = DiaryEntry.order(:id).last
     assert_equal user.id, entry.user_id
     assert_equal spammy_title, entry.title
@@ -236,7 +236,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_equal "suspended", User.find(user.id).status
 
     # Follow the redirect
-    get :list,
+    get :index,
         :params => { :display_name => user.display_name },
         :session => { :user => user }
     assert_response :redirect
@@ -254,7 +254,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     get :edit,
         :params => { :display_name => entry.user.display_name, :id => entry.id }
     assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :referer => "/user/#{URI.encode(entry.user.display_name)}/diary/#{entry.id}/edit"
+    assert_redirected_to :controller => :user, :action => :login, :referer => "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit"
 
     # Verify that you get a not found error, when you pass a bogus id
     get :edit,
@@ -265,13 +265,13 @@ class DiaryEntryControllerTest < ActionController::TestCase
       assert_select "h2", :text => "No entry with the id: 9999", :count => 1
     end
 
-    # Verify that you get redirected to view if you are not the user
+    # Verify that you get redirected to show if you are not the user
     # that created the entry
     get :edit,
         :params => { :display_name => entry.user.display_name, :id => entry.id },
         :session => { :user => other_user }
     assert_response :redirect
-    assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id
+    assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
 
     # Now pass the id, and check that you can edit it, when using the same
     # user as the person who created the entry
@@ -284,7 +284,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
       assert_select "h1", :text => /Edit diary entry/, :count => 1
     end
     assert_select "div#content", :count => 1 do
-      assert_select "form[action='/user/#{URI.encode(entry.user.display_name)}/diary/#{entry.id}/edit'][method=post]", :count => 1 do
+      assert_select "form[action='/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit'][method=post]", :count => 1 do
         assert_select "input#diary_entry_title[name='diary_entry[title]'][value='#{entry.title}']", :count => 1
         assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => entry.body, :count => 1
         assert_select "select#diary_entry_language_code", :count => 1
@@ -309,14 +309,14 @@ class DiaryEntryControllerTest < ActionController::TestCase
                                         :longitude => new_longitude, :language_code => new_language_code } },
          :session => { :user => entry.user.id }
     assert_response :redirect
-    assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id
+    assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
 
     # Now check that the new data is rendered, when logged in
-    get :view,
+    get :show,
         :params => { :display_name => entry.user.display_name, :id => entry.id },
         :session => { :user => entry.user }
     assert_response :success
-    assert_template "diary_entry/view"
+    assert_template "diary_entry/show"
     assert_select "title", :text => /Users' diaries | /, :count => 1
     assert_select "div.content-heading", :count => 1 do
       assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1
@@ -329,15 +329,15 @@ class DiaryEntryControllerTest < ActionController::TestCase
       assert_select "abbr[class='geo'][title='#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}']", :count => 1
       # As we're not logged in, check that you cannot edit
       # print @response.body
-      assert_select "a[href='/user/#{URI.encode(entry.user.display_name)}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
+      assert_select "a[href='/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
     end
 
     # and when not logged in as the user who wrote the entry
-    get :view,
+    get :show,
         :params => { :display_name => entry.user.display_name, :id => entry.id },
-        :session => { :user => entry.user }
+        :session => { :user => create(:user) }
     assert_response :success
-    assert_template "diary_entry/view"
+    assert_template "diary_entry/show"
     assert_select "title", :text => /Users' diaries | /, :count => 1
     assert_select "div.content-heading", :count => 1 do
       assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1
@@ -349,9 +349,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
       assert_select "p", :text => /#{new_body}/, :count => 1
       assert_select "abbr[class=geo][title='#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}']", :count => 1
       # As we're not logged in, check that you cannot edit
-      assert_select "li[class='hidden show_if_user_#{entry.user.id}']", :count => 1 do
-        assert_select "a[href='/user/#{URI.encode(entry.user.display_name)}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
-      end
+      assert_select "a[href='/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit']", false
     end
   end
 
@@ -399,7 +397,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
       end
     end
     assert_response :success
-    assert_template :view
+    assert_template :show
 
     # Now try again with the right id
     assert_difference "ActionMailer::Base.deliveries.size", entry.subscribers.count do
@@ -412,25 +410,25 @@ class DiaryEntryControllerTest < ActionController::TestCase
       end
     end
     assert_response :redirect
-    assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id
+    assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
     email = ActionMailer::Base.deliveries.first
     assert_equal [user.email], email.to
     assert_equal "[OpenStreetMap] #{other_user.display_name} commented on a diary entry", email.subject
-    assert_match /New comment/, email.text_part.decoded
-    assert_match /New comment/, email.html_part.decoded
+    assert_match(/New comment/, email.text_part.decoded)
+    assert_match(/New comment/, email.html_part.decoded)
     ActionMailer::Base.deliveries.clear
     comment = DiaryComment.order(:id).last
     assert_equal entry.id, comment.diary_entry_id
     assert_equal other_user.id, comment.user_id
     assert_equal "New comment", comment.body
 
-    # Now view the diary entry, and check the new comment is present
-    get :view,
+    # Now show the diary entry, and check the new comment is present
+    get :show,
         :params => { :display_name => entry.user.display_name, :id => entry.id }
     assert_response :success
     assert_select ".diary-comment", :count => 1 do
       assert_select "#comment#{comment.id}", :count => 1 do
-        assert_select "a[href='/user/#{URI.encode(other_user.display_name)}']", :text => other_user.display_name, :count => 1
+        assert_select "a[href='/user/#{ERB::Util.u(other_user.display_name)}']", :text => other_user.display_name, :count => 1
       end
       assert_select ".richtext", :text => /New comment/, :count => 1
     end
@@ -458,7 +456,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
       end
     end
     assert_response :redirect
-    assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id
+    assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
     email = ActionMailer::Base.deliveries.first
     assert_equal [user.email], email.to
     assert_equal "[OpenStreetMap] #{other_user.display_name} commented on a diary entry", email.subject
@@ -472,30 +470,30 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_equal "suspended", User.find(other_user.id).status
 
     # Follow the redirect
-    get :list,
+    get :index,
         :params => { :display_name => user.display_name },
         :session => { :user => other_user }
     assert_response :redirect
     assert_redirected_to :controller => :user, :action => :suspended
 
-    # Now view the diary entry, and check the new comment is not present
-    get :view,
+    # Now show the diary entry, and check the new comment is not present
+    get :show,
         :params => { :display_name => entry.user.display_name, :id => entry.id }
     assert_response :success
     assert_select ".diary-comment", :count => 0
   end
 
-  def test_list_all
+  def test_index_all
     diary_entry = create(:diary_entry)
     geo_entry = create(:diary_entry, :latitude => 51.50763, :longitude => -0.10781)
     public_entry = create(:diary_entry, :user => create(:user))
 
     # Try a list of all diary entries
-    get :list
-    check_diary_list diary_entry, geo_entry, public_entry
+    get :index
+    check_diary_index diary_entry, geo_entry, public_entry
   end
 
-  def test_list_user
+  def test_index_user
     user = create(:user)
     other_user = create(:user)
 
@@ -504,16 +502,16 @@ class DiaryEntryControllerTest < ActionController::TestCase
     _other_entry = create(:diary_entry, :user => other_user)
 
     # Try a list of diary entries for a valid user
-    get :list, :params => { :display_name => user.display_name }
-    check_diary_list diary_entry, geo_entry
+    get :index, :params => { :display_name => user.display_name }
+    check_diary_index diary_entry, geo_entry
 
     # Try a list of diary entries for an invalid user
-    get :list, :params => { :display_name => "No Such User" }
+    get :index, :params => { :display_name => "No Such User" }
     assert_response :not_found
     assert_template "user/no_such_user"
   end
 
-  def test_list_friends
+  def test_index_friends
     user = create(:user)
     other_user = create(:user)
     friend = create(:friend, :befriender => user)
@@ -521,36 +519,36 @@ class DiaryEntryControllerTest < ActionController::TestCase
     _other_entry = create(:diary_entry, :user => other_user)
 
     # Try a list of diary entries for your friends when not logged in
-    get :list, :params => { :friends => true }
+    get :index, :params => { :friends => true }
     assert_response :redirect
     assert_redirected_to :controller => :user, :action => :login, :referer => "/diary/friends"
 
     # Try a list of diary entries for your friends when logged in
-    get :list, :params => { :friends => true }, :session => { :user => user }
-    check_diary_list diary_entry
-    get :list, :params => { :friends => true }, :session => { :user => other_user }
-    check_diary_list
+    get :index, :params => { :friends => true }, :session => { :user => user }
+    check_diary_index diary_entry
+    get :index, :params => { :friends => true }, :session => { :user => other_user }
+    check_diary_index
   end
 
-  def test_list_nearby
+  def test_index_nearby
     user = create(:user, :home_lat => 12, :home_lon => 12)
     nearby_user = create(:user, :home_lat => 11.9, :home_lon => 12.1)
 
     diary_entry = create(:diary_entry, :user => user)
 
     # Try a list of diary entries for nearby users when not logged in
-    get :list, :params => { :nearby => true }
+    get :index, :params => { :nearby => true }
     assert_response :redirect
     assert_redirected_to :controller => :user, :action => :login, :referer => "/diary/nearby"
 
     # Try a list of diary entries for nearby users when logged in
-    get :list, :params => { :nearby => true }, :session => { :user => nearby_user }
-    check_diary_list diary_entry
-    get :list, :params => { :nearby => true }, :session => { :user => user }
-    check_diary_list
+    get :index, :params => { :nearby => true }, :session => { :user => nearby_user }
+    check_diary_index diary_entry
+    get :index, :params => { :nearby => true }, :session => { :user => user }
+    check_diary_index
   end
 
-  def test_list_language
+  def test_index_language
     create(:language, :code => "de")
     create(:language, :code => "sl")
     diary_entry_en = create(:diary_entry, :language_code => "en")
@@ -558,16 +556,31 @@ class DiaryEntryControllerTest < ActionController::TestCase
     diary_entry_de = create(:diary_entry, :language_code => "de")
 
     # Try a list of diary entries in english
-    get :list, :params => { :language => "en" }
-    check_diary_list diary_entry_en, diary_entry_en2
+    get :index, :params => { :language => "en" }
+    check_diary_index diary_entry_en, diary_entry_en2
 
     # Try a list of diary entries in german
-    get :list, :params => { :language => "de" }
-    check_diary_list diary_entry_de
+    get :index, :params => { :language => "de" }
+    check_diary_index diary_entry_de
 
     # Try a list of diary entries in slovenian
-    get :list, :params => { :language => "sl" }
-    check_diary_list
+    get :index, :params => { :language => "sl" }
+    check_diary_index
+  end
+
+  def test_index_paged
+    # Create several pages worth of diary entries
+    create_list(:diary_entry, 50)
+
+    # Try and get the index
+    get :index
+    assert_response :success
+    assert_select "div.diary_post", :count => 20
+
+    # Try and get the second page
+    get :index, :params => { :page => 2 }
+    assert_response :success
+    assert_select "div.diary_post", :count => 20
   end
 
   def test_rss
@@ -645,34 +658,34 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_match "<title>&lt;script&gt;</title>", response.body
   end
 
-  def test_view
+  def test_show
     user = create(:user)
     suspended_user = create(:user, :suspended)
     deleted_user = create(:user, :deleted)
 
     # Try a normal entry that should work
     diary_entry = create(:diary_entry, :user => user)
-    get :view, :params => { :display_name => user.display_name, :id => diary_entry.id }
+    get :show, :params => { :display_name => user.display_name, :id => diary_entry.id }
     assert_response :success
-    assert_template :view
+    assert_template :show
 
     # Try a deleted entry
     diary_entry_deleted = create(:diary_entry, :user => user, :visible => false)
-    get :view, :params => { :display_name => user.display_name, :id => diary_entry_deleted.id }
+    get :show, :params => { :display_name => user.display_name, :id => diary_entry_deleted.id }
     assert_response :not_found
 
     # Try an entry by a suspended user
     diary_entry_suspended = create(:diary_entry, :user => suspended_user)
-    get :view, :params => { :display_name => suspended_user.display_name, :id => diary_entry_suspended.id }
+    get :show, :params => { :display_name => suspended_user.display_name, :id => diary_entry_suspended.id }
     assert_response :not_found
 
     # Try an entry by a deleted user
     diary_entry_deleted = create(:diary_entry, :user => deleted_user)
-    get :view, :params => { :display_name => deleted_user.display_name, :id => diary_entry_deleted.id }
+    get :show, :params => { :display_name => deleted_user.display_name, :id => diary_entry_deleted.id }
     assert_response :not_found
   end
 
-  def test_view_hidden_comments
+  def test_show_hidden_comments
     # Get a diary entry that has hidden comments
     user = create(:user)
     diary_entry = create(:diary_entry, :user => user)
@@ -681,9 +694,9 @@ class DiaryEntryControllerTest < ActionController::TestCase
     deleted_user_comment = create(:diary_comment, :diary_entry => diary_entry, :user => create(:user, :deleted))
     hidden_comment = create(:diary_comment, :diary_entry => diary_entry, :visible => false)
 
-    get :view, :params => { :display_name => user.display_name, :id => diary_entry.id }
+    get :show, :params => { :display_name => user.display_name, :id => diary_entry.id }
     assert_response :success
-    assert_template :view
+    assert_template :show
     assert_select "div.comments" do
       assert_select "p#comment#{visible_comment.id}", :count => 1
       assert_select "p#comment#{suspended_user_comment.id}", :count => 0
@@ -707,7 +720,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
          :params => { :display_name => user.display_name, :id => diary_entry.id },
          :session => { :user => user }
     assert_response :redirect
-    assert_redirected_to :action => :view, :display_name => user.display_name, :id => diary_entry.id
+    assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
     assert_equal true, DiaryEntry.find(diary_entry.id).visible
 
     # Finally try as an administrator
@@ -715,7 +728,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
          :params => { :display_name => user.display_name, :id => diary_entry.id },
          :session => { :user => create(:administrator_user) }
     assert_response :redirect
-    assert_redirected_to :action => :list, :display_name => user.display_name
+    assert_redirected_to :action => :index, :display_name => user.display_name
     assert_equal false, DiaryEntry.find(diary_entry.id).visible
   end
 
@@ -735,7 +748,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
          :params => { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id },
          :session => { :user => user }
     assert_response :redirect
-    assert_redirected_to :action => :view, :display_name => user.display_name, :id => diary_entry.id
+    assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
     assert_equal true, DiaryComment.find(diary_comment.id).visible
 
     # Finally try as an administrator
@@ -743,7 +756,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
          :params => { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id },
          :session => { :user => administrator_user }
     assert_response :redirect
-    assert_redirected_to :action => :view, :display_name => user.display_name, :id => diary_entry.id
+    assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
     assert_equal false, DiaryComment.find(diary_comment.id).visible
   end
 
@@ -868,14 +881,14 @@ class DiaryEntryControllerTest < ActionController::TestCase
 
   private
 
-  def check_diary_list(*entries)
+  def check_diary_index(*entries)
     assert_response :success
-    assert_template "list"
+    assert_template "index"
     assert_no_missing_translations
     assert_select "div.diary_post", entries.count
 
     entries.each do |entry|
-      assert_select "a[href=?]", "/user/#{URI.encode(entry.user.display_name)}/diary/#{entry.id}"
+      assert_select "a[href=?]", "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}"
     end
   end
 end