X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e29c47b05689038fe5910babc1d05dab5370e184..b0fa1cf936fffb2251bd47db57663ba5e03a23b8:/test/functional/diary_entry_controller_test.rb diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb index 4d4a324ed..7e0f10790 100644 --- a/test/functional/diary_entry_controller_test.rb +++ b/test/functional/diary_entry_controller_test.rb @@ -201,7 +201,7 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_select "body", :count => 1 do assert_select "div.wrapper", :count => 1 do assert_select "div.content-heading", :count => 1 do - assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1 + assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1 end assert_select "div#content", :count => 1 do assert_select "div.post_heading", :text => /#{new_title}/, :count => 1 @@ -230,7 +230,7 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_select "body", :count => 1 do assert_select "div.wrapper", :count => 1 do assert_select "div.content-heading", :count => 1 do - assert_select "h2", :text => /#{users(:normal_user).display_name}'s diary/, :count => 1 + assert_select "h2", :text => /#{users(:normal_user).display_name}'s diary/, :count => 1 end assert_select "div#content", :count => 1 do assert_select "div.post_heading", :text => /#{new_title}/, :count => 1 @@ -310,7 +310,7 @@ class DiaryEntryControllerTest < ActionController::TestCase end assert_response :redirect assert_redirected_to :action => :list, :display_name => users(:normal_user).display_name - entry = DiaryEntry.find(4) + entry = DiaryEntry.find(6) assert_equal users(:normal_user).id, entry.user_id assert_equal new_title, entry.title assert_equal new_body, entry.body @@ -320,7 +320,54 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_creating_diary_comment + @request.cookies["_osm_username"] = users(:public_user).display_name + entry = diary_entries(:normal_user_entry_1) + + # Make sure that you are denied when you are not logged in + post :comment, :display_name => entry.user.display_name, :id => entry.id + assert_response :forbidden + # Verify that you get a not found error, when you pass a bogus id + post :comment, {:display_name => entry.user.display_name, :id => 9999}, {:user => users(:public_user).id} + assert_response :not_found + assert_select "html", :count => 1 do + assert_select "body", :count => 1 do + assert_select "div.wrapper", :count => 1 do + assert_select "div.content-heading", :count => 1 do + assert_select "h2", :text => "No entry with the id: 9999", :count => 1 + end + end + end + end + + # Now try again with the right id + assert_difference "ActionMailer::Base.deliveries.size", 1 do + assert_difference "DiaryComment.count", 1 do + post :comment, {:display_name => entry.user.display_name, :id => entry.id, :diary_comment => {:body => "New comment"}}, {:user => users(:public_user).id} + end + end + assert_response :redirect + assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id + email = ActionMailer::Base.deliveries.first + assert_equal [ users(:normal_user).email ], email.to + assert_equal "[OpenStreetMap] #{users(:public_user).display_name} commented on your diary entry", email.subject + assert_match /New comment/, email.text_part.decoded + assert_match /New comment/, email.html_part.decoded + ActionMailer::Base.deliveries.clear + comment = DiaryComment.find(5) + assert_equal entry.id, comment.diary_entry_id + assert_equal users(:public_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, :display_name => entry.user.display_name, :id => entry.id + assert_response :success + assert_select ".diary-comment", :count => 1 do + assert_select "#comment5", :count => 1 do + assert_select "a[href='/user/#{users(:public_user).display_name}']", :text => users(:public_user).display_name, :count => 1 + end + assert_select ".richtext", :text => /New comment/, :count => 1 + end end # Check that you can get the expected response and template for all available languages @@ -374,13 +421,120 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_rss_nonexisting_user + # Try a user that has never existed get :rss, {:display_name => 'fakeUsername76543', :format => :rss} assert_response :not_found, "Should not be able to get a nonexisting users diary RSS" + + # Try a suspended user + get :rss, {:display_name => users(:suspended_user).display_name, :format => :rss} + assert_response :not_found, "Should not be able to get a suspended users diary RSS" + + # Try a deleted user + get :rss, {:display_name => users(:deleted_user).display_name, :format => :rss} + assert_response :not_found, "Should not be able to get a deleted users diary RSS" end def test_viewing_diary_entry + # Try a normal entry that should work get :view, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id} assert_response :success - assert_template 'view' + assert_template :view + + # Try a deleted entry + get :view, {:display_name => users(:normal_user).display_name, :id => diary_entries(:deleted_entry).id} + assert_response :not_found + + # Try an entry by a suspended user + get :view, {:display_name => users(:suspended_user).display_name, :id => diary_entries(:entry_by_suspended_user).id} + assert_response :not_found + + # Try an entry by a deleted user + get :view, {:display_name => users(:deleted_user).display_name, :id => diary_entries(:entry_by_deleted_user).id} + assert_response :not_found + end + + def test_viewing_hidden_comments + # Get a diary entry that has hidden comments + get :view, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id} + assert_response :success + assert_template :view + assert_select "div.comments" do + assert_select "p#comment1", :count => 1 # visible comment + assert_select "p#comment2", :count => 0 # comment by suspended user + assert_select "p#comment3", :count => 0 # comment by deleted user + assert_select "p#comment4", :count => 0 # hidden comment + end + end + + def test_hide + # Try without logging in + post :hide, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id} + assert_response :forbidden + assert_equal true, DiaryEntry.find(diary_entries(:normal_user_entry_1).id).visible + + @request.cookies["_osm_username"] = users(:normal_user).display_name + + # Now try as a normal user + post :hide, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id}, {:user => users(:normal_user).id} + assert_response :redirect + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id + assert_equal true, DiaryEntry.find(diary_entries(:normal_user_entry_1).id).visible + + @request.cookies["_osm_username"] = users(:administrator_user).display_name + + # Finally try as an administrator + post :hide, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id}, {:user => users(:administrator_user).id} + assert_response :redirect + assert_redirected_to :action => :list, :display_name => users(:normal_user).display_name + assert_equal false, DiaryEntry.find(diary_entries(:normal_user_entry_1).id).visible + end + + def test_hidecomment + # Try without logging in + post :hidecomment, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id, :comment => diary_comments(:comment_for_geo_post).id} + assert_response :forbidden + assert_equal true, DiaryComment.find(diary_comments(:comment_for_geo_post).id).visible + + @request.cookies["_osm_username"] = users(:normal_user).display_name + + # Now try as a normal user + post :hidecomment, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id, :comment => diary_comments(:comment_for_geo_post).id}, {:user => users(:normal_user).id} + assert_response :redirect + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id + assert_equal true, DiaryComment.find(diary_comments(:comment_for_geo_post).id).visible + + @request.cookies["_osm_username"] = users(:administrator_user).display_name + + # Finally try as an administrator + post :hidecomment, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id, :comment => diary_comments(:comment_for_geo_post).id}, {:user => users(:administrator_user).id} + assert_response :redirect + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id + assert_equal false, DiaryComment.find(diary_comments(:comment_for_geo_post).id).visible + end + + def test_comments + # Test a user with no comments + get :comments, :display_name => users(:normal_user).display_name + assert_response :success + assert_template :comments + assert_select "table.messages" do + assert_select "tr", :count => 1 # header, no comments + end + + # Test a user with a comment + get :comments, :display_name => users(:public_user).display_name + assert_response :success + assert_template :comments + assert_select "table.messages" do + assert_select "tr", :count => 2 # header and one comment + end + + # Test a suspended user + get :comments, :display_name => users(:suspended_user).display_name + assert_response :not_found + + # Test a deleted user + get :comments, :display_name => users(:deleted_user).display_name + assert_response :not_found end end