X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e1f79d84adc413afa2a1a8d8d06fda9fa5151d49..34e3e51456774127d43408b7ab65c24f41373f62:/test/controllers/old_way_controller_test.rb diff --git a/test/controllers/old_way_controller_test.rb b/test/controllers/old_way_controller_test.rb index 306a48615..1fa0657fa 100644 --- a/test/controllers/old_way_controller_test.rb +++ b/test/controllers/old_way_controller_test.rb @@ -30,19 +30,19 @@ class OldWayControllerTest < ActionController::TestCase get :history, :id => ways(:visible_way).way_id assert_response :success end - + def test_history_invisible # check that an invisible way's history is returned properly get :history, :id => ways(:invisible_way).way_id assert_response :success end - + def test_history_invalid # check chat a non-existent way is not returned get :history, :id => 0 assert_response :not_found end - + ## # check that we can retrieve versions of a way def test_version @@ -52,7 +52,7 @@ class OldWayControllerTest < ActionController::TestCase end ## - # check that returned history is the same as getting all + # check that returned history is the same as getting all # versions of a way from the api. def test_history_equals_versions check_history_equals_versions(current_ways(:visible_way).id) @@ -70,7 +70,7 @@ class OldWayControllerTest < ActionController::TestCase end ## - # test the redaction of an old version of a way, while being + # test the redaction of an old version of a way, while being # authorised as a normal user. def test_redact_way_normal_user basic_authorization(users(:public_user).email, "test") @@ -89,10 +89,10 @@ class OldWayControllerTest < ActionController::TestCase do_redact_way(ways(:way_with_versions_v4), redactions(:example)) assert_response :bad_request, "shouldn't be OK to redact current version as moderator." - end + end ## - # test that redacted ways aren't visible, regardless of + # test that redacted ways aren't visible, regardless of # authorisation except as moderator... def test_version_redacted way = ways(:way_with_redacted_versions_v2) @@ -124,7 +124,7 @@ class OldWayControllerTest < ActionController::TestCase end ## - # test the redaction of an old version of a way, while being + # test the redaction of an old version of a way, while being # authorised as a moderator. def test_redact_way_moderator way = ways(:way_with_versions_v3) @@ -139,7 +139,7 @@ class OldWayControllerTest < ActionController::TestCase assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed." get :version, :id => way.way_id, :version => way.version, :show_redactions => 'true' assert_response :success, "After redaction, node should not be gone for moderator, when flag passed." - + # and when accessed via history get :history, :id => way.way_id assert_response :success, "Redaction shouldn't have stopped history working." @@ -164,7 +164,7 @@ class OldWayControllerTest < ActionController::TestCase # check can't see the redacted data get :version, :id => way.way_id, :version => way.version assert_response :forbidden, "Redacted node shouldn't be visible via the version API." - + # and when accessed via history get :history, :id => way.way_id assert_response :success, "Redaction shouldn't have stopped history working." @@ -209,7 +209,7 @@ class OldWayControllerTest < ActionController::TestCase 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}" - + assert_ways_are_equal history_way, version_way end end @@ -217,7 +217,7 @@ class OldWayControllerTest < ActionController::TestCase def do_redact_way(way, redaction) get :version, :id => way.way_id, :version => way.version assert_response :success, "should be able to get version #{way.version} of node #{way.way_id}." - + # now redact it post :redact, :id => way.way_id, :version => way.version, :redaction => redaction.id end