cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2025-01-07 18:31:05 +00:00
commit 3c5e89e69a
8 changed files with 26 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/controllers/nodes_controller_test.rb
View file

@ -12,7 +12,7 @@ class NodesControllerTest < ActionDispatch::IntegrationTest
def test_show
node = create(:node)
sidebar_browse_check :node_path, node.id, "browse/feature"
sidebar_browse_check :node_path, node.id, "elements/show"
assert_select "h4", /^Version/ do
assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1
end
@ -23,7 +23,7 @@ class NodesControllerTest < ActionDispatch::IntegrationTest
def test_show_multiple_versions
node = create(:node, :with_history, :version => 2)
sidebar_browse_check :node_path, node.id, "browse/feature"
sidebar_browse_check :node_path, node.id, "elements/show"
assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1
assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 1
assert_select ".secondary-actions a[href='#{old_node_path node, 2}']", :count => 1
@ -33,13 +33,13 @@ class NodesControllerTest < ActionDispatch::IntegrationTest
member = create(:node)
relation = create(:relation)
create(:relation_member, :relation => relation, :member => member)
sidebar_browse_check :node_path, member.id, "browse/feature"
sidebar_browse_check :node_path, member.id, "elements/show"
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"
sidebar_browse_check :node_path, node.id, "elements/show"
assert_select "h4", /^Version/ do
assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1
end
@ -53,7 +53,7 @@ class NodesControllerTest < ActionDispatch::IntegrationTest
get node_path(node)
assert_response :success
assert_template "feature"
assert_template "elements/show"
# check that we don't show lat/lon for a redacted node.
assert_select ".browse-section", 1

6
test/controllers/relations_controller_test.rb
View file

@ -12,7 +12,7 @@ class RelationsControllerTest < ActionDispatch::IntegrationTest
def test_show
relation = create(:relation)
sidebar_browse_check :relation_path, relation.id, "browse/feature"
sidebar_browse_check :relation_path, relation.id, "elements/show"
assert_select "h4", /^Version/ do
assert_select "a[href='#{old_relation_path relation, 1}']", :text => "1", :count => 1
end
@ -23,7 +23,7 @@ class RelationsControllerTest < ActionDispatch::IntegrationTest
def test_show_multiple_versions
relation = create(:relation, :with_history, :version => 2)
sidebar_browse_check :relation_path, relation.id, "browse/feature"
sidebar_browse_check :relation_path, relation.id, "elements/show"
assert_select ".secondary-actions a[href='#{relation_history_path relation}']", :count => 1
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
@ -33,7 +33,7 @@ class RelationsControllerTest < ActionDispatch::IntegrationTest
member = create(:relation)
relation = create(:relation)
create(:relation_member, :relation => relation, :member => member)
sidebar_browse_check :relation_path, member.id, "browse/feature"
sidebar_browse_check :relation_path, member.id, "elements/show"
assert_select "a[href='#{relation_path relation}']", :count => 1
end

6
test/controllers/ways_controller_test.rb
View file

@ -12,7 +12,7 @@ class WaysControllerTest < ActionDispatch::IntegrationTest
def test_show
way = create(:way)
sidebar_browse_check :way_path, way.id, "browse/feature"
sidebar_browse_check :way_path, way.id, "elements/show"
assert_select "h4", /^Version/ do
assert_select "a[href='#{old_way_path way, 1}']", :text => "1", :count => 1
end
@ -23,7 +23,7 @@ class WaysControllerTest < ActionDispatch::IntegrationTest
def test_show_multiple_versions
way = create(:way, :with_history, :version => 2)
sidebar_browse_check :way_path, way.id, "browse/feature"
sidebar_browse_check :way_path, way.id, "elements/show"
assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1
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
@ -33,7 +33,7 @@ class WaysControllerTest < ActionDispatch::IntegrationTest
member = create(:way)
relation = create(:relation)
create(:relation_member, :relation => relation, :member => member)
sidebar_browse_check :way_path, member.id, "browse/feature"
sidebar_browse_check :way_path, member.id, "elements/show"
assert_select "a[href='#{relation_path relation}']", :count => 1
end