From: Tom Hughes Date: Tue, 28 Apr 2020 18:44:43 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/2601' X-Git-Tag: live~3058 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/11e97b3edb057f6f449209ca2afd169feda229a4?hp=570db89eb8767cb24ece1d1e8f3ef59365b6d60f Merge remote-tracking branch 'upstream/pull/2601' --- diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 5aa5aba70..a55690951 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -34,6 +34,7 @@ class MessagesController < ApplicationController Notifier.message_notification(@message).deliver_later redirect_to :action => :inbox else + @title = t "messages.new.title" render :action => "new" end end diff --git a/config/locales/be.yml b/config/locales/be.yml index 215509c7f..ebfaebea0 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -46,7 +46,7 @@ be: errors: messages: invalid_email_address: не падобны на карэктны адрас электроннай пошты - email_address_not_routable: мемагчыма пракласці маршрут + email_address_not_routable: немагчыма пракласці маршрут models: acl: Спіс правоў доступу changeset: Пакет правак @@ -55,6 +55,7 @@ be: diary_comment: Каментар дзённіка diary_entry: Запіс дзённіка friend: Сябар + issue: Праблема language: Мова message: Паведамленне node: Пункт @@ -71,6 +72,7 @@ be: relation: Дачыненне relation_member: Удзельнік дачынення relation_tag: Тэг дачынення + report: Справаздача session: Сеанс trace: След tracepoint: Пункт следу @@ -117,7 +119,9 @@ be: datetime: distance_in_words_ago: about_x_hours: - one: прыкладна гадзіну таму + one: прыкладна 1 гадзіну таму + few: прыкладна %{count} гадзіны таму + many: прыкладна %{count} гадзін таму other: прыкладна %{count} гадзін(ы) таму about_x_months: one: прыкладна 1 месяц таму @@ -138,8 +142,8 @@ be: less_than_x_seconds: one: менш за секунду таму few: менш за %{count} секунды таму - many: менш за %{count} секундаў таму - other: менш за %{count} секунды(аў) таму + many: менш за %{count} секунд таму + other: менш за %{count} секунд(ы) таму less_than_x_minutes: one: менш за хвіліну таму few: менш за %{count} хвіліны таму @@ -153,8 +157,8 @@ be: x_seconds: one: 1 секунду таму few: '%{count} секунды таму' - many: '%{count} секундаў таму' - other: '%{count} секунды(аў) таму' + many: '%{count} секунд таму' + other: '%{count} секунд(ы) таму' x_minutes: one: 1 хвіліну таму few: '%{count} хвіліны таму' @@ -189,6 +193,15 @@ be: remote: name: Вонкавы рэдактар description: вонкавага рэдактара (JOSM або Merkaartor) + auth: + providers: + none: Няма + openid: OpenID + google: Google + facebook: Facebook + windowslive: Windows Live + github: GitHub + wikipedia: Вікіпедыя api: notes: comment: @@ -321,9 +334,8 @@ be: open_title: 'Нявырашаная заўвага #%{note_name}' closed_title: 'Вырашаная заўвага #%{note_name}' hidden_title: 'Схаваная заўвага #%{note_name}' - opened_by: Створана %{user} %{when} таму - opened_by_anonymous: Створана ананімным карыстальнікам %{when} - таму + opened_by: Створана %{user} %{when} + opened_by_anonymous: Створана ананімным карыстальнікам %{when} commented_by: Каментарый ад %{user} %{when} commented_by_anonymous: Ананімны каментарый %{when} @@ -1239,8 +1251,14 @@ be: more_info_2: 'збой, можна знайсці тут:' success: subject: '[OpenStreetMap] Паспяховы імпарт GPX' - loaded_successfully: паспяхова загружаны з %{trace_points} з магчымых %{possible_points} - кропак. + loaded_successfully: + one: паспяхова загружаны (%{trace_points} з магчымага 1 пункта). + few: паспяхова загружаны (%{trace_points} з магчымых %{possible_points} + пунктаў). + many: паспяхова загружаны (%{trace_points} з магчымых %{possible_points} + пунктаў). + other: паспяхова загружаны (%{trace_points} з магчымых %{possible_points} + пунктаў). signup_confirm: subject: '[OpenStreetMap] Сардэчна запрашаем у OpenStreetMap' greeting: Прывітанне! @@ -1949,7 +1967,7 @@ be: my_traces: Мае GPS-сляды public_traces_from: Агульныя GPS-сляды карыстальніка %{user} description: Агляд нядаўна дададзеных GPS-слядоў - tagged_with: ' адмечана як %{tags}' + tagged_with: 'з тэгамі: %{tags}' empty_html: Пакуль тут нічога няма. Загрузіце новы след або пачытайце пра GPS-сляды на вікі-старонцы. @@ -2618,6 +2636,16 @@ be: out: Паменшыць locate: title: Паказаць маё месцазнаходжанне + metersPopup: + one: Вы знаходзіцеся ў адным метры ад гэтага пункту + few: Вы знаходзіцеся ў %{count} метрах ад гэтага пункту + many: Вы знаходзіцеся ў %{count} метрах ад гэтага пункту + other: Вы знаходзіцеся ў %{count} метрах ад гэтага пункту + feetPopup: + one: Вы знаходзіцеся ў адным фуце ад гэтага пункту + few: Вы знаходзіцеся ў %{count} футах ад гэтага пункту + many: Вы знаходзіцеся ў %{count} футах ад гэтага пункту + other: Вы знаходзіцеся ў %{count} футах ад гэтага пункту base: standard: Звычайная карта cycle_map: Веласіпедная карта @@ -2633,6 +2661,9 @@ be: copyright: © OpenStreetMap contributors donate_link_text: terms: Умовы выкарыстання сайта і API + thunderforest: Тайлы прадастаўлены Andy Allan + hotosm: Афармленне тайлаў Humanitarian OpenStreetMap + Team, хостынг ад OpenStreetMap France site: edit_tooltip: Рэдагаваць карту edit_disabled_tooltip: Наблізце, каб рэдагаваць карту diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 2238f0910..faa835978 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -9,6 +9,7 @@ # Author: Elias Ahmmad # Author: Gronthokeet # Author: Kayser Ahmad +# Author: Md. Golam Mukit Khan # Author: Nasir8891 # Author: R4bb1 # Author: Rasal Lia @@ -52,6 +53,7 @@ bn: diary_comment: ডাইরিতে মন্তব্য diary_entry: ডাইরির ভুক্তি friend: বন্ধু + issue: সমস্যা language: ভাষা message: বার্তা node: সংযোগস্থল @@ -68,6 +70,7 @@ bn: relation: সম্পর্ক relation_member: সম্পর্ক সদস্য relation_tag: সম্পর্ক ট্যাগ + report: অভিযোগ session: সেশন trace: ট্রেস tracepoint: পথচিহ্ন বিন্দু @@ -164,6 +167,13 @@ bn: remote: name: রিমোট কন্ট্রোল description: রিমোট কন্ট্রোল (JOSM অথবা Merkaartor) + auth: + providers: + google: গুগল + facebook: ফেসবুক + windowslive: উইন্ডোজ লাইভ + github: গিটহাব + wikipedia: উইকিপিডিয়া api: notes: comment: @@ -748,6 +758,7 @@ bn: administrative: প্রশাসন architect: স্থপতি company: কোম্পানি + educational_institution: শিক্ষা প্রতিষ্ঠান employment_agency: কর্মসংস্থান সংস্থা estate_agent: এস্টেট এজেন্ট government: সরকারি দপ্তর diff --git a/config/locales/fa.yml b/config/locales/fa.yml index e58b44c07..af554048d 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -1494,8 +1494,8 @@ fa: more_1_html: برای اطلاعات بیشتر دربارهٔ استفاده از داده‌های ما و چگونگی یادکرد ما صفحهٔ پروانهٔ بنیاد OSM را بخوانید. - more_2_html: اگرچه داده‌های اوپن‌استریت‌مپ آزاد است، اما نمی‌توانیم API نقشه - را به‌رایگان در اختیار توسعه‌دهندگان شخص ثالث قرار دهیم. سیاست + more_2_html: اگرچه دادهٔ اوپن‌استریت‌مپ آزاد است، اما نمی‌توانیم API نقشه + را به‌رایگان در اختیار توسعه‌دهندگان ثالث قرار دهیم. سیاست استفاده از API ، سیاست استفاده از کاشی‌ها و سیاست استفاده از Nominatim را ببینید. @@ -2089,7 +2089,7 @@ fa: register now: اکنون ثبت‌نام کنید with username: 'از قبل حساب OpenStreetMap دارید؟ لطفاً با نام کاربری و رمز عبورتان وارد شوید:' - with external: 'ورود به روش دیگر: از طریق شخص ثالث' + with external: 'به‌جای ثبت نام، از روش شخص ثالث استفاده کنید:' new to osm: در OpenStreetMap تازه‌وارد هستید؟ to make changes: برای ویرایش داده‌های OpenStreetMap، باید یک حساب کاربری داشته باشید. @@ -2169,16 +2169,16 @@ fa: مشارکت‌کننده موافقت کنید. email address: 'نشانی ایمیل:' confirm email address: 'تأیید نشانی ایمیل:' - not_displayed_publicly_html: نشانی شما به دیگران نشان داده نمی‌شود. برای اطلاعات + not_displayed_publicly_html: ایمیل شما به دیگران نشان داده نمی‌شود. برای اطلاعات بیشتر سیاست حریم خصوصی را ببینید display name: 'نام نمایشی:' display name description: نام کاربری شما که دیگران آن را می‌بینند. می‌توانید بعداً آن را در تنظیمات تغییر دهید. - external auth: 'اعتبارسنجی طرف سوم:' + external auth: 'احراز هویت شخص ثالث:' password: 'کلمهٔ عبور:' confirm password: 'تأیید کلمهٔ عبور:' - use external auth: 'ورود به روش دیگر: از طریق شخص ثالث' + use external auth: به‌جای ثبت نام، از روش شخص ثالث استفاده کنید auth no password: در اعتبارسنجی به‌روش شخص ثالث نیازی به گذرواژهٔ اوپن‌استریت‌مپ ندارید اما شاید میزبان انتخابی شما گذرواژهٔ خودش را بخواهد. continue: ثبت نام diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 513533b2a..88fcc724f 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -1071,9 +1071,9 @@ pl: canal: Kanał dam: Tama derelict_canal: Opuszczony kanał - ditch: Rów + ditch: Rów przydrożny dock: Basen portowy - drain: Rów odpływowy + drain: Rów odwadniający lock: Śluza lock_gate: Wrota śluzy mooring: Kotwicowisko diff --git a/config/locales/sv.yml b/config/locales/sv.yml index ff6e590b7..49d5f2400 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -1262,8 +1262,15 @@ sv: more_info_2: 'de kan hittas på:' success: subject: '[OpenStreetMap] Lyckades importera GPX' - loaded_successfully: inläst med %{trace_points} av %{possible_points} möjliga - punkter. + loaded_successfully: + one: |- + inläst med %{trace_points} av 1 möjlig punkt. + + inläst med %{trace_points} av %{possible_points} möjliga punkter. + other: |- + inläst med %{trace_points} av %{possible_points} möjliga punkter. + + inläst med %{trace_points} av %{possible_points} möjliga punkter. signup_confirm: subject: '[OpenStreetMap] Välkommen till OpenStreetMap' greeting: Hej där! diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 8faf3b7b7..d9ef6cffc 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -59,6 +59,7 @@ vi: diary_comment: Bình luận Nhật ký diary_entry: Mục Nhật ký friend: Người bạn + issue: Vấn đề language: Ngôn ngữ message: Thư node: Nốt @@ -75,6 +76,7 @@ vi: relation: Quan hệ relation_member: Thành viên Quan hệ relation_tag: Thẻ Quan hệ + report: Báo cáo session: Phiên trace: Tuyến đường tracepoint: Điểm Tuyến đường @@ -171,6 +173,15 @@ vi: remote: name: phần điều khiển từ xa description: phần điều khiển từ xa (JOSM hoặc Merkaartor) + auth: + providers: + none: Không có + openid: OpenID + google: Google + facebook: Facebook + windowslive: Windows Live + github: GitHub + wikipedia: Wikipedia api: notes: comment: @@ -246,7 +257,7 @@ vi: relation: title_html: 'Quan hệ: %{name}' history_title_html: 'Lịch sử Quan hệ: %{name}' - members: Các thành viên + members: Thành viên relation_member: entry_role_html: '%{type} %{name} với vai trò %{role}' type: @@ -334,7 +345,7 @@ vi: comment: Tóm lược area: Vùng index: - title: Các bộ thay đổi + title: Bộ thay đổi title_user: Những bộ thay đổi bởi %{user} title_friend: Những bộ thay đổi bởi bạn bè của bạn title_nearby: Những bộ thay đổi bởi người dùng ở gần @@ -456,6 +467,7 @@ vi: platter: Đĩa Treo pylon: Cột tháp station: Trạm Cáp treo + t-bar: T-Bar Lift aeroway: aerodrome: Sân bay airstrip: Bãi hạ cánh @@ -707,6 +719,7 @@ vi: bird_hide: Căn nhà Quan sát Chim common: Đất Công dog_park: Công viên Chó + firepit: Fire Pit fishing: Hồ Đánh cá fitness_centre: Trung tâm Thể dục fitness_station: Trạm Thể dục diff --git a/config/routes.rb b/config/routes.rb index 40282b373..0af86782e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -106,18 +106,18 @@ OpenStreetMap::Application.routes.draw do # Data browsing get "/way/:id" => "browse#way", :id => /\d+/, :as => :way - get "/way/:id/history" => "browse#way_history", :id => /\d+/ + get "/way/:id/history" => "browse#way_history", :id => /\d+/, :as => :way_history get "/node/:id" => "browse#node", :id => /\d+/, :as => :node - get "/node/:id/history" => "browse#node_history", :id => /\d+/ + get "/node/:id/history" => "browse#node_history", :id => /\d+/, :as => :node_history get "/relation/:id" => "browse#relation", :id => /\d+/, :as => :relation - get "/relation/:id/history" => "browse#relation_history", :id => /\d+/ + get "/relation/:id/history" => "browse#relation_history", :id => /\d+/, :as => :relation_history get "/changeset/:id" => "browse#changeset", :as => :changeset, :id => /\d+/ get "/changeset/:id/comments/feed" => "changeset_comments#index", :as => :changeset_comments_feed, :id => /\d*/, :defaults => { :format => "rss" } get "/note/:id" => "browse#note", :id => /\d+/, :as => "browse_note" get "/note/new" => "browse#new_note" get "/user/:display_name/history" => "changesets#index" get "/user/:display_name/history/feed" => "changesets#feed", :defaults => { :format => :atom } - get "/user/:display_name/notes" => "notes#mine" + get "/user/:display_name/notes" => "notes#mine", :as => :my_notes get "/history/friends" => "changesets#index", :friends => true, :as => "friend_changesets", :defaults => { :format => :html } get "/history/nearby" => "changesets#index", :nearby => true, :as => "nearby_changesets", :defaults => { :format => :html } @@ -193,9 +193,9 @@ OpenStreetMap::Application.routes.draw do get "/user/:display_name/traces" => "traces#index" get "/user/:display_name/traces/tag/:tag/rss" => "traces#georss", :defaults => { :format => :rss } get "/user/:display_name/traces/rss" => "traces#georss", :defaults => { :format => :rss } - get "/user/:display_name/traces/:id" => "traces#show" - get "/user/:display_name/traces/:id/picture" => "traces#picture" - get "/user/:display_name/traces/:id/icon" => "traces#icon" + get "/user/:display_name/traces/:id" => "traces#show", :as => "show_trace" + get "/user/:display_name/traces/:id/picture" => "traces#picture", :as => "trace_picture" + get "/user/:display_name/traces/:id/icon" => "traces#icon", :as => "trace_icon" get "/traces/tag/:tag/page/:page" => "traces#index", :page => /[1-9][0-9]*/ get "/traces/tag/:tag" => "traces#index" get "/traces/page/:page" => "traces#index", :page => /[1-9][0-9]*/ @@ -220,13 +220,13 @@ OpenStreetMap::Application.routes.draw do get "/diary/:language/rss" => "diary_entries#rss", :defaults => { :format => :rss } get "/diary/rss" => "diary_entries#rss", :defaults => { :format => :rss } get "/user/:display_name/diary/comments/:page" => "diary_entries#comments", :page => /[1-9][0-9]*/ - get "/user/:display_name/diary/comments/" => "diary_entries#comments" + get "/user/:display_name/diary/comments/" => "diary_entries#comments", :as => :diary_comments get "/user/:display_name/diary" => "diary_entries#index" get "/diary/:language" => "diary_entries#index" scope "/user/:display_name" do resources :diary_entries, :path => "diary", :only => [:edit, :update, :show] end - post "/user/:display_name/diary/:id/newcomment" => "diary_entries#comment", :id => /\d+/ + post "/user/:display_name/diary/:id/newcomment" => "diary_entries#comment", :id => /\d+/, :as => :comment_diary_entry post "/user/:display_name/diary/:id/hide" => "diary_entries#hide", :id => /\d+/, :as => :hide_diary_entry post "/user/:display_name/diary/:id/unhide" => "diary_entries#unhide", :id => /\d+/, :as => :unhide_diary_entry post "/user/:display_name/diary/:id/hidecomment/:comment" => "diary_entries#hidecomment", :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment @@ -290,8 +290,8 @@ OpenStreetMap::Application.routes.draw do # roles and banning pages post "/user/:display_name/role/:role/grant" => "user_roles#grant", :as => "grant_role" post "/user/:display_name/role/:role/revoke" => "user_roles#revoke", :as => "revoke_role" - get "/user/:display_name/blocks" => "user_blocks#blocks_on" - get "/user/:display_name/blocks_by" => "user_blocks#blocks_by" + get "/user/:display_name/blocks" => "user_blocks#blocks_on", :as => "user_blocks_on" + get "/user/:display_name/blocks_by" => "user_blocks#blocks_by", :as => "user_blocks_by" get "/blocks/new/:display_name" => "user_blocks#new", :as => "new_user_block" resources :user_blocks match "/blocks/:id/revoke" => "user_blocks#revoke", :via => [:get, :post], :as => "revoke_user_block" diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb index 40e11a749..30b33e0ca 100644 --- a/test/controllers/browse_controller_test.rb +++ b/test/controllers/browse_controller_test.rb @@ -1,6 +1,6 @@ require "test_helper" -class BrowseControllerTest < ActionController::TestCase +class BrowseControllerTest < ActionDispatch::IntegrationTest ## # test all routes which lead to this controller def test_routes @@ -47,36 +47,41 @@ class BrowseControllerTest < ActionController::TestCase end def test_read_relation - browse_check "relation", create(:relation).id, "browse/feature" + browse_check :relation_path, create(:relation).id, "browse/feature" end def test_read_relation_history - browse_check "relation_history", create(:relation, :with_history).id, "browse/history" + browse_check :relation_history_path, create(:relation, :with_history).id, "browse/history" end def test_read_way - browse_check "way", create(:way).id, "browse/feature" + browse_check :way_path, create(:way).id, "browse/feature" end def test_read_way_history - browse_check "way_history", create(:way, :with_history).id, "browse/history" + browse_check :way_history_path, create(:way, :with_history).id, "browse/history" end def test_read_node - browse_check "node", create(:node).id, "browse/feature" + browse_check :node_path, create(:node).id, "browse/feature" end def test_read_node_history - browse_check "node_history", create(:node, :with_history).id, "browse/history" + browse_check :node_history_path, create(:node, :with_history).id, "browse/history" end def test_read_changeset user = create(:user) - private_changeset = create(:changeset, :user => create(:user, :data_public => false)) changeset = create(:changeset, :user => user) create(:changeset, :user => user) - browse_check "changeset", private_changeset.id, "browse/changeset" - browse_check "changeset", changeset.id, "browse/changeset" + browse_check :changeset_path, changeset.id, "browse/changeset" + end + + def test_read_private_changeset + user = create(:user) + changeset = create(:changeset, :user => create(:user, :data_public => false)) + create(:changeset, :user => user) + browse_check :changeset_path, changeset.id, "browse/changeset" end def test_read_changeset_hidden_comments @@ -84,37 +89,37 @@ class BrowseControllerTest < ActionController::TestCase create_list(:changeset_comment, 3, :changeset => changeset) create(:changeset_comment, :visible => false, :changeset => changeset) - browse_check "changeset", changeset.id, "browse/changeset" + browse_check :changeset_path, changeset.id, "browse/changeset" assert_select "div.changeset-comments ul li", :count => 3 - session[:user] = create(:moderator_user).id + session_for(create(:moderator_user)) - browse_check "changeset", changeset.id, "browse/changeset" + browse_check :changeset_path, changeset.id, "browse/changeset" assert_select "div.changeset-comments ul li", :count => 4 end def test_read_note open_note = create(:note_with_comments) - browse_check "note", open_note.id, "browse/note" + browse_check :browse_note_path, open_note.id, "browse/note" end def test_read_hidden_note hidden_note_with_comment = create(:note_with_comments, :status => "hidden") - get :note, :params => { :id => hidden_note_with_comment.id } + get browse_note_path(:id => hidden_note_with_comment) assert_response :not_found assert_template "browse/not_found" assert_template :layout => "map" - get :note, :params => { :id => hidden_note_with_comment.id }, :xhr => true + get browse_note_path(:id => hidden_note_with_comment), :xhr => true assert_response :not_found assert_template "browse/not_found" assert_template :layout => "xhr" - session[:user] = create(:moderator_user).id + session_for(create(:moderator_user)) - browse_check "note", hidden_note_with_comment.id, "browse/note" + browse_check :browse_note_path, hidden_note_with_comment.id, "browse/note" end def test_read_note_hidden_comments @@ -122,12 +127,12 @@ class BrowseControllerTest < ActionController::TestCase create(:note_comment, :note => note, :visible => false) end - browse_check "note", note_with_hidden_comment.id, "browse/note" + browse_check :browse_note_path, note_with_hidden_comment.id, "browse/note" assert_select "div.note-comments ul li", :count => 1 - session[:user] = create(:moderator_user).id + session_for(create(:moderator_user)) - browse_check "note", note_with_hidden_comment.id, "browse/note" + browse_check :browse_note_path, note_with_hidden_comment.id, "browse/note" assert_select "div.note-comments ul li", :count => 2 end @@ -137,12 +142,12 @@ class BrowseControllerTest < ActionController::TestCase create(:note_comment, :note => note, :author => hidden_user) end - browse_check "note", note_with_hidden_user_comment.id, "browse/note" + browse_check :browse_note_path, note_with_hidden_user_comment.id, "browse/note" assert_select "div.note-comments ul li", :count => 1 - session[:user] = create(:moderator_user).id + session_for(create(:moderator_user)) - browse_check "note", note_with_hidden_user_comment.id, "browse/note" + browse_check :browse_note_path, note_with_hidden_user_comment.id, "browse/note" assert_select "div.note-comments ul li", :count => 1 end @@ -159,7 +164,7 @@ class BrowseControllerTest < ActionController::TestCase node_v1 = node.old_nodes.find_by(:version => 1) node_v1.redact!(create(:redaction)) - get :node, :params => { :id => node.id } + get node_path(:id => node) assert_response :success assert_template "feature" @@ -175,7 +180,7 @@ class BrowseControllerTest < ActionController::TestCase node_v1 = node.old_nodes.find_by(:version => 1) node_v1.redact!(create(:redaction)) - get :node_history, :params => { :id => node.id } + get node_history_path(:id => node) assert_response :success assert_template "browse/history" @@ -195,7 +200,7 @@ class BrowseControllerTest < ActionController::TestCase way_v3 = way.old_ways.find_by(:version => 3) way_v3.redact!(create(:redaction)) - get :way_history, :params => { :id => way.id } + get way_history_path(:id => way) assert_response :success assert_template "browse/history" @@ -213,7 +218,7 @@ class BrowseControllerTest < ActionController::TestCase relation_v3 = relation.old_relations.find_by(:version => 3) relation_v3.redact!(create(:redaction)) - get :relation_history, :params => { :id => relation.id } + get relation_history_path(:id => relation) assert_response :success assert_template "browse/history" @@ -225,13 +230,13 @@ class BrowseControllerTest < ActionController::TestCase end def test_new_note - get :new_note + get note_new_path assert_response :success assert_template "browse/new_note" end def test_query - get :query + get query_path assert_response :success assert_template "browse/query" end @@ -242,31 +247,33 @@ class BrowseControllerTest < ActionController::TestCase # First we check that when we don't have an id, it will correctly return a 404 # then we check that we get the correct 404 when a non-existant id is passed # then we check that it will get a successful response, when we do pass an id - def browse_check(type, id, template) + def browse_check(path, id, template) + path_method = method(path) + assert_raise ActionController::UrlGenerationError do - get type + get path_method.call end assert_raise ActionController::UrlGenerationError do - get type, :params => { :id => -10 } # we won't have an id that's negative + get path_method.call(:id => -10) # we won't have an id that's negative end - get type, :params => { :id => 0 } + get path_method.call(:id => 0) assert_response :not_found assert_template "browse/not_found" assert_template :layout => "map" - get type, :params => { :id => 0 }, :xhr => true + get path_method.call(:id => 0), :xhr => true assert_response :not_found assert_template "browse/not_found" assert_template :layout => "xhr" - get type, :params => { :id => id } + get path_method.call(:id => id) assert_response :success assert_template template assert_template :layout => "map" - get type, :params => { :id => id }, :xhr => true + get path_method.call(:id => id), :xhr => true assert_response :success assert_template template assert_template :layout => "xhr" diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb index 8996e40ee..868171752 100644 --- a/test/controllers/diary_entries_controller_test.rb +++ b/test/controllers/diary_entries_controller_test.rb @@ -1,6 +1,6 @@ require "test_helper" -class DiaryEntriesControllerTest < ActionController::TestCase +class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest include ActionView::Helpers::NumberHelper def setup @@ -111,14 +111,15 @@ class DiaryEntriesControllerTest < ActionController::TestCase def test_new_no_login # Make sure that you are redirected to the login page when you # are not logged in - get :new + get new_diary_entry_path assert_response :redirect assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/new" end def test_new_form # Now try again when logged in - get :new, :session => { :user => create(:user) } + session_for(create(:user)) + get new_diary_entry_path assert_response :success assert_select "title", :text => /New Diary Entry/, :count => 1 assert_select "div.content-heading", :count => 1 do @@ -141,12 +142,11 @@ class DiaryEntriesControllerTest < ActionController::TestCase def test_new_get_with_params # Now try creating a diary entry using get + session_for(create(:user)) assert_difference "DiaryEntry.count", 0 do - get :new, - :params => { :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" } }, - :session => { :user => create(:user).id } + get new_diary_entry_path(: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" }) end assert_response :success assert_template :new @@ -155,12 +155,11 @@ class DiaryEntriesControllerTest < ActionController::TestCase def test_create_no_body # Now try creating a invalid diary entry with an empty body user = create(:user) + session_for(user) assert_no_difference "DiaryEntry.count" do - post :create, - :params => { :commit => "save", - :diary_entry => { :title => "New Title", :body => "", :latitude => "1.1", - :longitude => "2.2", :language_code => "en" } }, - :session => { :user => user.id } + post diary_entries_path(:commit => "save", + :diary_entry => { :title => "New Title", :body => "", :latitude => "1.1", + :longitude => "2.2", :language_code => "en" }) end assert_response :success assert_template :new @@ -171,12 +170,11 @@ class DiaryEntriesControllerTest < ActionController::TestCase def test_create # Now try creating a diary entry user = create(:user) + session_for(user) assert_difference "DiaryEntry.count", 1 do - post :create, - :params => { :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" } }, - :session => { :user => user.id } + post diary_entries_path(: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" }) end assert_response :redirect assert_redirected_to :action => :index, :display_name => user.display_name @@ -197,14 +195,13 @@ class DiaryEntriesControllerTest < ActionController::TestCase def test_create_german create(:language, :code => "de") user = create(:user) + session_for(user) # Now try creating a diary entry in a different language assert_difference "DiaryEntry.count", 1 do - post :create, - :params => { :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 => "de" } }, - :session => { :user => user.id } + post diary_entries_path(: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 => "de" }) end assert_response :redirect assert_redirected_to :action => :index, :display_name => user.display_name @@ -224,16 +221,16 @@ class DiaryEntriesControllerTest < ActionController::TestCase def test_new_spammy user = create(:user) + session_for(user) + # Generate some spammy content spammy_title = "Spam Spam Spam Spam Spam" spammy_body = 1.upto(50).map { |n| "http://example.com/spam#{n}" }.join(" ") # Try creating a spammy diary entry assert_difference "DiaryEntry.count", 1 do - post :create, - :params => { :commit => "save", - :diary_entry => { :title => spammy_title, :body => spammy_body, :language_code => "en" } }, - :session => { :user => user.id } + post diary_entries_path(:commit => "save", + :diary_entry => { :title => spammy_title, :body => spammy_body, :language_code => "en" }) end assert_response :redirect assert_redirected_to :action => :index, :display_name => user.display_name @@ -245,9 +242,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase assert_equal "suspended", User.find(user.id).status # Follow the redirect - get :index, - :params => { :display_name => user.display_name }, - :session => { :user => user } + get diary_entries_path(:display_name => user.display_name) assert_response :redirect assert_redirected_to :controller => :users, :action => :suspended end @@ -260,33 +255,30 @@ class DiaryEntriesControllerTest < ActionController::TestCase # 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, - :params => { :display_name => entry.user.display_name, :id => entry.id } + get edit_diary_entry_path(:display_name => entry.user.display_name, :id => entry) assert_response :redirect assert_redirected_to :controller => :users, :action => :login, :referer => "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit" - # Verify that you get a not found error, when you pass a bogus id - get :edit, - :params => { :display_name => entry.user.display_name, :id => 9999 }, - :session => { :user => entry.user } - assert_response :not_found - assert_select "div.content-heading", :count => 1 do - assert_select "h2", :text => "No entry with the id: 9999", :count => 1 - end + session_for(other_user) # Verify that you get redirected to show if you are not the user # that created the entry - get :edit, - :params => { :display_name => entry.user.display_name, :id => entry.id }, - :session => { :user => other_user } + get edit_diary_entry_path(:display_name => entry.user.display_name, :id => entry) assert_response :redirect assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id + session_for(entry.user) + + # Verify that you get a not found error, when you pass a bogus id + get edit_diary_entry_path(:display_name => entry.user.display_name, :id => 9999) + assert_response :not_found + assert_select "div.content-heading", :count => 1 do + assert_select "h2", :text => "No entry with the id: 9999", :count => 1 + 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, - :params => { :display_name => entry.user.display_name, :id => entry.id }, - :session => { :user => entry.user } + get edit_diary_entry_path(:display_name => entry.user.display_name, :id => entry) assert_response :success assert_select "title", :text => /Edit Diary Entry/, :count => 1 assert_select "div.content-heading", :count => 1 do @@ -312,18 +304,14 @@ class DiaryEntriesControllerTest < ActionController::TestCase new_latitude = "1.1" new_longitude = "2.2" new_language_code = "en" - put :update, - :params => { :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 } }, - :session => { :user => entry.user.id } + put diary_entry_path(:display_name => entry.user.display_name, :id => entry, :commit => "save", + :diary_entry => { :title => new_title, :body => new_body, :latitude => new_latitude, + :longitude => new_longitude, :language_code => new_language_code }) assert_response :redirect assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id # Now check that the new data is rendered, when logged in - get :show, - :params => { :display_name => entry.user.display_name, :id => entry.id }, - :session => { :user => entry.user } + get diary_entry_path(:display_name => entry.user.display_name, :id => entry) assert_response :success assert_template "show" assert_select "title", :text => /Users' diaries | /, :count => 1 @@ -342,9 +330,8 @@ class DiaryEntriesControllerTest < ActionController::TestCase end # and when not logged in as the user who wrote the entry - get :show, - :params => { :display_name => entry.user.display_name, :id => entry.id }, - :session => { :user => create(:user) } + session_for(create(:user)) + get diary_entry_path(:display_name => entry.user.display_name, :id => entry) assert_response :success assert_template "show" assert_select "title", :text => /Users' diaries | /, :count => 1 @@ -365,9 +352,8 @@ class DiaryEntriesControllerTest < ActionController::TestCase def test_edit_i18n user = create(:user) diary_entry = create(:diary_entry, :language_code => "en", :user => user) - get :edit, - :params => { :display_name => user.display_name, :id => diary_entry.id }, - :session => { :user => user } + session_for(user) + get edit_diary_entry_path(:display_name => user.display_name, :id => diary_entry) assert_response :success assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry" end @@ -376,33 +362,27 @@ class DiaryEntriesControllerTest < ActionController::TestCase user = create(:user) other_user = create(:user) entry = create(:diary_entry, :user => user) + create(:diary_entry_subscription, :diary_entry => entry, :user => user) # Make sure that you are denied when you are not logged in - post :comment, - :params => { :display_name => entry.user.display_name, :id => entry.id } + post comment_diary_entry_path(:display_name => entry.user.display_name, :id => entry) assert_response :forbidden + session_for(other_user) + # Verify that you get a not found error, when you pass a bogus id - post :comment, - :params => { :display_name => entry.user.display_name, :id => 9999 }, - :session => { :user => other_user } + post comment_diary_entry_path(:display_name => entry.user.display_name, :id => 9999) assert_response :not_found assert_select "div.content-heading", :count => 1 do assert_select "h2", :text => "No entry with the id: 9999", :count => 1 end - post :subscribe, - :params => { :id => entry.id, :display_name => entry.user.display_name }, - :session => { :user => user } - # Now try an invalid comment with an empty body assert_no_difference "ActionMailer::Base.deliveries.size" do assert_no_difference "DiaryComment.count" do assert_no_difference "entry.subscribers.count" do perform_enqueued_jobs do - post :comment, - :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "" } }, - :session => { :user => other_user } + post comment_diary_entry_path(:display_name => entry.user.display_name, :id => entry, :diary_comment => { :body => "" }) end end end @@ -415,9 +395,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase assert_difference "DiaryComment.count", 1 do assert_difference "entry.subscribers.count", 1 do perform_enqueued_jobs do - post :comment, - :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "New comment" } }, - :session => { :user => other_user } + post comment_diary_entry_path(:display_name => entry.user.display_name, :id => entry, :diary_comment => { :body => "New comment" }) end end end @@ -436,8 +414,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase assert_equal "New comment", comment.body # Now show the diary entry, and check the new comment is present - get :show, - :params => { :display_name => entry.user.display_name, :id => entry.id } + get diary_entry_path(:display_name => entry.user.display_name, :id => entry) assert_response :success assert_select ".diary-comment", :count => 1 do assert_select "#comment#{comment.id}", :count => 1 do @@ -450,12 +427,10 @@ class DiaryEntriesControllerTest < ActionController::TestCase def test_comment_spammy user = create(:user) other_user = create(:user) - - # Find the entry to comment on entry = create(:diary_entry, :user => user) - post :subscribe, - :params => { :id => entry.id, :display_name => entry.user.display_name }, - :session => { :user => user } + create(:diary_entry_subscription, :diary_entry => entry, :user => user) + + session_for(other_user) # Generate some spammy content spammy_text = 1.upto(50).map { |n| "http://example.com/spam#{n}" }.join(" ") @@ -464,9 +439,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase assert_difference "ActionMailer::Base.deliveries.size", 1 do assert_difference "DiaryComment.count", 1 do perform_enqueued_jobs do - post :comment, - :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => spammy_text } }, - :session => { :user => other_user } + post comment_diary_entry_path(:display_name => entry.user.display_name, :id => entry, :diary_comment => { :body => spammy_text }) end end end @@ -485,15 +458,12 @@ class DiaryEntriesControllerTest < ActionController::TestCase assert_equal "suspended", User.find(other_user.id).status # Follow the redirect - get :index, - :params => { :display_name => user.display_name }, - :session => { :user => other_user } + get diary_entries_path(:display_name => user.display_name) assert_response :redirect assert_redirected_to :controller => :users, :action => :suspended # Now show the diary entry, and check the new comment is not present - get :show, - :params => { :display_name => entry.user.display_name, :id => entry.id } + get diary_entry_path(:display_name => entry.user.display_name, :id => entry) assert_response :success assert_select ".diary-comment", :count => 0 end @@ -504,7 +474,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase public_entry = create(:diary_entry, :user => create(:user)) # Try a list of all diary entries - get :index + get diary_entries_path check_diary_index diary_entry, geo_entry, public_entry end @@ -517,11 +487,11 @@ class DiaryEntriesControllerTest < ActionController::TestCase _other_entry = create(:diary_entry, :user => other_user) # Try a list of diary entries for a valid user - get :index, :params => { :display_name => user.display_name } + get diary_entries_path(:display_name => user.display_name) check_diary_index diary_entry, geo_entry # Try a list of diary entries for an invalid user - get :index, :params => { :display_name => "No Such User" } + get diary_entries_path(:display_name => "No Such User") assert_response :not_found assert_template "users/no_such_user" end @@ -534,14 +504,16 @@ class DiaryEntriesControllerTest < ActionController::TestCase _other_entry = create(:diary_entry, :user => other_user) # Try a list of diary entries for your friends when not logged in - get :index, :params => { :friends => true } + get friends_diary_entries_path assert_response :redirect assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/friends" # Try a list of diary entries for your friends when logged in - get :index, :params => { :friends => true }, :session => { :user => user } + session_for(user) + get friends_diary_entries_path check_diary_index diary_entry - get :index, :params => { :friends => true }, :session => { :user => other_user } + session_for(other_user) + get friends_diary_entries_path check_diary_index end @@ -552,14 +524,16 @@ class DiaryEntriesControllerTest < ActionController::TestCase diary_entry = create(:diary_entry, :user => user) # Try a list of diary entries for nearby users when not logged in - get :index, :params => { :nearby => true } + get nearby_diary_entries_path assert_response :redirect assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/nearby" # Try a list of diary entries for nearby users when logged in - get :index, :params => { :nearby => true }, :session => { :user => nearby_user } + session_for(nearby_user) + get nearby_diary_entries_path check_diary_index diary_entry - get :index, :params => { :nearby => true }, :session => { :user => user } + session_for(user) + get nearby_diary_entries_path check_diary_index end @@ -571,15 +545,15 @@ class DiaryEntriesControllerTest < ActionController::TestCase diary_entry_de = create(:diary_entry, :language_code => "de") # Try a list of diary entries in english - get :index, :params => { :language => "en" } + get diary_entries_path(:language => "en") check_diary_index diary_entry_en, diary_entry_en2 # Try a list of diary entries in german - get :index, :params => { :language => "de" } + get diary_entries_path(:language => "de") check_diary_index diary_entry_de # Try a list of diary entries in slovenian - get :index, :params => { :language => "sl" } + get diary_entries_path(:language => "sl") check_diary_index end @@ -588,12 +562,12 @@ class DiaryEntriesControllerTest < ActionController::TestCase create_list(:diary_entry, 50) # Try and get the index - get :index + get diary_entries_path assert_response :success assert_select "div.diary_post", :count => 20 # Try and get the second page - get :index, :params => { :page => 2 } + get diary_entries_path(:page => 2) assert_response :success assert_select "div.diary_post", :count => 20 end @@ -604,7 +578,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase create(:diary_entry, :language_code => "en") create(:diary_entry, :language_code => "de") - get :rss, :params => { :format => :rss } + get diary_rss_path assert_response :success, "Should be able to get a diary RSS" assert_select "rss", :count => 1 do assert_select "channel", :count => 1 do @@ -621,7 +595,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase create(:diary_entry, :language_code => "en") create(:diary_entry, :language_code => "de") - get :rss, :params => { :language => "en", :format => :rss } + get diary_rss_path(:language => "en") 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 @@ -635,7 +609,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase create(:language, :code => "sl") create(:diary_entry, :language_code => "en") - get :rss, :params => { :language => "sl", :format => :rss } + get diary_rss_path(: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 @@ -647,28 +621,28 @@ class DiaryEntriesControllerTest < ActionController::TestCase create(:diary_entry, :user => user) create(:diary_entry, :user => other_user) - get :rss, :params => { :display_name => user.display_name, :format => :rss } + get diary_rss_path(:display_name => 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 # Try a user that has never existed - get :rss, :params => { :display_name => "fakeUsername76543", :format => :rss } + get diary_rss_path(:display_name => "fakeUsername76543") assert_response :not_found, "Should not be able to get a nonexisting users diary RSS" # Try a suspended user - get :rss, :params => { :display_name => create(:user, :suspended).display_name, :format => :rss } + get diary_rss_path(:display_name => create(:user, :suspended).display_name) assert_response :not_found, "Should not be able to get a suspended users diary RSS" # Try a deleted user - get :rss, :params => { :display_name => create(:user, :deleted).display_name, :format => :rss } + get diary_rss_path(:display_name => create(:user, :deleted).display_name) 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 => "