From: Tom Hughes <tom@compton.nu>
Date: Sat, 16 Mar 2024 11:32:34 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4582'
X-Git-Tag: live~704
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c9880edac8451516131102943f377334e3f173ad?hp=927cc9f45e6626e2a82403d1263b4a16d601e30b

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

diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index cd1b61f52..5bb08ea71 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -29,6 +29,14 @@ class NodesControllerTest < ActionDispatch::IntegrationTest
     assert_select ".secondary-actions a[href='#{old_node_path node, 2}']", :count => 1
   end
 
+  def test_show_relation_member
+    member = create(:node)
+    relation = create(:relation)
+    create(:relation_member, :relation => relation, :member => member)
+    sidebar_browse_check :node_path, member.id, "browse/feature"
+    assert_select "a[href='#{relation_path relation}']", :count => 1
+  end
+
   def test_show_deleted
     node = create(:node, :visible => false)
     sidebar_browse_check :node_path, node.id, "browse/feature"
diff --git a/test/controllers/relations_controller_test.rb b/test/controllers/relations_controller_test.rb
index cbaa51c05..926d95026 100644
--- a/test/controllers/relations_controller_test.rb
+++ b/test/controllers/relations_controller_test.rb
@@ -28,4 +28,12 @@ class RelationsControllerTest < ActionDispatch::IntegrationTest
     assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_relation_path relation, 2}']", :count => 1
   end
+
+  def test_show_relation_member
+    member = create(:relation)
+    relation = create(:relation)
+    create(:relation_member, :relation => relation, :member => member)
+    sidebar_browse_check :relation_path, member.id, "browse/feature"
+    assert_select "a[href='#{relation_path relation}']", :count => 1
+  end
 end
diff --git a/test/controllers/ways_controller_test.rb b/test/controllers/ways_controller_test.rb
index 6c3c5a8a3..e198f7cf6 100644
--- a/test/controllers/ways_controller_test.rb
+++ b/test/controllers/ways_controller_test.rb
@@ -28,4 +28,12 @@ class WaysControllerTest < ActionDispatch::IntegrationTest
     assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_way_path way, 2}']", :count => 1
   end
+
+  def test_show_relation_member
+    member = create(:way)
+    relation = create(:relation)
+    create(:relation_member, :relation => relation, :member => member)
+    sidebar_browse_check :way_path, member.id, "browse/feature"
+    assert_select "a[href='#{relation_path relation}']", :count => 1
+  end
 end