X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3726d561ea0f5d363599ef4daf70eafef3abac38..9fb382eaa91b1df8eefae81dba28eac8ec52bcee:/test/controllers/diary_entry_controller_test.rb?ds=sidebyside diff --git a/test/controllers/diary_entry_controller_test.rb b/test/controllers/diary_entry_controller_test.rb index 6ebf4ec09..268834019 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, :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 @@ -93,13 +101,15 @@ class DiaryEntryControllerTest < ActionController::TestCase ) end - def test_new + def test_new_no_login # Make sure that you are redirected to the login page when you # are not logged in get :new assert_response :redirect assert_redirected_to :controller => :user, :action => :login, :referer => "/diary/new" + end + def test_new_form # Now try again when logged in get :new, {}, { :user => users(:normal_user).id } assert_response :success @@ -120,70 +130,82 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_select "input", :count => 7 end end + end - new_title = "New Title" - new_body = "This is a new body for the diary entry" - new_latitude = "1.1" - new_longitude = "2.2" - new_language_code = "en" + def test_new_get_with_params + # Now try creating a diary entry using get + assert_difference "DiaryEntry.count", 0 do + get :new, { :commit => "save", + :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1", + :longitude => "2.2", :language_code => "en" } }, + { :user => users(:normal_user).id } + end + assert_response :success + assert_template :edit + end + def test_new_no_body # Now try creating a invalid diary entry with an empty body assert_no_difference "DiaryEntry.count" do post :new, { :commit => "save", - :diary_entry => { :title => new_title, :body => "", :latitude => new_latitude, - :longitude => new_longitude, :language_code => new_language_code } }, + :diary_entry => { :title => "New Title", :body => "", :latitude => "1.1", + :longitude => "2.2", :language_code => "en" } }, { :user => users(:normal_user).id } end assert_response :success assert_template :edit assert_nil UserPreference.where(:user_id => users(:normal_user).id, :k => "diary.default_language").first + end + def test_new_post # Now try creating a diary entry 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 } }, + :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1", + :longitude => "2.2", :language_code => "en" } }, { :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 + assert_equal "New Title", entry.title + assert_equal "This is a new body for the diary entry", entry.body + assert_equal "1.1".to_f, entry.latitude + assert_equal "2.2".to_f, entry.longitude + assert_equal "en", 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 + assert_equal "en", UserPreference.where(:user_id => users(:normal_user).id, :k => "diary.default_language").first.v + end - new_language_code = "de" + def test_new_german + create(:language, :code => "de") # 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 } }, + :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1", + :longitude => "2.2", :language_code => "de" } }, { :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 + assert_equal "New Title", entry.title + assert_equal "This is a new body for the diary entry", entry.body + assert_equal "1.1".to_f, entry.latitude + assert_equal "2.2".to_f, entry.longitude + assert_equal "de", 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 + assert_equal "de", UserPreference.where(:user_id => users(:normal_user).id, :k => "diary.default_language").first.v end def test_new_spammy @@ -213,7 +235,7 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_edit - entry = create(:diary_entry, :user_id => users(:normal_user).id) + 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 @@ -317,7 +339,7 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_comment - entry = create(:diary_entry, :user_id => users(:normal_user).id) + 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 @@ -377,7 +399,7 @@ class DiaryEntryControllerTest < ActionController::TestCase def test_comment_spammy # Find the entry to comment on - entry = create(:diary_entry, :user_id => users(:normal_user).id) + 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 @@ -417,7 +439,7 @@ class DiaryEntryControllerTest < ActionController::TestCase 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_id => users(:public_user).id) + public_entry = create(:diary_entry, :user => users(:public_user)) # Try a list of all diary entries get :list @@ -425,9 +447,9 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_list_user - diary_entry = create(:diary_entry, :user_id => users(:normal_user).id) - geo_entry = create(:diary_entry, :user_id => users(:normal_user).id, :latitude => 51.50763, :longitude => -0.10781) - _other_entry = create(:diary_entry, :user_id => users(:public_user).id) + 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 @@ -440,8 +462,9 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_list_friends - diary_entry = create(:diary_entry, :user_id => friends(:normal_user_with_second_user).friend_user_id) - _other_entry = create(:diary_entry, :user_id => users(:second_public_user).id) + 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 @@ -456,7 +479,7 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_list_nearby - diary_entry = create(:diary_entry, :user_id => users(:public_user).id) + 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 @@ -471,6 +494,8 @@ class DiaryEntryControllerTest < ActionController::TestCase 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") @@ -489,6 +514,7 @@ 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") @@ -505,6 +531,7 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_rss_language + create(:language, :code => "de") create(:diary_entry, :language_code => "en") create(:diary_entry, :language_code => "en") create(:diary_entry, :language_code => "de") @@ -520,6 +547,7 @@ 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 @@ -528,9 +556,9 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_rss_user - create(:diary_entry, :user_id => users(:normal_user).id) - create(:diary_entry, :user_id => users(:normal_user).id) - create(:diary_entry, :user_id => users(:public_user).id) + 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" @@ -551,25 +579,32 @@ 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 => "