cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Altered old_way stuff to be Railsy like old_node is now

Browse source
This commit is contained in:
Matt Amos 2012-03-28 18:01:21 +01:00 • committed by Tom Hughes
parent 72e59b49fa
commit 990f3eba40
7 changed files with 80 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

29
test/functional/old_way_controller_test.rb
View file

@ -60,8 +60,8 @@ class OldWayControllerTest < ActionController::TestCase
# test the redaction of an old version of a way, while not being
# authorised.
def test_redact_way_unauthorised
do_redact_way(ways(:way_with_versions),
redactions(:example))
do_redact_way(ways(:way_with_versions_v3),
redactions(:example))
assert_response :unauthorized, "should need to be authenticated to redact."
end
@ -71,8 +71,8 @@ class OldWayControllerTest < ActionController::TestCase
def test_redact_way_normal_user
basic_authorization(users(:public_user).email, "test")
do_redact_way(ways(:way_with_versions),
redactions(:example))
do_redact_way(ways(:way_with_versions_v3),
redactions(:example))
assert_response :forbidden, "should need to be moderator to redact."
end
@ -84,7 +84,7 @@ class OldWayControllerTest < ActionController::TestCase
do_redact_way(ways(:way_with_versions_v4),
redactions(:example))
assert_response :forbidden, "shouldn't be OK to redact current version as moderator."
assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
end
##
@ -123,26 +123,32 @@ 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
way = ways(:way_with_versions)
way = ways(:way_with_versions_v3)
basic_authorization(users(:moderator_user).email, "test")
do_redact_way(way, redactions(:example))
assert_response :success, "should be OK to redact old version as moderator."
# check moderator can still see the redacted data
# check moderator can still see the redacted data, when passing
# the appropriate flag
get :version, :id => way.way_id, :version => way.version
assert_response :success, "After redaction, node should not be gone for moderator."
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."
assert_select "osm way[id=#{way.way_id}][version=#{way.version}]", 1, "way #{way.way_id} version #{way.version} should still be present in the history for moderators."
assert_select "osm way[id=#{way.way_id}][version=#{way.version}]", 0, "way #{way.way_id} version #{way.version} should not be present in the history for moderators when not passing flag."
get :history, :id => way.way_id, :show_redactions => 'true'
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm way[id=#{way.way_id}][version=#{way.version}]", 1, "way #{way.way_id} version #{way.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
# redacted stuff any more.
def test_redact_way_is_redacted
way = ways(:way_with_versions)
way = ways(:way_with_versions_v3)
basic_authorization(users(:moderator_user).email, "test")
do_redact_way(way, redactions(:example))
@ -156,8 +162,7 @@ class OldWayControllerTest < ActionController::TestCase
assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
# and when accessed via history
get :version, :id => way.node_id, :version => way.version
get :history, :id => way.node_id
get :history, :id => way.way_id
assert_response :success, "Redaction shouldn't have stopped history working."
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."
end