From d862c89233b7d2bb4a549d8d97fd7d19f40d17a4 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 12 Feb 2026 09:11:12 +0000
Subject: [PATCH] Fix new rubocop warnings

---
 app/controllers/profiles/links_controller.rb  |  2 +-
 test/controllers/api/nodes_controller_test.rb | 30 ++++++------
 .../api/relations_controller_test.rb          | 26 +++++------
 test/controllers/api/ways_controller_test.rb  | 46 +++++++++----------
 4 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/app/controllers/profiles/links_controller.rb b/app/controllers/profiles/links_controller.rb
index ee95df48e..be0874839 100644
--- a/app/controllers/profiles/links_controller.rb
+++ b/app/controllers/profiles/links_controller.rb
@@ -5,7 +5,7 @@ module Profiles
     private
 
     def update_profile
-      social_links_params = params.permit(:user => [:social_links_attributes => [:id, :url, :_destroy]])
+      social_links_params = params.permit(:user => [{ :social_links_attributes => [:id, :url, :_destroy] }])
       current_user.assign_attributes(social_links_params[:user])
 
       current_user.save
diff --git a/test/controllers/api/nodes_controller_test.rb b/test/controllers/api/nodes_controller_test.rb
index de2445f02..985aefa2a 100644
--- a/test/controllers/api/nodes_controller_test.rb
+++ b/test/controllers/api/nodes_controller_test.rb
@@ -103,7 +103,7 @@ module Api
     end
 
     def test_create_by_private_user
-      with_unchanging_request([:data_public => false]) do |headers, changeset|
+      with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
         osm = "<osm><node lat='0' lon='0' changeset='#{changeset.id}'/></osm>"
 
         post api_nodes_path, :params => osm, :headers => headers
@@ -219,7 +219,7 @@ module Api
     # try and put something into a string that the API might
     # use unquoted and therefore allow code injection
     def test_create_with_string_injection_by_private_user
-      with_unchanging_request([:data_public => false]) do |headers, changeset|
+      with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
         osm = <<~OSM
           <osm>
             <node lat='0' lon='0' changeset='#{changeset.id}'>
@@ -327,7 +327,7 @@ module Api
 
     def test_destroy_in_closed_changeset_by_private_user
       with_unchanging(:node) do |node|
-        with_unchanging_request([:data_public => false], [:closed]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }], [:closed]) do |headers, changeset|
           osm_xml = xml_for_node node
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -340,7 +340,7 @@ module Api
 
     def test_destroy_in_missing_changeset_by_private_user
       with_unchanging(:node) do |node|
-        with_unchanging_request([:data_public => false]) do |headers|
+        with_unchanging_request([{ :data_public => false }]) do |headers|
           osm_xml = xml_for_node node
           osm_xml = update_changeset osm_xml, 0
 
@@ -353,7 +353,7 @@ module Api
 
     def test_destroy_by_private_user
       with_unchanging(:node) do |node|
-        with_unchanging_request([:data_public => false]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
           osm_xml = xml_for_node node
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -366,7 +366,7 @@ module Api
 
     def test_destroy_deleted_node_by_private_user
       with_unchanging(:node, :deleted) do |node|
-        with_unchanging_request([:data_public => false]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
           osm_xml = "<osm><node id='#{node.id}' changeset='#{changeset.id}' version='1' lat='0' lon='0'/></osm>"
 
           delete api_node_path(node), :params => osm_xml.to_s, :headers => headers
@@ -377,7 +377,7 @@ module Api
     end
 
     def test_destroy_missing_node_by_private_user
-      with_unchanging_request([:data_public => false]) do |headers|
+      with_unchanging_request([{ :data_public => false }]) do |headers|
         delete api_node_path(0), :headers => headers
 
         assert_require_public_data
@@ -388,7 +388,7 @@ module Api
       with_unchanging(:node) do |node|
         create(:way_node, :node => node)
 
-        with_unchanging_request([:data_public => false]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
           osm_xml = xml_for_node node
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -403,7 +403,7 @@ module Api
       with_unchanging(:node) do |node|
         create(:relation_member, :member => node)
 
-        with_unchanging_request([:data_public => false]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
           osm_xml = xml_for_node node
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -572,7 +572,7 @@ module Api
       with_unchanging(:node) do |node|
         other_user = create(:user)
 
-        with_unchanging_request([:data_public => false], [:user => other_user]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }], [{ :user => other_user }]) do |headers, changeset|
           osm_xml = xml_for_node node
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -585,7 +585,7 @@ module Api
 
     def test_update_in_closed_changeset_by_private_user
       with_unchanging(:node) do |node|
-        with_unchanging_request([:data_public => false], [:closed]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }], [:closed]) do |headers, changeset|
           osm_xml = xml_for_node node
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -598,7 +598,7 @@ module Api
 
     def test_update_in_missing_changeset_by_private_user
       with_unchanging(:node) do |node|
