X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6ba51da46e41f2cf9260ef8e0b74a933ae82a362..42cdcce858e38418403aa4733837da4c3a62ff34:/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 3bbf8ae0a..1f3492ae9 100644 --- a/test/functional/diary_entry_controller_test.rb +++ b/test/functional/diary_entry_controller_test.rb @@ -16,11 +16,11 @@ class DiaryEntryControllerTest < ActionController::TestCase #print @response.to_yaml assert_select "html:root", :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 + 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 @@ -72,7 +72,7 @@ class DiaryEntryControllerTest < ActionController::TestCase 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", :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 @@ -87,10 +87,10 @@ class DiaryEntryControllerTest < ActionController::TestCase new_body = "This is a new body for the diary entry" new_latitude = "1.1" new_longitude = "2.2" - new_language = "en" + new_language_code = "en" post(:edit, {:id => diary_entries(:normal_user_entry_1).id, 'commit' => 'save', 'diary_entry'=>{'title' => new_title, 'body' => new_body, 'latitude' => new_latitude, - 'longitude' => new_longitude, 'language' => new_language} }, + 'longitude' => new_longitude, 'language_code' => new_language_code} }, {'user' => users(:normal_user).id}) assert_response :redirect assert_redirected_to :action => :view, :id => diary_entries(:normal_user_entry_1).id @@ -145,6 +145,12 @@ class DiaryEntryControllerTest < ActionController::TestCase end + def test_edit_diary_entry_i18n + 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 + def test_create_diary_entry #post :new end @@ -156,25 +162,58 @@ class DiaryEntryControllerTest < ActionController::TestCase # 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}" - 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 + assert_response :success, "Should be able to get a diary RSS" + assert_select "rss:root", :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} + 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'} +# 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'} + 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} + 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'} + 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