X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cbf6b394644e5eff071ecab3cae3f17842fd3631..a25b7953b3889ce6847a13c579fa9fd32219b5e3:/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 ca2cccd0f..cc9eaf312 100644 --- a/test/controllers/api/old_ways_controller_test.rb +++ b/test/controllers/api/old_ways_controller_test.rb @@ -45,7 +45,7 @@ module Api def test_history_invalid # check chat a non-existent way is not returned - get api_way_history_path(:id => 0) + get api_way_history_path(0) assert_response :not_found end @@ -98,7 +98,7 @@ module Api # test the redaction of an old version of a way, while being # authorised as a normal user. def test_redact_way_normal_user - auth_header = basic_authorization_header create(:user).email, "test" + auth_header = bearer_authorization_header way = create(:way, :with_history, :version => 4) way_v3 = way.old_ways.find_by(:version => 3) @@ -110,7 +110,7 @@ module Api # test that, even as moderator, the current version of a way # can't be redacted. def test_redact_way_current_version - auth_header = basic_authorization_header create(:moderator_user).email, "test" + auth_header = bearer_authorization_header create(:moderator_user) way = create(:way, :with_history, :version => 4) way_latest = way.old_ways.last @@ -118,39 +118,26 @@ module Api assert_response :bad_request, "shouldn't be OK to redact current version as moderator." end - def test_redact_way_by_regular_with_read_prefs_scope - auth_header = create_bearer_auth_header(create(:user), %w[read_prefs]) - do_redact_redactable_way(auth_header) - assert_response :forbidden, "should need to be moderator to redact." - end - - def test_redact_way_by_regular_with_write_api_scope - auth_header = create_bearer_auth_header(create(:user), %w[write_api]) + def test_redact_way_by_regular_without_write_redactions_scope + auth_header = bearer_authorization_header(create(:user), :scopes => %w[read_prefs write_api]) do_redact_redactable_way(auth_header) assert_response :forbidden, "should need to be moderator to redact." end def test_redact_way_by_regular_with_write_redactions_scope - auth_header = create_bearer_auth_header(create(:user), %w[write_redactions]) + auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_redactions]) do_redact_redactable_way(auth_header) assert_response :forbidden, "should need to be moderator to redact." end - def test_redact_way_by_moderator_with_read_prefs_scope - auth_header = create_bearer_auth_header(create(:moderator_user), %w[read_prefs]) + def test_redact_way_by_moderator_without_write_redactions_scope + auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[read_prefs write_api]) do_redact_redactable_way(auth_header) assert_response :forbidden, "should need to have write_redactions scope to redact." end - def test_redact_way_by_moderator_with_write_api_scope - auth_header = create_bearer_auth_header(create(:moderator_user), %w[write_api]) - do_redact_redactable_way(auth_header) - assert_response :success, "should be OK to redact old version as moderator with write_api scope." - # assert_response :forbidden, "should need to have write_redactions scope to redact." - end - def test_redact_way_by_moderator_with_write_redactions_scope - auth_header = create_bearer_auth_header(create(:moderator_user), %w[write_redactions]) + auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_redactions]) do_redact_redactable_way(auth_header) assert_response :success, "should be OK to redact old version as moderator with write_redactions scope." end @@ -163,12 +150,12 @@ module Api way_v1 = way.old_ways.find_by(:version => 1) way_v1.redact!(create(:redaction)) - get way_version_path(:id => way_v1.way_id, :version => way_v1.version) + get api_old_way_path(way_v1.way_id, way_v1.version) assert_response :forbidden, "Redacted way shouldn't be visible via the version API." # 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 + auth_header = bearer_authorization_header + get api_old_way_path(way_v1.way_id, way_v1.version), :headers => auth_header assert_response :forbidden, "Redacted way shouldn't be visible via the version API, even when logged in." end @@ -179,15 +166,14 @@ module Api way_v1 = way.old_ways.find_by(:version => 1) way_v1.redact!(create(:redaction)) - get api_way_history_path(:id => way_v1.way_id) + get api_way_history_path(way) 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." # 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 + auth_header = bearer_authorization_header + get api_way_history_path(way), :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." @@ -199,24 +185,24 @@ module Api def test_redact_way_moderator way = create(:way, :with_history, :version => 4) way_v3 = way.old_ways.find_by(:version => 3) - auth_header = basic_authorization_header create(:moderator_user).email, "test" + auth_header = bearer_authorization_header create(:moderator_user) do_redact_way(way_v3, create(:redaction), auth_header) assert_response :success, "should be OK to redact old version as moderator." # check moderator can still see the redacted data, when passing # the appropriate flag - get way_version_path(:id => way_v3.way_id, :version => way_v3.version), :headers => auth_header + get api_old_way_path(way_v3.way_id, way_v3.version), :headers => auth_header assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed." - get way_version_path(:id => way_v3.way_id, :version => way_v3.version), :params => { :show_redactions => "true" }, :headers => auth_header + get api_old_way_path(way_v3.way_id, way_v3.version, :show_redactions => "true"), :headers => auth_header assert_response :success, "After redaction, node should not be gone for moderator, when flag passed." # and when accessed via history - get api_way_history_path(:id => way_v3.way_id), :headers => auth_header + get api_way_history_path(way), :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." - get api_way_history_path(:id => way_v3.way_id), :params => { :show_redactions => "true" }, :headers => auth_header + get api_way_history_path(way, :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." @@ -227,20 +213,20 @@ module Api def test_redact_way_is_redacted way = create(:way, :with_history, :version => 4) way_v3 = way.old_ways.find_by(:version => 3) - auth_header = basic_authorization_header create(:moderator_user).email, "test" + auth_header = bearer_authorization_header create(:moderator_user) do_redact_way(way_v3, create(:redaction), auth_header) assert_response :success, "should be OK to redact old version as moderator." # re-auth as non-moderator - auth_header = basic_authorization_header create(:user).email, "test" + auth_header = bearer_authorization_header # check can't see the redacted data - get way_version_path(:id => way_v3.way_id, :version => way_v3.version), :headers => auth_header + get api_old_way_path(way_v3.way_id, way_v3.version), :headers => auth_header assert_response :forbidden, "Redacted node shouldn't be visible via the version API." # and when accessed via history - get api_way_history_path(:id => way_v3.way_id), :headers => auth_header + get api_way_history_path(way), :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." @@ -254,7 +240,7 @@ module Api way_v1 = way.old_ways.find_by(:version => 1) way_v1.redact!(create(:redaction)) - post way_version_redact_path(:id => way_v1.way_id, :version => way_v1.version) + post way_version_redact_path(way_v1.way_id, way_v1.version) assert_response :unauthorized, "should need to be authenticated to unredact." end @@ -266,9 +252,9 @@ module Api way_v1 = way.old_ways.find_by(:version => 1) way_v1.redact!(create(:redaction)) - auth_header = basic_authorization_header create(:user).email, "test" + auth_header = bearer_authorization_header - post way_version_redact_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header + post way_version_redact_path(way_v1.way_id, way_v1.version), :headers => auth_header assert_response :forbidden, "should need to be moderator to unredact." end @@ -281,30 +267,30 @@ module Api way_v1 = way.old_ways.find_by(:version => 1) way_v1.redact!(create(:redaction)) - auth_header = basic_authorization_header moderator_user.email, "test" + auth_header = bearer_authorization_header moderator_user - post way_version_redact_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header + post way_version_redact_path(way_v1.way_id, way_v1.version), :headers => auth_header assert_response :success, "should be OK to unredact old version as moderator." # check moderator can still see the unredacted data, without passing # the appropriate flag - get way_version_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header + get api_old_way_path(way_v1.way_id, way_v1.version), :headers => auth_header assert_response :success, "After unredaction, node should not be gone for moderator." # and when accessed via history - get api_way_history_path(:id => way_v1.way_id), :headers => auth_header + get api_way_history_path(way), :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." - auth_header = basic_authorization_header create(:user).email, "test" + auth_header = bearer_authorization_header # check normal user can now see the unredacted data - get way_version_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header + get api_old_way_path(way_v1.way_id, way_v1.version), :headers => auth_header assert_response :success, "After redaction, node should not be gone for moderator, when flag passed." # and when accessed via history - get api_way_history_path(:id => way_v1.way_id), :headers => auth_header + get api_way_history_path(way), :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." @@ -325,7 +311,7 @@ module Api assert_not_nil current_way, "getting way #{way_id} returned nil" # get the "old" version of the way from the version method - get way_version_path(:id => way_id, :version => current_way.version) + get api_old_way_path(way_id, current_way.version) assert_response :success, "can't get old way #{way_id}, v#{current_way.version}" old_way = Way.from_xml(@response.body) @@ -337,7 +323,7 @@ module Api # look at all the versions of the way in the history and get each version from # the versions call. check that they're the same. def check_history_equals_versions(way_id) - get api_way_history_path(:id => way_id) + get api_way_history_path(way_id) assert_response :success, "can't get way #{way_id} from API" history_doc = XML::Parser.string(@response.body).parse assert_not_nil history_doc, "parsing way #{way_id} history failed" @@ -346,7 +332,7 @@ module Api history_way = Way.from_xml_node(way_doc) assert_not_nil history_way, "parsing way #{way_id} version failed" - get way_version_path(:id => way_id, :version => history_way.version) + get api_old_way_path(way_id, history_way.version) assert_response :success, "couldn't get way #{way_id}, v#{history_way.version}" version_way = Way.from_xml(@response.body) assert_not_nil version_way, "failed to parse #{way_id}, v#{history_way.version}" @@ -355,13 +341,6 @@ module Api end end - def create_bearer_auth_header(user, scopes) - token = create(:oauth_access_token, - :resource_owner_id => user.id, - :scopes => scopes) - bearer_authorization_header(token.token) - end - def do_redact_redactable_way(headers = {}) way = create(:way, :with_history, :version => 4) way_v3 = way.old_ways.find_by(:version => 3) @@ -369,11 +348,11 @@ module Api end def do_redact_way(way, redaction, headers = {}) - get way_version_path(:id => way.way_id, :version => way.version) + get api_old_way_path(way.way_id, way.version) assert_response :success, "should be able to get version #{way.version} of way #{way.way_id}." # now redact it - post way_version_redact_path(:id => way.way_id, :version => way.version), :params => { :redaction => redaction.id }, :headers => headers + post way_version_redact_path(way.way_id, way.version), :params => { :redaction => redaction.id }, :headers => headers end def propagate_tags(way, old_way)