X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2f9ed9101a6aba23026d37bc6257b1c7afbfdcbe..d2998065dcb1c55552a565e872abd7742af84410:/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 e5cb752cd..b425be7ed 100644 --- a/test/controllers/old_way_controller_test.rb +++ b/test/controllers/old_way_controller_test.rb @@ -46,6 +46,9 @@ class OldWayControllerTest < ActionController::TestCase ## # check that we can retrieve versions of a way def test_version + create(:way_tag, :way => current_ways(:visible_way)) + create(:way_tag, :way => current_ways(:used_way)) + create(:way_tag, :way => current_ways(:way_with_versions)) propagate_tags(current_ways(:visible_way), ways(:visible_way)) propagate_tags(current_ways(:used_way), ways(:used_way)) propagate_tags(current_ways(:way_with_versions), ways(:way_with_versions_v4)) @@ -69,7 +72,7 @@ class OldWayControllerTest < ActionController::TestCase # authorised. def test_redact_way_unauthorised do_redact_way(ways(:way_with_versions_v3), - redactions(:example)) + create(:redaction)) assert_response :unauthorized, "should need to be authenticated to redact." end @@ -77,10 +80,11 @@ class OldWayControllerTest < ActionController::TestCase # 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") + user = create(:user) + basic_authorization(user.email, "test") do_redact_way(ways(:way_with_versions_v3), - redactions(:example)) + create(:redaction, :user => user)) assert_response :forbidden, "should need to be moderator to redact." end @@ -88,10 +92,11 @@ class OldWayControllerTest < ActionController::TestCase # test that, even as moderator, the current version of a way # can't be redacted. def test_redact_way_current_version + moderator_user = create(:moderator_user) basic_authorization(users(:moderator_user).email, "test") do_redact_way(ways(:way_with_versions_v4), - redactions(:example)) + create(:redaction, :user => moderator_user)) assert_response :bad_request, "shouldn't be OK to redact current version as moderator." end @@ -105,7 +110,7 @@ class OldWayControllerTest < ActionController::TestCase assert_response :forbidden, "Redacted node shouldn't be visible via the version API." # not even to a logged-in user - basic_authorization(users(:public_user).email, "test") + basic_authorization(create(:user).email, "test") get :version, :id => way.way_id, :version => way.version assert_response :forbidden, "Redacted node shouldn't be visible via the version API, even when logged in." end @@ -120,7 +125,7 @@ class OldWayControllerTest < ActionController::TestCase assert_select "osm way[id='#{way.way_id}'][version='#{way.version}']", 0, "redacted way #{way.way_id} version #{way.version} shouldn't be present in the history." # not even to a logged-in user - basic_authorization(users(:public_user).email, "test") + basic_authorization(create(:user).email, "test") get :version, :id => way.way_id, :version => way.version get :history, :id => way.way_id assert_response :success, "Redaction shouldn't have stopped history working." @@ -131,10 +136,11 @@ class OldWayControllerTest < ActionController::TestCase # test the redaction of an old version of a way, while being # authorised as a moderator. def test_redact_way_moderator + moderator_user = create(:moderator_user) way = ways(:way_with_versions_v3) - basic_authorization(users(:moderator_user).email, "test") + basic_authorization(moderator_user.email, "test") - do_redact_way(way, redactions(:example)) + do_redact_way(way, create(:redaction, :user => moderator_user)) assert_response :success, "should be OK to redact old version as moderator." # check moderator can still see the redacted data, when passing @@ -156,14 +162,15 @@ class OldWayControllerTest < ActionController::TestCase # testing that if the moderator drops auth, he can't see the # redacted stuff any more. def test_redact_way_is_redacted + moderator_user = create(:moderator_user) way = ways(:way_with_versions_v3) - basic_authorization(users(:moderator_user).email, "test") + basic_authorization(moderator_user.email, "test") - do_redact_way(way, redactions(:example)) + do_redact_way(way, create(:redaction, :user => moderator_user)) assert_response :success, "should be OK to redact old version as moderator." # re-auth as non-moderator - basic_authorization(users(:public_user).email, "test") + basic_authorization(create(:user).email, "test") # check can't see the redacted data get :version, :id => way.way_id, :version => way.version @@ -190,7 +197,7 @@ class OldWayControllerTest < ActionController::TestCase # authorised as a normal user. def test_unredact_way_normal_user way = ways(:way_with_redacted_versions_v3) - basic_authorization(users(:public_user).email, "test") + basic_authorization(create(:user).email, "test") post :redact, :id => way.way_id, :version => way.version assert_response :forbidden, "should need to be moderator to unredact." @@ -200,8 +207,9 @@ class OldWayControllerTest < ActionController::TestCase # test the unredaction of an old version of a way, while being # authorised as a moderator. def test_unredact_way_moderator + moderator_user = create(:moderator_user) way = ways(:way_with_redacted_versions_v3) - basic_authorization(users(:moderator_user).email, "test") + basic_authorization(moderator_user.email, "test") post :redact, :id => way.way_id, :version => way.version assert_response :success, "should be OK to unredact old version as moderator." @@ -275,7 +283,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}." + assert_response :success, "should be able to get version #{way.version} of way #{way.way_id}." # now redact it post :redact, :id => way.way_id, :version => way.version, :redaction => redaction.id