Rename diary_comments_path to user_diary_comments_path

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index b2247c0d01455d59cf68b9843a4bad4d6e9cdcbf..8ef7b56447d4fd891cdcb60daa0a8ef67c7543f9 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -26,7 +26,7 @@
               <span class='badge count-number'><%= number_with_delimiter(current_user.diary_entries.size) %></span>
             </li>
             <li>
               <span class='badge count-number'><%= number_with_delimiter(current_user.diary_entries.size) %></span>
             </li>
             <li>

-              <%= link_to t(".my comments"), diary_comments_path(current_user) %>
+              <%= link_to t(".my comments"), user_diary_comments_path(current_user) %>

               <span class='badge count-number'><%= number_with_delimiter(current_user.diary_comments.size) %></span>
             </li>
             <li>
               <span class='badge count-number'><%= number_with_delimiter(current_user.diary_comments.size) %></span>
             </li>
             <li>


@@ -78,7 +78,7 @@
               <span class='badge count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>
             </li>
             <li>
               <span class='badge count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>
             </li>
             <li>

-              <%= link_to t(".comments"), diary_comments_path(@user) %>
+              <%= link_to t(".comments"), user_diary_comments_path(@user) %>

               <span class='badge count-number'><%= number_with_delimiter(@user.diary_comments.size) %></span>
             </li>
             <% if current_user %>
               <span class='badge count-number'><%= number_with_delimiter(@user.diary_comments.size) %></span>
             </li>
             <% if current_user %>

diff --git a/config/routes.rb b/config/routes.rb
index 9e82a037dafea8d95c3c25a6ee4597ea1e6a888d..a5528a8953042f51d03a5f700d3f3568775bbc3a 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -247,7 +247,7 @@ 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", :page => /[1-9][0-9]*/, :to => redirect(:path => "/user/%{display_name}/diary/comments")
   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 => :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
   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 f6ba6af657e69b265be02d253ffc2b56c48f9f0a..3ee9959db7387dd2a6fa9a718130c74d8305f9b1 100644 (file)
--- a/test/controllers/diary_comments_controller_test.rb
+++ b/test/controllers/diary_comments_controller_test.rb
@@ -36,7 +36,7 @@ class DiaryCommentsControllerTest < ActionDispatch::IntegrationTest
     deleted_user = create(:user, :deleted)
 
     # Test a user with no comments
     deleted_user = create(:user, :deleted)
 
     # Test a user with no comments

-    get diary_comments_path(user)
+    get user_diary_comments_path(user)

     assert_response :success
     assert_template :index
     assert_select "h4", :html => "No diary comments"
     assert_response :success
     assert_template :index
     assert_select "h4", :html => "No diary comments"


@@ -44,7 +44,7 @@ class DiaryCommentsControllerTest < ActionDispatch::IntegrationTest
     # Test a user with a comment
     create(:diary_comment, :user => other_user)
 
     # Test a user with a comment
     create(:diary_comment, :user => other_user)
 

-    get diary_comments_path(other_user)
+    get user_diary_comments_path(other_user)

     assert_response :success
     assert_template :index
     assert_dom "a[href='#{user_path(other_user)}']", :text => other_user.display_name
     assert_response :success
     assert_template :index
     assert_dom "a[href='#{user_path(other_user)}']", :text => other_user.display_name


@@ -53,11 +53,11 @@ class DiaryCommentsControllerTest < ActionDispatch::IntegrationTest
     end
 
     # Test a suspended user
     end
 
     # Test a suspended user

-    get diary_comments_path(suspended_user)
+    get user_diary_comments_path(suspended_user)

     assert_response :not_found
 
     # Test a deleted user
     assert_response :not_found
 
     # Test a deleted user

-    get diary_comments_path(deleted_user)
+    get user_diary_comments_path(deleted_user)

     assert_response :not_found
   end
 
     assert_response :not_found
   end
 


@@ -65,10 +65,10 @@ class DiaryCommentsControllerTest < ActionDispatch::IntegrationTest
     user = create(:user)
 
     %w[-1 0 fred].each do |id|
     user = create(:user)
 
     %w[-1 0 fred].each do |id|

-      get diary_comments_path(user, :before => id)
+      get user_diary_comments_path(user, :before => id)

       assert_redirected_to :controller => :errors, :action => :bad_request
 
       assert_redirected_to :controller => :errors, :action => :bad_request
 

-      get diary_comments_path(user, :after => id)
+      get user_diary_comments_path(user, :after => id)

       assert_redirected_to :controller => :errors, :action => :bad_request
     end
   end
       assert_redirected_to :controller => :errors, :action => :bad_request
     end
   end