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

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

Browse source
This commit is contained in:
Tom Hughes 2025-01-05 16:38:12 +00:00
commit 231177aa29
13 changed files with 49 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/controllers/old_nodes_controller_test.rb
View file

@ -14,7 +14,7 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest
def test_history
node = create(:node, :with_history)
sidebar_browse_check :node_history_path, node.id, "browse/history"
sidebar_browse_check :node_history_path, node.id, "old_elements/index"
assert_select "h4", /^Version/ do
assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1
end
@ -27,7 +27,7 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest
get node_history_path(:id => node)
assert_response :success
assert_template "browse/history"
assert_template "old_elements/index"
# there are 2 revisions of the redacted node, but only one
# should be showing details here.
@ -46,7 +46,7 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest
get node_history_path(:id => node, :params => { :show_redactions => true })
assert_response :success
assert_template "browse/history"
assert_template "old_elements/index"
assert_select ".browse-section", 2
assert_select ".browse-section.browse-redacted", 0

6
test/controllers/old_relations_controller_test.rb
View file

@ -14,7 +14,7 @@ class OldRelationsControllerTest < ActionDispatch::IntegrationTest
def test_history
relation = create(:relation, :with_history)
sidebar_browse_check :relation_history_path, relation.id, "browse/history"
sidebar_browse_check :relation_history_path, relation.id, "old_elements/index"
assert_select "h4", /^Version/ do
assert_select "a[href='#{old_relation_path relation, 1}']", :text => "1", :count => 1
end
@ -29,7 +29,7 @@ class OldRelationsControllerTest < ActionDispatch::IntegrationTest
get relation_history_path(:id => relation)
assert_response :success
assert_template "browse/history"
assert_template "old_elements/index"
# there are 4 revisions of the redacted relation, but only 2
# should be showing details here.
@ -48,7 +48,7 @@ class OldRelationsControllerTest < ActionDispatch::IntegrationTest
get relation_history_path(:id => relation, :params => { :show_redactions => true })
assert_response :success
assert_template "browse/history"
assert_template "old_elements/index"
assert_select ".browse-section", 4
assert_select ".browse-section.browse-redacted", 0

6
test/controllers/old_ways_controller_test.rb
View file

@ -14,7 +14,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest
def test_history
way = create(:way, :with_history)
sidebar_browse_check :way_history_path, way.id, "browse/history"
sidebar_browse_check :way_history_path, way.id, "old_elements/index"
assert_select "h4", /^Version/ do
assert_select "a[href='#{old_way_path way, 1}']", :text => "1", :count => 1
end
@ -29,7 +29,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest
get way_history_path(:id => way)
assert_response :success
assert_template "browse/history"
assert_template "old_elements/index"
# there are 4 revisions of the redacted way, but only 2
# should be showing details here.
@ -48,7 +48,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest
get way_history_path(:id => way, :params => { :show_redactions => true })
assert_response :success
assert_template "browse/history"
assert_template "old_elements/index"
assert_select ".browse-section", 4
assert_select ".browse-section.browse-redacted", 0