From: Anton Khorev Date: Sun, 9 Feb 2025 15:04:18 +0000 (+0300) Subject: Add show_redactions checks to api old element index tests X-Git-Tag: live~151^2~11 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/ddebb42a8e4e63193dea7257b8fb7867a013291b Add show_redactions checks to api old element index tests --- diff --git a/test/controllers/api/old_nodes_controller_test.rb b/test/controllers/api/old_nodes_controller_test.rb index 7afa8c997..6ffb8c7ca 100644 --- a/test/controllers/api/old_nodes_controller_test.rb +++ b/test/controllers/api/old_nodes_controller_test.rb @@ -61,6 +61,12 @@ module Api assert_response :success, "Redaction shouldn't have stopped history working." assert_dom "osm node[id='#{node.id}'][version='1']", 0, "redacted node #{node.id} version 1 shouldn't be present in the history." + + get api_node_versions_path(node, :show_redactions => "true") + + assert_response :success, "Redaction shouldn't have stopped history working." + assert_dom "osm node[id='#{node.id}'][version='1']", 0, + "redacted node #{node.id} version 1 shouldn't be present in the history when passing flag." end def test_index_redacted_normal_user @@ -72,6 +78,12 @@ module Api assert_response :success, "Redaction shouldn't have stopped history working." assert_dom "osm node[id='#{node.id}'][version='1']", 0, "redacted node #{node.id} version 1 shouldn't be present in the history, even when logged in." + + get api_node_versions_path(node, :show_redactions => "true"), :headers => bearer_authorization_header + + assert_response :success, "Redaction shouldn't have stopped history working." + assert_dom "osm node[id='#{node.id}'][version='1']", 0, + "redacted node #{node.id} version 1 shouldn't be present in the history, even when logged in and passing flag." end def test_show diff --git a/test/controllers/api/old_relations_controller_test.rb b/test/controllers/api/old_relations_controller_test.rb index b5600ad37..1e3953590 100644 --- a/test/controllers/api/old_relations_controller_test.rb +++ b/test/controllers/api/old_relations_controller_test.rb @@ -64,6 +64,12 @@ module Api assert_response :success, "Redaction shouldn't have stopped history working." assert_dom "osm relation[id='#{relation.id}'][version='1']", 0, "redacted relation #{relation.id} version 1 shouldn't be present in the history." + + get api_relation_versions_path(relation, :show_redactions => "true") + + assert_response :success, "Redaction shouldn't have stopped history working." + assert_dom "osm relation[id='#{relation.id}'][version='1']", 0, + "redacted relation #{relation.id} version 1 shouldn't be present in the history when passing flag." end def test_index_redacted_normal_user @@ -75,6 +81,12 @@ module Api assert_response :success, "Redaction shouldn't have stopped history working." assert_dom "osm relation[id='#{relation.id}'][version='1']", 0, "redacted relation #{relation.id} version 1 shouldn't be present in the history, even when logged in." + + get api_relation_versions_path(relation, :show_redactions => "true"), :headers => bearer_authorization_header + + assert_response :success, "Redaction shouldn't have stopped history working." + assert_dom "osm relation[id='#{relation.id}'][version='1']", 0, + "redacted relation #{relation.id} version 1 shouldn't be present in the history, even when logged in and passing flag." end def test_show diff --git a/test/controllers/api/old_ways_controller_test.rb b/test/controllers/api/old_ways_controller_test.rb index 53dc41fbe..84c2cef3f 100644 --- a/test/controllers/api/old_ways_controller_test.rb +++ b/test/controllers/api/old_ways_controller_test.rb @@ -71,6 +71,12 @@ module Api assert_response :success, "Redaction shouldn't have stopped history working." assert_dom "osm way[id='#{way.id}'][version='1']", 0, "redacted way #{way.id} version 1 shouldn't be present in the history." + + get api_way_versions_path(way, :show_redactions => "true") + + assert_response :success, "Redaction shouldn't have stopped history working." + assert_dom "osm way[id='#{way.id}'][version='1']", 0, + "redacted way #{way.id} version 1 shouldn't be present in the history when passing flag." end def test_index_redacted_normal_user @@ -82,6 +88,12 @@ module Api assert_response :success, "Redaction shouldn't have stopped history working." assert_dom "osm way[id='#{way.id}'][version='1']", 0, "redacted node #{way.id} version 1 shouldn't be present in the history, even when logged in." + + get api_way_versions_path(way, :show_redactions => "true"), :headers => bearer_authorization_header + + assert_response :success, "Redaction shouldn't have stopped history working." + assert_dom "osm way[id='#{way.id}'][version='1']", 0, + "redacted node #{way.id} version 1 shouldn't be present in the history, even when logged in and passing flag." end def test_show