X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/21d60e359a6e972731e0385c51dd86536b7ea777..f435fce007d7817bd35f3beb93f0e3a844446154:/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 1e700da87..5e53cb6b0 100644 --- a/test/controllers/diary_entry_controller_test.rb +++ b/test/controllers/diary_entry_controller_test.rb @@ -1,10 +1,18 @@ require "test_helper" class DiaryEntryControllerTest < ActionController::TestCase - fixtures :users, :user_roles, :diary_entries, :diary_comments, :languages, :friends + fixtures :users, :user_roles include ActionView::Helpers::NumberHelper + def setup + # 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\?}) + .to_return(:status => 404) + end + ## # test all routes which lead to this controller def test_routes @@ -83,6 +91,14 @@ class DiaryEntryControllerTest < ActionController::TestCase { :path => "/user/username/diary/1/hidecomment/2", :method => :post }, { :controller => "diary_entry", :action => "hidecomment", :display_name => "username", :id => "1", :comment => "2" } ) + assert_routing( + { :path => "/user/username/diary/1/subscribe", :method => :post }, + { :controller => "diary_entry", :action => "subscribe", :display_name => "username", :id => "1" } + ) + assert_routing( + { :path => "/user/username/diary/1/unsubscribe", :method => :post }, + { :controller => "diary_entry", :action => "unsubscribe", :display_name => "username", :id => "1" } + ) end def test_new @@ -106,7 +122,7 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_select "select#diary_entry_language_code", :count => 1 assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1 assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1 - assert_select "input[name=commit][type=submit][value=Save]", :count => 1 + assert_select "input[name=commit][type=submit][value=Publish]", :count => 1 assert_select "input[name=commit][type=submit][value=Edit]", :count => 1 assert_select "input[name=commit][type=submit][value=Preview]", :count => 1 assert_select "input", :count => 7 @@ -129,6 +145,8 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_response :success assert_template :edit + assert_nil UserPreference.where(:user_id => users(:normal_user).id, :k => "diary.default_language").first + # Now try creating a diary entry assert_difference "DiaryEntry.count", 1 do post :new, { :commit => "save", @@ -145,6 +163,36 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_equal new_latitude.to_f, entry.latitude assert_equal new_longitude.to_f, entry.longitude assert_equal new_language_code, entry.language_code + + # checks if user was subscribed + assert_equal 1, entry.subscribers.length + + assert_equal new_language_code, UserPreference.where(:user_id => users(:normal_user).id, :k => "diary.default_language").first.v + + new_language_code = "de" + create(:language, :code => new_language_code) + + # Now try creating a diary entry in a different language + assert_difference "DiaryEntry.count", 1 do + post :new, { :commit => "save", + :diary_entry => { :title => new_title, :body => new_body, :latitude => new_latitude, + :longitude => new_longitude, :language_code => new_language_code } }, + { :user => users(:normal_user).id } + end + assert_response :redirect + assert_redirected_to :action => :list, :display_name => users(:normal_user).display_name + entry = DiaryEntry.order(:id).last + assert_equal users(:normal_user).id, entry.user_id + assert_equal new_title, entry.title + assert_equal new_body, entry.body + assert_equal new_latitude.to_f, entry.latitude + assert_equal new_longitude.to_f, entry.longitude + assert_equal new_language_code, entry.language_code + + # checks if user was subscribed + assert_equal 1, entry.subscribers.length + + assert_equal new_language_code, UserPreference.where(:user_id => users(:normal_user).id, :k => "diary.default_language").first.v end def test_new_spammy @@ -174,7 +222,7 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_edit - entry = diary_entries(:normal_user_entry_1) + entry = create(:diary_entry, :user => users(:normal_user)) # Make sure that you are redirected to the login page when you are # not logged in, without and with the id of the entry you want to edit @@ -271,13 +319,14 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_edit_i18n - get :edit, { :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id }, { :user => users(:normal_user).id } + diary_entry = create(:diary_entry, :language_code => "en") + get :edit, { :display_name => users(:normal_user).display_name, :id => diary_entry.id }, { :user => users(:normal_user).id } assert_response :success assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry" end def test_comment - entry = diary_entries(:normal_user_entry_1) + entry = create(:diary_entry, :user => users(:normal_user)) # Make sure that you are denied when you are not logged in post :comment, :display_name => entry.user.display_name, :id => entry.id @@ -290,26 +339,32 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_select "h2", :text => "No entry with the id: 9999", :count => 1 end + post :subscribe, { :id => entry.id, :display_name => entry.user.display_name }, { :user => users(:normal_user).id } + # Now try an invalid comment with an empty body assert_no_difference "ActionMailer::Base.deliveries.size" do assert_no_difference "DiaryComment.count" do - post :comment, { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "" } }, { :user => users(:public_user).id } + assert_no_difference "entry.subscribers.count" do + post :comment, { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "" } }, { :user => users(:public_user).id } + end end end assert_response :success assert_template :view # Now try again with the right id - assert_difference "ActionMailer::Base.deliveries.size", 1 do + assert_difference "ActionMailer::Base.deliveries.size", entry.subscribers.count 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 } + assert_difference "entry.subscribers.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 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_equal "[OpenStreetMap] #{users(:public_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 ActionMailer::Base.deliveries.clear @@ -331,7 +386,8 @@ class DiaryEntryControllerTest < ActionController::TestCase def test_comment_spammy # Find the entry to comment on - entry = diary_entries(:normal_user_entry_1) + entry = create(:diary_entry, :user => users(:normal_user)) + post :subscribe, { :id => entry.id, :display_name => entry.user.display_name }, { :user => users(:normal_user).id } # Generate some spammy content spammy_text = 1.upto(50).map { |n| "http://example.com/spam#{n}" }.join(" ") @@ -346,7 +402,7 @@ class DiaryEntryControllerTest < ActionController::TestCase 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_equal "[OpenStreetMap] #{users(:public_user).display_name} commented on a diary entry", email.subject assert_match %r{http://example.com/spam}, email.text_part.decoded assert_match %r{http://example.com/spam}, email.html_part.decoded ActionMailer::Base.deliveries.clear @@ -368,15 +424,23 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_list_all + diary_entry = create(:diary_entry) + geo_entry = create(:diary_entry, :latitude => 51.50763, :longitude => -0.10781) + public_entry = create(:diary_entry, :user => users(:public_user)) + # Try a list of all diary entries get :list - check_diary_list :normal_user_entry_1, :normal_user_geo_entry, :public_user_entry_1 + check_diary_list diary_entry, geo_entry, public_entry end def test_list_user + diary_entry = create(:diary_entry, :user => users(:normal_user)) + geo_entry = create(:diary_entry, :user => users(:normal_user), :latitude => 51.50763, :longitude => -0.10781) + _other_entry = create(:diary_entry, :user => users(:public_user)) + # Try a list of diary entries for a valid user get :list, :display_name => users(:normal_user).display_name - check_diary_list :normal_user_entry_1, :normal_user_geo_entry + check_diary_list diary_entry, geo_entry # Try a list of diary entries for an invalid user get :list, :display_name => "No Such User" @@ -385,6 +449,10 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_list_friends + friend = create(:friend, :befriender => users(:normal_user)) + diary_entry = create(:diary_entry, :user => friend.befriendee) + _other_entry = create(:diary_entry, :user => users(:second_public_user)) + # Try a list of diary entries for your friends when not logged in get :list, :friends => true assert_response :redirect @@ -392,12 +460,14 @@ class DiaryEntryControllerTest < ActionController::TestCase # Try a list of diary entries for your friends when logged in get :list, { :friends => true }, { :user => users(:normal_user).id } - check_diary_list :public_user_entry_1 + check_diary_list diary_entry get :list, { :friends => true }, { :user => users(:public_user).id } check_diary_list end def test_list_nearby + diary_entry = create(:diary_entry, :user => users(:public_user)) + # Try a list of diary entries for nearby users when not logged in get :list, :nearby => true assert_response :redirect @@ -405,19 +475,25 @@ class DiaryEntryControllerTest < ActionController::TestCase # Try a list of diary entries for nearby users when logged in get :list, { :nearby => true }, { :user => users(:german_user).id } - check_diary_list :public_user_entry_1 + check_diary_list diary_entry get :list, { :nearby => true }, { :user => users(:public_user).id } check_diary_list end def test_list_language + create(:language, :code => "de") + create(:language, :code => "sl") + diary_entry_en = create(:diary_entry, :language_code => "en") + diary_entry_en2 = create(:diary_entry, :language_code => "en") + diary_entry_de = create(:diary_entry, :language_code => "de") + # Try a list of diary entries in english get :list, :language => "en" - check_diary_list :normal_user_entry_1, :public_user_entry_1 + check_diary_list diary_entry_en, diary_entry_en2 # Try a list of diary entries in german get :list, :language => "de" - check_diary_list :normal_user_geo_entry + check_diary_list diary_entry_de # Try a list of diary entries in slovenian get :list, :language => "sl" @@ -425,6 +501,11 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_rss + create(:language, :code => "de") + create(:diary_entry, :language_code => "en") + create(:diary_entry, :language_code => "en") + create(:diary_entry, :language_code => "de") + get :rss, :format => :rss assert_response :success, "Should be able to get a diary RSS" assert_select "rss", :count => 1 do @@ -437,7 +518,12 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_rss_language - get :rss, :language => diary_entries(:normal_user_entry_1).language_code, :format => :rss + create(:language, :code => "de") + create(:diary_entry, :language_code => "en") + create(:diary_entry, :language_code => "en") + create(:diary_entry, :language_code => "de") + + get :rss, :language => "en", :format => :rss assert_response :success, "Should be able to get a specific language diary RSS" assert_select "rss>channel>item", :count => 2 # , "Diary entries should be filtered by language" end @@ -448,12 +534,19 @@ class DiaryEntryControllerTest < ActionController::TestCase # end def test_rss_language_with_no_entries + create(:language, :code => "sl") + create(:diary_entry, :language_code => "en") + get :rss, :language => "sl", :format => :rss assert_response :success, "Should be able to get a specific language diary RSS" assert_select "rss>channel>item", :count => 0 # , "Diary entries should be filtered by language" end def test_rss_user + create(:diary_entry, :user => users(:normal_user)) + create(:diary_entry, :user => users(:normal_user)) + create(:diary_entry, :user => users(:public_user)) + get :rss, :display_name => users(:normal_user).display_name, :format => :rss assert_response :success, "Should be able to get a specific users diary RSS" assert_select "rss>channel>item", :count => 2 # , "Diary entries should be filtered by user" @@ -473,74 +566,94 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_response :not_found, "Should not be able to get a deleted users diary RSS" end + def test_rss_character_escaping + create(:diary_entry, :title => "