From 259c32226253849c9e80055dceaf4daa117a7721 Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Wed, 4 Jun 2025 04:39:49 +0300
Subject: [PATCH] Add "Edit Location" button to user profile

---
 app/views/users/show.html.erb               |  4 +-
 config/locales/en.yml                       |  1 +
 test/system/profile_location_change_test.rb | 46 +++++++++++++++------
 3 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 5405d7821..e6a178ca7 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -246,7 +246,9 @@
                                     :edit_path => profile_image_path do %>
       <% end %>
 
-      <%= render "sidebar_section", :present => @user.home_location_name&.strip.present? do %>
+      <%= render "sidebar_section", :present => @user.home_location_name&.strip.present?,
+                                    :edit_title => t(".edit_location"),
+                                    :edit_path => profile_location_path do %>
         <div class="icon-link mw-100">
           <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16" class="flex-shrink-0">
             <title><%= t ".home_location" %></title>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ad00b3767..42f7cbd84 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3078,6 +3078,7 @@ en:
       edit_links: Edit Links
       change_image: Change Image
       edit_company: Edit Company
+      edit_location: Edit Location
       contributions:
         one: "%{count} contribution in the last year"
         other: "%{count} contributions in the last year"
diff --git a/test/system/profile_location_change_test.rb b/test/system/profile_location_change_test.rb
index 1c9a2ecdb..5b92f9310 100644
--- a/test/system/profile_location_change_test.rb
+++ b/test/system/profile_location_change_test.rb
@@ -1,28 +1,39 @@
 require "application_system_test_case"
 
 class ProfileLocationChangeTest < ApplicationSystemTestCase
-  def setup
-    stub_request(:get, /.*gravatar.com.*d=404/).to_return(:status => 404)
-  end
-
-  test "User can change their location" do
+  test "can't change location when unauthorized" do
     user = create(:user)
-    sign_in_as(user)
 
     visit user_path(user)
 
-    within_content_body do
-      assert_no_text :all, "Home location"
+    within_content_heading do
+      assert_no_button "Edit Profile Details"
+      assert_no_link "Edit Location"
     end
+  end
+
+  test "can't change location of another user" do
+    user = create(:user)
+    another_user = create(:user)
+
+    sign_in_as(user)
+    visit user_path(another_user)
 
-    within_content_body do
-      click_on "Edit Profile"
-    end
     within_content_heading do
-      click_on "Location"
+      assert_no_button "Edit Profile Details"
+      assert_no_link "Edit Location"
     end
+  end
+
+  test "can change location" do
+    user = create(:user)
+
+    sign_in_as(user)
+    visit user_path(user)
 
     within_content_body do
+      click_on "Edit Profile Details"
+      click_on "Edit Location"
       fill_in "Home Location Name", :with => "Test Place"
       click_on "Update Profile"
     end
@@ -31,6 +42,17 @@ class ProfileLocationChangeTest < ApplicationSystemTestCase
 
     within_content_body do
       assert_text :all, "Home location Test Place"
+
+      click_on "Edit Profile Details"
+      click_on "Edit Location"
+      fill_in "Home Location Name", :with => "New Test Place"
+      click_on "Update Profile"
+    end
+
+    assert_text "Profile location updated."
+
+    within_content_body do
+      assert_text :all, "Home location New Test Place"
     end
   end
 end
-- 
2.39.5