-        with_unchanging_request([:data_public => false]) do |headers|
+        with_unchanging_request([{ :data_public => false }]) do |headers|
           osm_xml = xml_for_node node
           osm_xml = update_changeset osm_xml, 0
 
@@ -627,7 +627,7 @@ module Api
 
     def test_update_by_private_user
       with_unchanging(:node) do |node|
-        with_unchanging_request([:data_public => false]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
           osm_xml = xml_for_node node
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -642,7 +642,7 @@ module Api
       with_unchanging(:node) do |node|
         other_user = create(:user)
 
-        with_unchanging_request([], [:user => other_user]) do |headers, changeset|
+        with_unchanging_request([], [{ :user => other_user }]) do |headers, changeset|
           osm_xml = xml_for_node node
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -891,7 +891,7 @@ module Api
 
     def check_update_with_invalid_attr_value(name, value, data_public: true)
       with_unchanging(:node) do |node|
-        with_unchanging_request([:data_public => data_public]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => data_public }]) do |headers, changeset|
           osm_xml = xml_for_node node
           osm_xml = xml_attr_rewrite osm_xml, name, value
           osm_xml = update_changeset osm_xml, changeset.id
diff --git a/test/controllers/api/relations_controller_test.rb b/test/controllers/api/relations_controller_test.rb
index f17913cba..3201873db 100644
--- a/test/controllers/api/relations_controller_test.rb
+++ b/test/controllers/api/relations_controller_test.rb
@@ -213,7 +213,7 @@ module Api
     # -------------------------------------
 
     def test_create_without_members_by_private_user
-      with_unchanging_request([:data_public => false]) do |headers, changeset|
+      with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
         osm = <<~OSM
           <osm>
             <relation changeset='#{changeset.id}'>
@@ -231,7 +231,7 @@ module Api
     def test_create_with_node_member_with_role_by_private_user
       node = create(:node)
 
-      with_unchanging_request([:data_public => false]) do |headers, changeset|
+      with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
         osm = <<~OSM
           <osm>
             <relation changeset='#{changeset.id}'>
@@ -250,7 +250,7 @@ module Api
     def test_create_with_node_member_without_role_by_private_user
       node = create(:node)
 
-      with_unchanging_request([:data_public => false]) do |headers, changeset|
+      with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
         osm = <<~OSM
           <osm>
             <relation changeset='#{changeset.id}'>
@@ -270,7 +270,7 @@ module Api
       node = create(:node)
       way = create(:way_with_nodes, :nodes_count => 2)
 
-      with_unchanging_request([:data_public => false]) do |headers, changeset|
+      with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
         osm = <<~OSM
           <osm>
             <relation changeset='#{changeset.id}'>
@@ -594,7 +594,7 @@ module Api
 
     def test_destroy_without_payload_by_private_user
       with_unchanging(:relation) do |relation|
-        with_unchanging_request([:data_public => false]) do |headers|
+        with_unchanging_request([{ :data_public => false }]) do |headers|
           delete api_relation_path(relation), :headers => headers
 
           assert_response :forbidden
@@ -604,7 +604,7 @@ module Api
 
     def test_destroy_without_changeset_id_by_private_user
       with_unchanging(:relation) do |relation|
-        with_unchanging_request([:data_public => false]) do |headers|
+        with_unchanging_request([{ :data_public => false }]) do |headers|
           osm = "<osm><relation id='#{relation.id}' version='#{relation.version}'/></osm>"
 
           delete api_relation_path(relation), :params => osm, :headers => headers
@@ -616,7 +616,7 @@ module Api
 
     def test_destroy_in_closed_changeset_by_private_user
       with_unchanging(:relation) do |relation|
-        with_unchanging_request([:data_public => false], [:closed]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }], [:closed]) do |headers, changeset|
           osm_xml = xml_for_relation relation
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -629,7 +629,7 @@ module Api
 
     def test_destroy_in_missing_changeset_by_private_user
       with_unchanging(:relation) do |relation|
-        with_unchanging_request([:data_public => false]) do |headers|
+        with_unchanging_request([{ :data_public => false }]) do |headers|
           osm_xml = xml_for_relation relation
           osm_xml = update_changeset osm_xml, 0
 
