X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d1a29bade4facd38e67c22ee58a02bfdba742ab7..bc12774c21915687c07b93dbcbef78d28d2920af:/test/controllers/api/old_ways_controller_test.rb diff --git a/test/controllers/api/old_ways_controller_test.rb b/test/controllers/api/old_ways_controller_test.rb index c77117589..6c4eb16a1 100644 --- a/test/controllers/api/old_ways_controller_test.rb +++ b/test/controllers/api/old_ways_controller_test.rb @@ -144,14 +144,16 @@ module Api get api_way_history_path(:id => way_v1.way_id) assert_response :success, "Redaction shouldn't have stopped history working." - assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 0, "redacted way #{way_v1.way_id} version #{way_v1.version} shouldn't be present in the history." + assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 0, + "redacted way #{way_v1.way_id} version #{way_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 way_version_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header get api_way_history_path(:id => way_v1.way_id), :headers => auth_header assert_response :success, "Redaction shouldn't have stopped history working." - assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 0, "redacted node #{way_v1.way_id} version #{way_v1.version} shouldn't be present in the history, even when logged in." + assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 0, + "redacted node #{way_v1.way_id} version #{way_v1.version} shouldn't be present in the history, even when logged in." end ## @@ -175,10 +177,12 @@ module Api # and when accessed via history get api_way_history_path(:id => way_v3.way_id), :headers => auth_header assert_response :success, "Redaction shouldn't have stopped history working." - assert_select "osm way[id='#{way_v3.way_id}'][version='#{way_v3.version}']", 0, "way #{way_v3.way_id} version #{way_v3.version} should not be present in the history for moderators when not passing flag." + assert_select "osm way[id='#{way_v3.way_id}'][version='#{way_v3.version}']", 0, + "way #{way_v3.way_id} version #{way_v3.version} should not be present in the history for moderators when not passing flag." get api_way_history_path(:id => way_v3.way_id), :params => { :show_redactions => "true" }, :headers => auth_header assert_response :success, "Redaction shouldn't have stopped history working." - assert_select "osm way[id='#{way_v3.way_id}'][version='#{way_v3.version}']", 1, "way #{way_v3.way_id} version #{way_v3.version} should still be present in the history for moderators when passing flag." + assert_select "osm way[id='#{way_v3.way_id}'][version='#{way_v3.version}']", 1, + "way #{way_v3.way_id} version #{way_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 @@ -201,7 +205,8 @@ module Api # and when accessed via history get api_way_history_path(:id => way_v3.way_id), :headers => auth_header assert_response :success, "Redaction shouldn't have stopped history working." - assert_select "osm way[id='#{way_v3.way_id}'][version='#{way_v3.version}']", 0, "redacted way #{way_v3.way_id} version #{way_v3.version} shouldn't be present in the history." + assert_select "osm way[id='#{way_v3.way_id}'][version='#{way_v3.version}']", 0, + "redacted way #{way_v3.way_id} version #{way_v3.version} shouldn't be present in the history." end ## @@ -252,7 +257,8 @@ module Api # and when accessed via history get api_way_history_path(:id => way_v1.way_id), :headers => auth_header assert_response :success, "Unredaction shouldn't have stopped history working." - assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 1, "way #{way_v1.way_id} version #{way_v1.version} should still be present in the history for moderators." + assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 1, + "way #{way_v1.way_id} version #{way_v1.version} should still be present in the history for moderators." auth_header = basic_authorization_header create(:user).email, "test" @@ -263,7 +269,8 @@ module Api # and when accessed via history get api_way_history_path(:id => way_v1.way_id), :headers => auth_header assert_response :success, "Redaction shouldn't have stopped history working." - assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 1, "way #{way_v1.way_id} version #{way_v1.version} should still be present in the history for normal users." + assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 1, + "way #{way_v1.way_id} version #{way_v1.version} should still be present in the history for normal users." end private