From: Tom Hughes <tom@compton.nu>
Date: Sun, 13 Apr 2025 09:49:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/5926'
X-Git-Tag: live~49
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/02079fb88d6914daaf6f36d5dba4a8bfc9d0c9d6?hp=2fff1f8bc2d3710249fa9095bb9a5ebac480f72a

Merge remote-tracking branch 'upstream/pull/5926'
---

diff --git a/test/system/history_test.rb b/test/system/history_test.rb
index cb3647354..01652b6b0 100644
--- a/test/system/history_test.rb
+++ b/test/system/history_test.rb
@@ -176,6 +176,16 @@ class HistoryTest < ApplicationSystemTestCase
     end
   end
 
+  test "changeset bbox is shown on the map and clickable" do
+    user = create(:user)
+    changeset = create(:changeset, :user => user, :num_changes => 1, :bbox => [50, 50, 51, 51])
+
+    visit "#{user_path(user)}/history"
+    find_by_id("map").click
+
+    assert_current_path changeset_path(changeset)
+  end
+
   private
 
   def create_visible_changeset(user, comment)
diff --git a/test/system/search_test.rb b/test/system/search_test.rb
index bf05f9212..0292e67f0 100644
--- a/test/system/search_test.rb
+++ b/test/system/search_test.rb
@@ -1,7 +1,13 @@
 require "application_system_test_case"
 
 class SearchTest < ApplicationSystemTestCase
-  test "click on 'where is this' sets search input value and makes reverse geocoding request with zoom" do
+  def setup
+    stub_request(:get, %r{^https://nominatim\.openstreetmap\.org/search\?})
+      .to_return(:status => 404)
+
+    stub_request(:get, %r{^https://nominatim\.openstreetmap\.org/reverse\?})
+      .to_return(:status => 404)
+
     stub_request(:get, %r{^https://nominatim\.openstreetmap\.org/reverse\?.*zoom=$})
       .to_return(:status => 400, :body => <<-BODY)
         <?xml version="1.0" encoding="UTF-8"?>
@@ -27,7 +33,9 @@ class SearchTest < ApplicationSystemTestCase
           </addressparts>
         </reversegeocode>
       BODY
+  end
 
+  test "click on 'where is this' sets search input value and makes reverse geocoding request with zoom" do
     visit "/#map=15/51.76320/-0.00760"
 
     assert_field "Search", :with => ""
@@ -37,28 +45,28 @@ class SearchTest < ApplicationSystemTestCase
     assert_link "Broxbourne, Hertfordshire, East of England, England, United Kingdom"
   end
 
-  test "query search link sets search input value" do
-    stub_request(:get, %r{^https://nominatim\.openstreetmap\.org/reverse\?})
-      .to_return(:status => 404)
+  test "'Show address' from context menu makes reverse geocoding request with zoom" do
+    visit "/#map=15/51.76320/-0.00760"
+
+    find_by_id("map").right_click
+    click_on "Show address"
 
+    assert_link "Broxbourne, Hertfordshire, East of England, England, United Kingdom"
+  end
+
+  test "query search link sets search input value" do
     visit search_path(:query => "2.341, 7.896")
 
     assert_field "Search", :with => "2.341, 7.896"
   end
 
   test "latlon search link sets search input value" do
-    stub_request(:get, %r{^https://nominatim\.openstreetmap\.org/reverse\?})
-      .to_return(:status => 404)
-
     visit search_path(:lat => "4.321", :lon => "9.876")
 
     assert_field "Search", :with => "4.321, 9.876"
   end
 
   test "search adds viewbox param to Nominatim link" do
-    stub_request(:get, %r{^https://nominatim\.openstreetmap\.org/search\?})
-      .to_return(:status => 404)
-
     visit "/"
 
     fill_in "query", :with => "paris"
@@ -68,9 +76,6 @@ class SearchTest < ApplicationSystemTestCase
   end
 
   test "search adds zoom param to reverse Nominatim link" do
-    stub_request(:get, %r{^https://nominatim\.openstreetmap\.org/reverse\?})
-      .to_return(:status => 404)
-
     visit "/#map=7/1.234/6.789"
 
     fill_in "query", :with => "60 30"