From 6f71b372fb1289e3733f9dbd929fd18efe850b13 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Sun, 19 Jan 2025 02:05:49 +0300 Subject: [PATCH] Change user's diary comments path to match model name --- config/routes.rb | 4 ++-- test/controllers/diary_comments_controller_test.rb | 7 +++++-- test/controllers/users_controller_test.rb | 10 +++++----- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index a5528a895..0b5af20d2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -246,8 +246,8 @@ OpenStreetMap::Application.routes.draw do get "/user/:display_name/diary/rss" => "diary_entries#rss", :defaults => { :format => :rss } 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", :page => /[1-9][0-9]*/, :to => redirect(:path => "/user/%{display_name}/diary/comments") - get "/user/:display_name/diary/comments" => "diary_comments#index", :as => :user_diary_comments + get "/user/:display_name/diary/comments(/:page)", :page => /[1-9][0-9]*/, :to => redirect(:path => "/user/%{display_name}/diary_comments") + get "/user/:display_name/diary_comments" => "diary_comments#index", :as => :user_diary_comments get "/user/:display_name/diary" => "diary_entries#index" get "/diary/:language" => "diary_entries#index" scope "/user/:display_name" do diff --git a/test/controllers/diary_comments_controller_test.rb b/test/controllers/diary_comments_controller_test.rb index 3ee9959db..51ebe048c 100644 --- a/test/controllers/diary_comments_controller_test.rb +++ b/test/controllers/diary_comments_controller_test.rb @@ -9,7 +9,7 @@ class DiaryCommentsControllerTest < ActionDispatch::IntegrationTest def test_routes assert_routing( - { :path => "/user/username/diary/comments", :method => :get }, + { :path => "/user/username/diary_comments", :method => :get }, { :controller => "diary_comments", :action => "index", :display_name => "username" } ) assert_routing( @@ -26,7 +26,10 @@ class DiaryCommentsControllerTest < ActionDispatch::IntegrationTest ) get "/user/username/diary/comments/1" - assert_redirected_to "/user/username/diary/comments" + assert_redirected_to "/user/username/diary_comments" + + get "/user/username/diary/comments" + assert_redirected_to "/user/username/diary_comments" end def test_index diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index c5378ce50..8ad9c6fab 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -220,7 +220,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/traces']", 1 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1 - assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary/comments']", 1 + assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary_comments']", 1 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/account']", 0 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks']", 0 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks_by']", 0 @@ -236,7 +236,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_select "a[href^='/user/#{ERB::Util.u(blocked_user.display_name)}/history']", 1 assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/traces']", 1 assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/diary']", 1 - assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/diary/comments']", 1 + assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/diary_comments']", 1 assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/account']", 0 assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/blocks']", 1 assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/blocks_by']", 0 @@ -252,7 +252,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_select "a[href^='/user/#{ERB::Util.u(moderator_user.display_name)}/history']", 1 assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/traces']", 1 assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/diary']", 1 - assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/diary/comments']", 1 + assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/diary_comments']", 1 assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/account']", 0 assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/blocks']", 0 assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/blocks_by']", 1 @@ -269,7 +269,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1 assert_select "a[href='/traces/mine']", 1 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1 - assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary/comments']", 1 + assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary_comments']", 1 assert_select "a[href='/account/edit']", 1 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks']", 0 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks_by']", 0 @@ -287,7 +287,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/traces']", 1 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1 - assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary/comments']", 1 + assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary_comments']", 1 assert_select "a[href='/account/edit']", 0 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks']", 0 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks_by']", 0 -- 2.39.5