From 835756e979916341965fd3328146baa65a13e82d Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Fri, 17 Jan 2025 05:09:05 +0300 Subject: [PATCH] Fix missing translation of Follow links on dashboard --- app/views/dashboards/_contact.html.erb | 2 +- test/system/dashboard_test.rb | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/app/views/dashboards/_contact.html.erb b/app/views/dashboards/_contact.html.erb index 0b3b42fb5..4547a2d75 100644 --- a/app/views/dashboards/_contact.html.erb +++ b/app/views/dashboards/_contact.html.erb @@ -38,7 +38,7 @@ <% if current_user.friends_with?(contact) %> <%= link_to t("users.show.unfollow"), follow_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :delete %> <% else %> - <%= link_to t("users.follow"), follow_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> + <%= link_to t("users.show.follow"), follow_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> <% end %> diff --git a/test/system/dashboard_test.rb b/test/system/dashboard_test.rb index 2ab4db5fa..12d960938 100644 --- a/test/system/dashboard_test.rb +++ b/test/system/dashboard_test.rb @@ -24,4 +24,29 @@ class DashboardSystemTest < ApplicationSystemTestCase assert_link friend_user.display_name, :below => friends_heading, :above => others_heading end + + test "show nearby users with ability to follow" do + user = create(:user, :home_lon => 1.1, :home_lat => 1.1) + nearby_user = create(:user, :home_lon => 1.2, :home_lat => 1.2) + sign_in_as(user) + + visit dashboard_path + + within_content_body do + others_nearby_heading = find :element, "h2", :text => "Other nearby users" + + assert_no_text "There are no other users who admit to mapping nearby yet" + assert_link nearby_user.display_name, :below => others_nearby_heading + assert_link "Follow", :below => others_nearby_heading + + click_on "Follow" + + followings_heading = find :element, "h2", :text => "Followings" + others_nearby_heading = find :element, "h2", :text => "Other nearby users" + + assert_text "There are no other users who admit to mapping nearby yet" + assert_link nearby_user.display_name, :below => followings_heading, :above => others_nearby_heading + assert_link "Unfollow", :below => followings_heading, :above => others_nearby_heading + end + end end -- 2.39.5