@@ -644,7 +644,7 @@ module Api
       with_unchanging(:relation) do |relation|
         create(:relation_member, :member => relation)
 
-        with_unchanging_request([:data_public => false]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
           osm_xml = xml_for_relation relation
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -657,7 +657,7 @@ module Api
 
     def test_destroy_by_private_user
       with_unchanging(:relation) do |relation|
-        with_unchanging_request([:data_public => false]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
           osm_xml = xml_for_relation relation
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -670,7 +670,7 @@ module Api
 
     def test_destroy_deleted_relation_by_private_user
       with_unchanging(:relation, :deleted) do |relation|
-        with_unchanging_request([:data_public => false]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
           osm_xml = xml_for_relation relation
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -682,7 +682,7 @@ module Api
     end
 
     def test_destroy_missing_relation_by_private_user
-      with_unchanging_request([:data_public => false]) do |headers|
+      with_unchanging_request([{ :data_public => false }]) do |headers|
         delete api_relation_path(0), :headers => headers
 
         assert_response :forbidden
@@ -742,7 +742,7 @@ module Api
       with_unchanging(:relation) do |relation|
         other_user = create(:user)
 
-        with_unchanging_request([], [:user => other_user]) do |headers, changeset|
+        with_unchanging_request([], [{ :user => other_user }]) do |headers, changeset|
           osm_xml = xml_for_relation relation
           osm_xml = update_changeset osm_xml, changeset.id
 
diff --git a/test/controllers/api/ways_controller_test.rb b/test/controllers/api/ways_controller_test.rb
index 04881b683..b774cf947 100644
--- a/test/controllers/api/ways_controller_test.rb
+++ b/test/controllers/api/ways_controller_test.rb
@@ -207,7 +207,7 @@ module Api
       node1 = create(:node)
       node2 = create(:node)
 
-      with_unchanging_request([:data_public => false]) do |headers, changeset|
+      with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
         osm = <<~OSM
           <osm>
             <way changeset='#{changeset.id}'>
@@ -280,7 +280,7 @@ module Api
     end
 
     def test_create_with_missing_node_by_private_user
-      with_unchanging_request([:data_public => false]) do |headers, changeset|
+      with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
         osm = <<~OSM
           <osm>
             <way changeset='#{changeset.id}'>
@@ -296,7 +296,7 @@ module Api
     end
 
     def test_create_without_nodes_by_private_user
-      with_unchanging_request([:data_public => false]) do |headers, changeset|
+      with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
         osm = <<~OSM
           <osm>
             <way changeset='#{changeset.id}' />
@@ -312,7 +312,7 @@ module Api
     def test_create_in_closed_changeset_by_private_user
       node = create(:node)
 
-      with_unchanging_request([:data_public => false]) do |headers, changeset|
+      with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
         osm = <<~OSM
           <osm>
             <way changeset='#{changeset.id}'>
@@ -399,7 +399,7 @@ module Api
     def test_create_with_duplicate_tags_by_private_user
       node = create(:node)
 
-      with_unchanging_request([:data_public => false]) do |headers, changeset|
+      with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
         osm = <<~OSM
           <osm>
             <way changeset='#{changeset.id}'>
@@ -479,7 +479,7 @@ module Api
 
     def test_destroy_without_payload_by_private_user
       with_unchanging(:way) do |way|
-        with_unchanging_request([:data_public => false]) do |headers|
+        with_unchanging_request([{ :data_public => false }]) do |headers|
           delete api_way_path(way), :headers => headers
 
           assert_response :forbidden
@@ -489,7 +489,7 @@ module Api
 
     def test_destroy_without_changeset_id_by_private_user
       with_unchanging(:way) do |way|
-        with_unchanging_request([:data_public => false]) do |headers|
+        with_unchanging_request([{ :data_public => false }]) do |headers|
           osm = "<osm><way id='#{way.id}'/></osm>"
 
           delete api_way_path(way), :params => osm, :headers => headers
@@ -501,7 +501,7 @@ module Api
 
     def test_destroy_in_closed_changeset_by_private_user
       with_unchanging(:way) do |way|
-        with_unchanging_request([:data_public => false], [:closed]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }], [:closed]) do |headers, changeset|
           osm_xml = xml_for_way way
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -514,7 +514,7 @@ module Api
 
     def test_destroy_in_missing_changeset_by_private_user
       with_unchanging(:way) do |way|
-        with_unchanging_request([:data_public => false]) do |headers|
+        with_unchanging_request([{ :data_public => false }]) do |headers|
           osm_xml = xml_for_way way
           osm_xml = update_changeset osm_xml, 0
 
@@ -527,7 +527,7 @@ module Api
 
     def test_destroy_by_private_user
       with_unchanging(:way) do |way|
-        with_unchanging_request([:data_public => false]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
           osm_xml = xml_for_way way
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -540,7 +540,7 @@ module Api
 
     def test_destroy_deleted_way_by_private_user
       with_unchanging(:way, :deleted) do |way|
-        with_unchanging_request([:data_public => false]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
           osm_xml = xml_for_way way
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -555,7 +555,7 @@ module Api
       with_unchanging(:way) do |way|
         create(:relation_member, :member => way)
 
-        with_unchanging_request([:data_public => false]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
           osm_xml = xml_for_way way
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -567,7 +567,7 @@ module Api
     end
 
     def test_destroy_missing_way_by_private_user
-      with_unchanging_request([:data_public => false]) do |headers|
+      with_unchanging_request([{ :data_public => false }]) do |headers|
         delete api_way_path(0), :headers => headers
 
         assert_response :forbidden
@@ -706,7 +706,7 @@ module Api
       with_unchanging(:way_with_nodes) do |way|
         other_user = create(:user)
 
-        with_unchanging_request([:data_public => false], [:user => other_user]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }], [{ :user => other_user }]) do |headers, changeset|
           osm_xml = xml_for_way way
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -719,7 +719,7 @@ module Api
 
     def test_update_in_closed_changeset_by_private_user
       with_unchanging(:way_with_nodes) do |way|
-        with_unchanging_request([:data_public => false], [:closed]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }], [:closed]) do |headers, changeset|
           osm_xml = xml_for_way way
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -732,7 +732,7 @@ module Api
 
     def test_update_in_missing_changeset_by_private_user
       with_unchanging(:way_with_nodes) do |way|
