require File.dirname(__FILE__) + '/../test_helper'
require 'old_way_controller'
-# Re-raise errors caught by the controller.
-class OldWayController; def rescue_action(e) raise e end; end
-
-class OldWayControllerTest < Test::Unit::TestCase
+class OldWayControllerTest < ActionController::TestCase
api_fixtures
- def setup
- @controller = OldWayController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
+ ##
+ # test all routes which lead to this controller
+ def test_routes
+ assert_routing(
+ { :path => "/api/0.6/way/1/history", :method => :get },
+ { :controller => "old_way", :action => "history", :id => "1" }
+ )
+ assert_routing(
+ { :path => "/api/0.6/way/1/2", :method => :get },
+ { :controller => "old_way", :action => "version", :id => "1", :version => "2" }
+ )
+ assert_routing(
+ { :path => "/api/0.6/way/1/2/redact", :method => :post },
+ { :controller => "old_way", :action => "redact", :id => "1", :version => "2" }
+ )
end
# -------------------------------------
def test_history_visible
# check that a visible way is returned properly
- get :history, :id => ways(:visible_way).id
+ 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).id
+ get :history, :id => ways(:invisible_way).way_id
assert_response :success
end
check_history_equals_versions(current_ways(:way_with_versions).id)
end
+ ##
+ # 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_v3),
+ redactions(:example))
+ assert_response :unauthorized, "should need to be authenticated to redact."
+ end
+
+ ##
+ # 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")
+
+ do_redact_way(ways(:way_with_versions_v3),
+ redactions(:example))
+ assert_response :forbidden, "should need to be moderator to redact."
+ end
+
+ ##
+ # test that, even as moderator, the current version of a way
+ # can't be redacted.
+ def test_redact_way_current_version
+ basic_authorization(users(:moderator_user).email, "test")
+
+ 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
+
+ ##
+ # test that redacted ways aren't visible, regardless of
+ # authorisation except as moderator...
+ def test_version_redacted
+ way = ways(:way_with_redacted_versions_v2)
+
+ get :version, :id => way.way_id, :version => way.version
+ 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")
+ 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
+
+ ##
+ # test that redacted nodes aren't visible in the history
+ def test_history_redacted
+ way = ways(:way_with_redacted_versions_v2)
+
+ 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."
+
+ # not even to a logged-in user
+ basic_authorization(users(:public_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."
+ assert_select "osm way[id=#{way.way_id}][version=#{way.version}]", 0, "redacted node #{way.way_id} version #{way.version} shouldn't be present in the history, even when logged in."
+ end
+
+ ##
+ # 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)
+ 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, when passing
+ # the appropriate flag
+ get :version, :id => way.way_id, :version => way.version
+ 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}]", 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_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."
+
+ # re-auth as non-moderator
+ basic_authorization(users(:public_user).email, "test")
+
+ # 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."
+ 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
+
##
# check that the current version of a way is equivalent to the
# version which we're getting from the versions call.
end
end
- ##
- # for some reason assert_equal a, b fails when the ways are actually
- # equal, so this method manually checks the fields...
- def assert_ways_are_equal(a, b)
- assert_equal a.id, b.id, "way IDs"
- assert_equal a.changeset_id, b.changeset_id, "changeset ID on way #{a.id}"
- assert_equal a.visible, b.visible, "visible on way #{a.id}"
- assert_equal a.version, b.version, "version on way #{a.id}"
- assert_equal a.tags, b.tags, "tags on way #{a.id}"
- assert_equal a.nds, b.nds, "node references on way #{a.id}"
+ 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
end
projects / rails.git / blobdiff