X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f84980f183b9ca4336ed4eec49c2d0ff8aff7165..bc12774c21915687c07b93dbcbef78d28d2920af:/test/controllers/api/old_nodes_controller_test.rb diff --git a/test/controllers/api/old_nodes_controller_test.rb b/test/controllers/api/old_nodes_controller_test.rb index 6d2303831..e85bc86f8 100644 --- a/test/controllers/api/old_nodes_controller_test.rb +++ b/test/controllers/api/old_nodes_controller_test.rb @@ -161,13 +161,6 @@ module Api check_not_found_id_version(24356, create(:node).version) end - def check_not_found_id_version(id, version) - get node_version_path(:id => id, :version => version) - assert_response :not_found - rescue ActionController::UrlGenerationError => e - assert_match(/No route matches/, e.to_s) - end - ## # Test that getting the current version is identical to picking # that version with the version URI call. @@ -262,13 +255,15 @@ module Api get api_node_history_path(:id => node_v1.node_id) assert_response :success, "Redaction shouldn't have stopped history working." - assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 0, "redacted node #{node_v1.node_id} version #{node_v1.version} shouldn't be present in the history." + assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 0, + "redacted node #{node_v1.node_id} version #{node_v1.version} shouldn't be present in the history." # not even to a logged-in user auth_header = basic_authorization_header create(:user).email, "test" get api_node_history_path(:id => node_v1.node_id), :headers => auth_header assert_response :success, "Redaction shouldn't have stopped history working." - assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 0, "redacted node #{node_v1.node_id} version #{node_v1.version} shouldn't be present in the history, even when logged in." + assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 0, + "redacted node #{node_v1.node_id} version #{node_v1.version} shouldn't be present in the history, even when logged in." end ## @@ -292,10 +287,12 @@ module Api # and when accessed via history get api_node_history_path(:id => node_v3.node_id) assert_response :success, "Redaction shouldn't have stopped history working." - assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 0, "node #{node_v3.node_id} version #{node_v3.version} should not be present in the history for moderators when not passing flag." + assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 0, + "node #{node_v3.node_id} version #{node_v3.version} should not be present in the history for moderators when not passing flag." get api_node_history_path(:id => node_v3.node_id), :params => { :show_redactions => "true" }, :headers => auth_header assert_response :success, "Redaction shouldn't have stopped history working." - assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 1, "node #{node_v3.node_id} version #{node_v3.version} should still be present in the history for moderators when passing flag." + assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 1, + "node #{node_v3.node_id} version #{node_v3.version} should still be present in the history for moderators when passing flag." end # testing that if the moderator drops auth, he can't see the @@ -318,7 +315,8 @@ module Api # and when accessed via history get api_node_history_path(:id => node_v3.node_id), :headers => auth_header assert_response :success, "Redaction shouldn't have stopped history working." - assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 0, "redacted node #{node_v3.node_id} version #{node_v3.version} shouldn't be present in the history." + assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 0, + "redacted node #{node_v3.node_id} version #{node_v3.version} shouldn't be present in the history." end ## @@ -370,7 +368,8 @@ module Api # and when accessed via history get api_node_history_path(:id => node_v1.node_id) assert_response :success, "Unredaction shouldn't have stopped history working." - assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 1, "node #{node_v1.node_id} version #{node_v1.version} should now be present in the history for moderators without passing flag." + assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 1, + "node #{node_v1.node_id} version #{node_v1.version} should now be present in the history for moderators without passing flag." auth_header = basic_authorization_header create(:user).email, "test" @@ -381,7 +380,8 @@ module Api # and when accessed via history get api_node_history_path(:id => node_v1.node_id) assert_response :success, "Unredaction shouldn't have stopped history working." - assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 1, "node #{node_v1.node_id} version #{node_v1.version} should now be present in the history for normal users without passing flag." + assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 1, + "node #{node_v1.node_id} version #{node_v1.version} should now be present in the history for normal users without passing flag." end private @@ -412,6 +412,13 @@ module Api assert_nodes_are_equal current_node, old_node end + def check_not_found_id_version(id, version) + get node_version_path(:id => id, :version => version) + assert_response :not_found + rescue ActionController::UrlGenerationError => e + assert_match(/No route matches/, e.to_s) + end + ## # returns a 16 character long string with some nasty characters in it. # this ought to stress-test the tag handling as well as the versioning.