-        with_unchanging_request([:data_public => false]) do |headers|
+        with_unchanging_request([{ :data_public => false }]) do |headers|
           osm_xml = xml_for_way way
           osm_xml = update_changeset osm_xml, 0
 
@@ -748,7 +748,7 @@ module Api
         node = create(:node)
         create(:way_node, :way => way, :node => node)
 
-        with_unchanging_request([:data_public => false]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
           osm_xml = xml_for_way way
           osm_xml = xml_replace_node osm_xml, node.id, 9999
           osm_xml = update_changeset osm_xml, changeset.id
@@ -766,7 +766,7 @@ module Api
         deleted_node = create(:node, :deleted)
         create(:way_node, :way => way, :node => node)
 
-        with_unchanging_request([:data_public => false]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
           osm_xml = xml_for_way way
           osm_xml = xml_replace_node osm_xml, node.id, deleted_node.id
           osm_xml = update_changeset osm_xml, changeset.id
@@ -780,7 +780,7 @@ module Api
 
     def test_update_by_private_user
       with_unchanging(:way_with_nodes) do |way|
-        with_unchanging_request([:data_public => false]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
           osm_xml = xml_for_way way
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -795,7 +795,7 @@ module Api
       with_unchanging(:way_with_nodes) do |way|
         other_user = create(:user)
 
-        with_unchanging_request([], [:user => other_user]) do |headers, changeset|
+        with_unchanging_request([], [{ :user => other_user }]) do |headers, changeset|
           osm_xml = xml_for_way way
           osm_xml = update_changeset osm_xml, changeset.id
 
@@ -956,7 +956,7 @@ module Api
 
     def test_update_with_new_tags_by_private_user
       with_unchanging(:way_with_nodes, :nodes_count => 2) do |way|
-        with_unchanging_request([:data_public => false]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
           tag_xml = XML::Node.new("tag")
           tag_xml["k"] = "new"
           tag_xml["v"] = "yes"
@@ -1000,7 +1000,7 @@ module Api
       with_unchanging(:way_with_nodes) do |way|
         create(:way_tag, :way => way, :k => "key_to_duplicate", :v => "value_to_duplicate")
 
-        with_unchanging_request([:data_public => false]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
           tag_xml = XML::Node.new("tag")
           tag_xml["k"] = "key_to_duplicate"
           tag_xml["v"] = "value_to_duplicate"
@@ -1039,7 +1039,7 @@ module Api
 
     def test_update_with_new_duplicate_tags_by_private_user
       with_unchanging(:way_with_nodes) do |way|
-        with_unchanging_request([:data_public => false]) do |headers, changeset|
+        with_unchanging_request([{ :data_public => false }]) do |headers, changeset|
           tag_xml = XML::Node.new("tag")
           tag_xml["k"] = "i_am_a_duplicate"
           tag_xml["v"] = "foobar"
-- 
2.39.5