X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dda2ccafe719d22e2a726c96e3ad2c8011f44b33..9701c6210c32335ce3baf964b7e564a4da48d7b8:/test/functional/diary_entry_controller_test.rb?ds=sidebyside diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb index 6189df302..5d0cb93ac 100644 --- a/test/functional/diary_entry_controller_test.rb +++ b/test/functional/diary_entry_controller_test.rb @@ -1,12 +1,96 @@ require File.dirname(__FILE__) + '/../test_helper' class DiaryEntryControllerTest < ActionController::TestCase - fixtures :users, :diary_entries, :diary_comments + fixtures :users, :diary_entries, :diary_comments, :languages + + include ActionView::Helpers::NumberHelper + + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/diary", :method => :get }, + { :controller => "diary_entry", :action => "list" } + ) + assert_routing( + { :path => "/diary/language", :method => :get }, + { :controller => "diary_entry", :action => "list", :language => "language" } + ) + assert_routing( + { :path => "/user/username/diary", :method => :get }, + { :controller => "diary_entry", :action => "list", :display_name => "username" } + ) + assert_routing( + { :path => "/diary/friends", :method => :get }, + { :controller => "diary_entry", :action => "list", :friends => true } + ) + assert_routing( + { :path => "/diary/nearby", :method => :get }, + { :controller => "diary_entry", :action => "list", :nearby => true } + ) + + assert_routing( + { :path => "/diary/rss", :method => :get }, + { :controller => "diary_entry", :action => "rss", :format => :rss } + ) + assert_routing( + { :path => "/diary/language/rss", :method => :get }, + { :controller => "diary_entry", :action => "rss", :language => "language", :format => :rss } + ) + assert_routing( + { :path => "/user/username/diary/rss", :method => :get }, + { :controller => "diary_entry", :action => "rss", :display_name => "username", :format => :rss } + ) + + assert_routing( + { :path => "/user/username/diary/comments", :method => :get }, + { :controller => "diary_entry", :action => "comments", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/diary/comments/1", :method => :get }, + { :controller => "diary_entry", :action => "comments", :display_name => "username", :page => "1" } + ) + + assert_routing( + { :path => "/diary/new", :method => :get }, + { :controller => "diary_entry", :action => "new" } + ) + assert_routing( + { :path => "/diary/new", :method => :post }, + { :controller => "diary_entry", :action => "new" } + ) + assert_routing( + { :path => "/user/username/diary/1", :method => :get }, + { :controller => "diary_entry", :action => "view", :display_name => "username", :id => "1" } + ) + assert_routing( + { :path => "/user/username/diary/1/edit", :method => :get }, + { :controller => "diary_entry", :action => "edit", :display_name => "username", :id => "1" } + ) + assert_routing( + { :path => "/user/username/diary/1/edit", :method => :post }, + { :controller => "diary_entry", :action => "edit", :display_name => "username", :id => "1" } + ) + assert_routing( + { :path => "/user/username/diary/1/newcomment", :method => :post }, + { :controller => "diary_entry", :action => "comment", :display_name => "username", :id => "1" } + ) + assert_routing( + { :path => "/user/username/diary/1/hide", :method => :post }, + { :controller => "diary_entry", :action => "hide", :display_name => "username", :id => "1" } + ) + assert_routing( + { :path => "/user/username/diary/1/hidecomment/2", :method => :post }, + { :controller => "diary_entry", :action => "hidecomment", :display_name => "username", :id => "1", :comment => "2" } + ) + end def test_showing_new_diary_entry + @request.cookies["_osm_username"] = users(:normal_user).display_name + get :new assert_response :redirect - assert_redirected_to :controller => :user, :action => "login", :referer => "/diary_entry/new" + assert_redirected_to :controller => :user, :action => "login", :referer => "/diary/new" # Now pretend to login by using the session hash, with the # id of the person we want to login as through session(:user)=user.id get(:new, nil, {'user' => users(:normal_user).id}) @@ -14,21 +98,25 @@ class DiaryEntryControllerTest < ActionController::TestCase #print @response.body #print @response.to_yaml - assert_select "html:root", :count => 1 do + assert_select "html", :count => 1 do assert_select "head", :count => 1 do - assert_select "title", :text => /New diary entry/, :count => 1 + assert_select "title", :text => /New Diary Entry/, :count => 1 end assert_select "body", :count => 1 do - assert_select "div#content", :count => 1 do - assert_select "h1", "New diary entry", :count => 1 - # We don't care about the layout, we just care about the form fields - # that are available - assert_select "form[action='/diary_entry/new']", :count => 1 do - assert_select "input[id=diary_entry_title][name='diary_entry[title]']", :count => 1 - assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :count => 1 - assert_select "input#latitude[name='diary_entry[latitude]'][type=text]", :count => 1 - assert_select "input#longitude[name='diary_entry[longitude]'][type=text]", :count => 1 - assert_select "input[name=commit][type=submit][value=Save]", :count => 1 + assert_select "div.wrapper", :count => 1 do + assert_select "div.content-heading", :count => 1 do + assert_select "h1", :text => "New Diary Entry", :count => 1 + end + assert_select "div#content", :count => 1 do + # We don't care about the layout, we just care about the form fields + # that are available + assert_select "form[action='/diary/new']", :count => 1 do + assert_select "input[id=diary_entry_title][name='diary_entry[title]']", :count => 1 + assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :count => 1 + assert_select "input#latitude[name='diary_entry[latitude]'][type=text]", :count => 1 + assert_select "input#longitude[name='diary_entry[longitude]'][type=text]", :count => 1 + assert_select "input[name=commit][type=submit][value=Save]", :count => 1 + end end end end @@ -37,46 +125,53 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_editing_diary_entry + @request.cookies["_osm_username"] = users(:normal_user).display_name + entry = diary_entries(:normal_user_entry_1) + # 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 - get :edit + get :edit, :display_name => entry.user.display_name, :id => entry.id assert_response :redirect - assert_redirected_to :controller => :user, :action => "login", :referer => "/diary_entry/edit" + assert_redirected_to :controller => :user, :action => "login", :referer => "/user/#{entry.user.display_name}/diary/#{entry.id}/edit" - get :edit, :id => diary_entries(:normal_user_entry_1).id - assert_response :redirect - assert_redirected_to :controller => :user, :action => "login", :referer => "/diary_entry/edit" - - # Verify that you get a not found error, when you don't pass an id - get(:edit, nil, {'user' => users(:normal_user).id}) + # Verify that you get a not found error, when you pass a bogus id + get(:edit, {:display_name => entry.user.display_name, :id => 9999}, {'user' => entry.user.id}) assert_response :not_found - assert_select "html:root", :count => 1 do + assert_select "html", :count => 1 do assert_select "body", :count => 1 do - assert_select "div#content", :count => 1 do - assert_select "h2", :text => "No entry with the id:", :count => 1 + 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 pass the id, and check that you can edit it, when using the same # user as the person who created the entry - get(:edit, {:id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id}) + get(:edit, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id}) assert_response :success - assert_select "html:root", :count => 1 do + assert_select "html", :count => 1 do assert_select "head", :count => 1 do assert_select "title", :text => /Edit diary entry/, :count => 1 end assert_select "body", :count => 1 do - assert_select "div#content", :count => 1 do - assert_select "h1", :text => /Edit diary entry/, :count => 1 - assert_select "form[action='/diary_entry/#{diary_entries(:normal_user_entry_1).id}/edit'][method=post]", :count => 1 do - assert_select "input#diary_entry_title[name='diary_entry[title]'][value='#{diary_entries(:normal_user_entry_1).title}']", :count => 1 - assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => diary_entries(:normal_user_entry_1).body, :count => 1 - 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", :count => 4 + assert_select "div.wrapper", :count => 1 do + assert_select "div.content-heading", :count => 1 do + assert_select "h1", :text => /Edit diary entry/, :count => 1 + end + assert_select "div#content", :count => 1 do + assert_select "form[action='/user/#{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 + 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=Edit]", :count => 1 + assert_select "input[name=commit][type=submit][value=Preview]", :count => 1 + assert_select "input", :count => 7 + end end end end @@ -88,56 +183,66 @@ class DiaryEntryControllerTest < ActionController::TestCase new_latitude = "1.1" new_longitude = "2.2" new_language_code = "en" - post(:edit, {:id => diary_entries(:normal_user_entry_1).id, 'commit' => 'save', + post(:edit, {:display_name => entry.user.display_name, :id => entry.id, '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}) + {'user' => entry.user.id}) assert_response :redirect - assert_redirected_to :action => :view, :id => diary_entries(:normal_user_entry_1).id + assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id # Now check that the new data is rendered, when logged in - get :view, {:id => diary_entries(:normal_user_entry_1).id, :display_name => 'test'}, {'user' => users(:normal_user).id} + get :view, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id} assert_response :success assert_template 'diary_entry/view' - assert_select "html:root", :count => 1 do + assert_select "html", :count => 1 do assert_select "head", :count => 1 do assert_select "title", :text => /Users' diaries | /, :count => 1 end assert_select "body", :count => 1 do - assert_select "div#content", :count => 1 do - assert_select "h2", :text => /#{users(:normal_user).display_name}'s diary/, :count => 1 - assert_select "b", :text => /#{new_title}/, :count => 1 - # This next line won't work if the text has been run through the htmlize function - # due to formatting that could be introduced - assert_select "p", :text => /#{new_body}/, :count => 1 - assert_select "span.latitude", :text => new_latitude, :count => 1 - assert_select "span.longitude", :text => new_longitude, :count => 1 - # As we're not logged in, check that you cannot edit - #print @response.body - assert_select "a[href='/user/#{users(:normal_user).display_name}/diary/#{diary_entries(:normal_user_entry_1).id}/edit']", :text => "Edit this entry", :count => 1 + 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 + end + assert_select "div#content", :count => 1 do + assert_select "div.post_heading", :text => /#{new_title}/, :count => 1 + # This next line won't work if the text has been run through the htmlize function + # due to formatting that could be introduced + 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 + #print @response.body + assert_select "a[href='/user/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1 + end end end end - + + @request.cookies["_osm_username"] = users(:public_user).display_name + # and when not logged in as the user who wrote the entry - get :view, {:id => diary_entries(:normal_user_entry_1).id, :display_name => 'test'}, {'user' => users(:public_user).id} + get :view, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id} assert_response :success assert_template 'diary_entry/view' - assert_select "html:root", :count => 1 do + assert_select "html", :count => 1 do assert_select "head", :count => 1 do assert_select "title", :text => /Users' diaries | /, :count => 1 end assert_select "body", :count => 1 do - assert_select "div#content", :count => 1 do - assert_select "h2", :text => /#{users(:normal_user).display_name}'s diary/, :count => 1 - assert_select "b", :text => /#{new_title}/, :count => 1 - # This next line won't work if the text has been run through the htmlize function - # due to formatting that could be introduced - assert_select "p", :text => /#{new_body}/, :count => 1 - assert_select "span.latitude", :text => new_latitude, :count => 1 - assert_select "span.longitude", :text => new_longitude, :count => 1 - # As we're not logged in, check that you cannot edit - assert_select "a[href='/user/#{users(:normal_user).display_name}/diary/#{diary_entries(:normal_user_entry_1).id}/edit']", :text => "Edit this entry", :count => 0 + 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 + end + assert_select "div#content", :count => 1 do + assert_select "div.post_heading", :text => /#{new_title}/, :count => 1 + # This next line won't work if the text has been run through the htmlize function + # due to formatting that could be introduced + 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/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1 + end + end end end end @@ -146,47 +251,180 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_edit_diary_entry_i18n - I18n.available_locales.each do |locale| - set_locale locale - - get(:edit, {:id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id}) - assert_response :success - assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry" - end + @request.cookies["_osm_username"] = users(:normal_user).display_name + + get :edit, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).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_create_diary_entry - #post :new + @request.cookies["_osm_username"] = users(:normal_user).display_name + + # 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" + + # Now try again when logged in + get :new, {}, {:user => users(:normal_user).id} + assert_response :success + assert_select "html", :count => 1 do + assert_select "head", :count => 1 do + assert_select "title", :text => /New Diary Entry/, :count => 1 + end + assert_select "body", :count => 1 do + assert_select "div.wrapper", :count => 1 do + assert_select "div.content-heading", :count => 1 do + assert_select "h1", :text => /New Diary Entry/, :count => 1 + end + assert_select "div#content", :count => 1 do + assert_select "form[action='/diary/new'][method=post]", :count => 1 do + assert_select "input#diary_entry_title[name='diary_entry[title]']", :count => 1 + assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => "", :count => 1 + 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=Edit]", :count => 1 + assert_select "input[name=commit][type=submit][value=Preview]", :count => 1 + assert_select "input", :count => 7 + end + end + end + end + end + + # Now try creating a diary entry + 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" + 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.find(4) + 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 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(4) + 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 "#comment4", :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 # Should test that there are no def test_listing_diary_entries - I18n.available_locales.each do |locale| - set_locale locale - get :list - assert_response :success, "Should be able to list the diary entries in #{locale}" - assert_template 'list', "Should use the list template in #{locale}" + assert_response :success, "Should be able to list the diary entries in locale" + assert_template 'list', "Should use the list template in locale" assert_select "span[class=translation_missing]", false, "Missing translation in list of diary entries" # Now try to find a specific user's diary entry get :list, {:display_name => users(:normal_user).display_name} - assert_response :success, "Should be able to list the diary entries for a user in #{locale}" - assert_template 'list', "Should use the list template for a user in #{locale}" - assert_select "span[class=translation_missing]", false, "Missing translation in list of diary entries for user" - end + assert_response :success, "Should be able to list the diary entries for a user in locale" + assert_template 'list', "Should use the list template for a user in locale" + assert_no_missing_translations end def test_rss - get :rss - assert_response :success + get :rss, {:format => :rss} + assert_response :success, "Should be able to get a diary RSS" + assert_select "rss", :count => 1 do + assert_select "channel", :count => 1 do + assert_select "channel>title", :count => 1 + assert_select "image", :count => 1 + assert_select "channel>item", :count => 2 + end + end end + def test_rss_language + get :rss, {:language => diary_entries(:normal_user_entry_1).language_code, :format => :rss} + assert_response :success, "Should be able to get a specific language diary RSS" + assert_select "rss>channel>item", :count => 1 #, "Diary entries should be filtered by language" + end + +# def test_rss_nonexisting_language +# get :rss, {:language => 'xx', :format => :rss} +# assert_response :not_found, "Should not be able to get a nonexisting language diary RSS" +# end + + def test_rss_language_with_no_entries + 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 + 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" + end + + def test_rss_nonexisting_user + get :rss, {:display_name => 'fakeUsername76543', :format => :rss} + assert_response :not_found, "Should not be able to get a nonexisting users diary RSS" + end + def test_viewing_diary_entry get :view, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id} assert_response :success