require "test_helper"
-class OldWaysControllerTest < ActionController::TestCase
- ##
- # test all routes which lead to this controller
+class OldWaysControllerTest < ActionDispatch::IntegrationTest
def test_routes
assert_routing(
- { :path => "/api/0.6/way/1/history", :method => :get },
- { :controller => "old_ways", :action => "history", :id => "1" }
+ { :path => "/way/1/history", :method => :get },
+ { :controller => "old_ways", :action => "index", :id => "1" }
)
assert_routing(
- { :path => "/api/0.6/way/1/2", :method => :get },
- { :controller => "old_ways", :action => "version", :id => "1", :version => "2" }
+ { :path => "/way/1/history/2", :method => :get },
+ { :controller => "old_ways", :action => "show", :id => "1", :version => "2" }
)
- assert_routing(
- { :path => "/api/0.6/way/1/2/redact", :method => :post },
- { :controller => "old_ways", :action => "redact", :id => "1", :version => "2" }
- )
- end
-
- # -------------------------------------
- # Test reading old ways.
- # -------------------------------------
-
- def test_history_visible
- # check that a visible way is returned properly
- get :history, :params => { :id => create(:way, :with_history).id }
- assert_response :success
- end
-
- def test_history_invisible
- # check that an invisible way's history is returned properly
- get :history, :params => { :id => create(:way, :with_history, :deleted).id }
- assert_response :success
- end
-
- def test_history_invalid
- # check chat a non-existent way is not returned
- get :history, :params => { :id => 0 }
- assert_response :not_found
end
- ##
- # check that we can retrieve versions of a way
- def test_version
+ def test_history
way = create(:way, :with_history)
- used_way = create(:way, :with_history)
- create(:relation_member, :member => used_way)
- way_with_versions = create(:way, :with_history, :version => 4)
-
- create(:way_tag, :way => way)
- create(:way_tag, :way => used_way)
- create(:way_tag, :way => way_with_versions)
- propagate_tags(way, way.old_ways.last)
- propagate_tags(used_way, used_way.old_ways.last)
- propagate_tags(way_with_versions, way_with_versions.old_ways.last)
-
- check_current_version(way.id)
- check_current_version(used_way.id)
- check_current_version(way_with_versions.id)
- end
-
- ##
- # check that returned history is the same as getting all
- # versions of a way from the api.
- def test_history_equals_versions
- way = create(:way, :with_history)
- used_way = create(:way, :with_history)
- create(:relation_member, :member => used_way)
- way_with_versions = create(:way, :with_history, :version => 4)
-
- check_history_equals_versions(way.id)
- check_history_equals_versions(used_way.id)
- check_history_equals_versions(way_with_versions.id)
- end
-
- ##
- # test the redaction of an old version of a way, while not being
- # authorised.
- def test_redact_way_unauthorised
- way = create(:way, :with_history, :version => 4)
- way_v3 = way.old_ways.find_by(:version => 3)
-
- do_redact_way(way_v3, create(:redaction))
- 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 create(:user).email, "test"
- way = create(:way, :with_history, :version => 4)
- way_v3 = way.old_ways.find_by(:version => 3)
-
- do_redact_way(way_v3, create(:redaction))
- assert_response :forbidden, "should need to be moderator to redact."
+ sidebar_browse_check :way_history_path, way.id, "browse/history"
+ assert_select "h4", /^Version/ do
+ assert_select "a[href='#{old_way_path way, 1}']", :text => "1", :count => 1
+ end
end
- ##
- # test that, even as moderator, the current version of a way
- # can't be redacted.
- def test_redact_way_current_version
- basic_authorization create(:moderator_user).email, "test"
+ def test_history_of_redacted
way = create(:way, :with_history, :version => 4)
- way_latest = way.old_ways.last
-
- do_redact_way(way_latest, create(:redaction))
- 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 = create(:way, :with_history, :version => 2)
way_v1 = way.old_ways.find_by(:version => 1)
way_v1.redact!(create(:redaction))
+ way_v3 = way.old_ways.find_by(:version => 3)
+ way_v3.redact!(create(:redaction))
- get :version, :params => { :id => way_v1.way_id, :version => way_v1.version }
- assert_response :forbidden, "Redacted way shouldn't be visible via the version API."
+ get way_history_path(:id => way)
+ assert_response :success
+ assert_template "browse/history"
- # not even to a logged-in user
- basic_authorization create(:user).email, "test"
- get :version, :params => { :id => way_v1.way_id, :version => way_v1.version }
- assert_response :forbidden, "Redacted way shouldn't be visible via the version API, even when logged in."
+ # there are 4 revisions of the redacted way, but only 2
+ # should be showing details here.
+ assert_select ".browse-section", 4
+ assert_select ".browse-section.browse-redacted", 2
+ assert_select ".browse-section.browse-way", 2
end
- ##
- # test that redacted ways aren't visible in the history
- def test_history_redacted
- way = create(:way, :with_history, :version => 2)
+ def test_unredacted_history_of_redacted
+ session_for(create(:moderator_user))
+ way = create(:way, :with_history, :version => 4)
way_v1 = way.old_ways.find_by(:version => 1)
way_v1.redact!(create(:redaction))
-
- get :history, :params => { :id => way_v1.way_id }
- 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
- basic_authorization create(:user).email, "test"
- get :version, :params => { :id => way_v1.way_id, :version => way_v1.version }
- get :history, :params => { :id => way_v1.way_id }
- 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."
- end
-
- ##
- # test the redaction of an old version of a way, while being
- # authorised as a moderator.
- def test_redact_way_moderator
- way = create(:way, :with_history, :version => 4)
way_v3 = way.old_ways.find_by(:version => 3)
- basic_authorization create(:moderator_user).email, "test"
+ way_v3.redact!(create(:redaction))
- do_redact_way(way_v3, create(:redaction))
- 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, :params => { :id => way_v3.way_id, :version => way_v3.version }
- assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed."
- get :version, :params => { :id => way_v3.way_id, :version => way_v3.version, :show_redactions => "true" }
- assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
+ get way_history_path(:id => way, :params => { :show_redactions => true })
+ assert_response :success
+ assert_template "browse/history"
- # and when accessed via history
- get :history, :params => { :id => way_v3.way_id }
- 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 :history, :params => { :id => way_v3.way_id, :show_redactions => "true" }
- 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."
+ assert_select ".browse-section", 4
+ assert_select ".browse-section.browse-redacted", 0
+ assert_select ".browse-section.browse-way", 4
end
- # testing that if the moderator drops auth, he can't see the
- # redacted stuff any more.
- def test_redact_way_is_redacted
- way = create(:way, :with_history, :version => 4)
- way_v3 = way.old_ways.find_by(:version => 3)
- basic_authorization create(:moderator_user).email, "test"
-
- do_redact_way(way_v3, create(:redaction))
- assert_response :success, "should be OK to redact old version as moderator."
-
- # re-auth as non-moderator
- basic_authorization create(:user).email, "test"
-
- # check can't see the redacted data
- get :version, :params => { :id => way_v3.way_id, :version => way_v3.version }
- assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
-
- # and when accessed via history
- get :history, :params => { :id => way_v3.way_id }
- 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."
+ def test_visible_with_one_version
+ way = create(:way, :with_history)
+ get old_way_path(way, 1)
+ assert_response :success
+ assert_template "old_ways/show"
+ assert_template :layout => "map"
+ assert_select "h4", /^Version/ do
+ assert_select "a[href='#{old_way_path way, 1}']", :count => 0
+ end
+ assert_select ".secondary-actions a[href='#{api_old_way_path way, 1}']", :count => 1
+ assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1
+ assert_select ".secondary-actions a[href='#{old_way_path way, 1, :params => { :show_redactions => true }}']", :count => 0
+ assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1
end
- ##
- # test the unredaction of an old version of a way, while not being
- # authorised.
- def test_unredact_way_unauthorised
+ def test_visible_with_two_versions
way = create(:way, :with_history, :version => 2)
- way_v1 = way.old_ways.find_by(:version => 1)
- way_v1.redact!(create(:redaction))
+ get old_way_path(way, 1)
+ assert_response :success
+ assert_template "old_ways/show"
+ assert_template :layout => "map"
+ assert_select "h4", /^Version/ do
+ assert_select "a[href='#{old_way_path way, 1}']", :count => 0
+ end
+ assert_select ".secondary-actions a[href='#{api_old_way_path way, 1}']", :count => 1
+ assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1
+ assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1
+ assert_select ".secondary-actions a[href='#{old_way_path way, 2}']", :count => 1
- post :redact, :params => { :id => way_v1.way_id, :version => way_v1.version }
- assert_response :unauthorized, "should need to be authenticated to unredact."
+ get old_way_path(way, 2)
+ assert_response :success
+ assert_template "old_ways/show"
+ assert_template :layout => "map"
+ assert_select "h4", /^Version/ do
+ assert_select "a[href='#{old_way_path way, 2}']", :count => 0
+ end
+ assert_select ".secondary-actions a[href='#{api_old_way_path way, 2}']", :count => 1
+ assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1
+ assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1
+ assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 1
end
- ##
- # test the unredaction of an old version of a way, while being
- # authorised as a normal user.
- def test_unredact_way_normal_user
- way = create(:way, :with_history, :version => 2)
- way_v1 = way.old_ways.find_by(:version => 1)
- way_v1.redact!(create(:redaction))
-
- basic_authorization create(:user).email, "test"
-
- post :redact, :params => { :id => way_v1.way_id, :version => way_v1.version }
- assert_response :forbidden, "should need to be moderator to unredact."
+ def test_visible_with_shared_nodes
+ node = create(:node, :with_history)
+ way = create(:way, :with_history)
+ create(:way_node, :way => way, :node => node)
+ create(:old_way_node, :old_way => way.old_ways.first, :node => node)
+ sharing_way = create(:way, :with_history)
+ create(:way_node, :way => sharing_way, :node => node)
+ create(:old_way_node, :old_way => sharing_way.old_ways.first, :node => node)
+ get old_way_path(way, 1)
+ assert_response :success
+ assert_template "old_ways/show"
+ assert_template :layout => "map"
end
- ##
- # 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 = create(:way, :with_history, :version => 2)
- way_v1 = way.old_ways.find_by(:version => 1)
- way_v1.redact!(create(:redaction))
-
- basic_authorization moderator_user.email, "test"
-
- post :redact, :params => { :id => way_v1.way_id, :version => way_v1.version }
- 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 :version, :params => { :id => way_v1.way_id, :version => way_v1.version }
- assert_response :success, "After unredaction, node should not be gone for moderator."
-
- # and when accessed via history
- get :history, :params => { :id => way_v1.way_id }
- 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."
-
- basic_authorization create(:user).email, "test"
-
- # check normal user can now see the unredacted data
- get :version, :params => { :id => way_v1.way_id, :version => way_v1.version }
- assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
-
- # and when accessed via history
- get :history, :params => { :id => way_v1.way_id }
- 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."
+ test "show unrevealed redacted versions to anonymous users" do
+ way = create_redacted_way
+ get old_way_path(way, 1)
+ assert_response :success
+ assert_template "old_ways/show"
+ assert_template :layout => "map"
+ assert_select "td", :text => "TOP SECRET", :count => 0
+ assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1
+ assert_select ".secondary-actions a[href='#{old_way_path way, 1, :params => { :show_redactions => true }}']", :count => 0
+ assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 0
+ assert_select ".secondary-actions a[href='#{api_old_way_path way, 1}']", :count => 0
+ end
+
+ test "show unrevealed redacted versions to regular users" do
+ session_for(create(:user))
+ way = create_redacted_way
+ get old_way_path(way, 1)
+ assert_response :success
+ assert_template "old_ways/show"
+ assert_template :layout => "map"
+ assert_select "td", :text => "TOP SECRET", :count => 0
+ assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1
+ assert_select ".secondary-actions a[href='#{old_way_path way, 1, :params => { :show_redactions => true }}']", :count => 0
+ assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 0
+ assert_select ".secondary-actions a[href='#{api_old_way_path way, 1}']", :count => 0
+ end
+
+ test "show unrevealed redacted versions to moderators" do
+ session_for(create(:moderator_user))
+ way = create_redacted_way
+ get old_way_path(way, 1)
+ assert_response :success
+ assert_template "old_ways/show"
+ assert_template :layout => "map"
+ assert_select "td", :text => "TOP SECRET", :count => 0
+ assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1
+ assert_select ".secondary-actions a[href='#{old_way_path way, 1, :params => { :show_redactions => true }}']", :count => 1
+ assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 0
+ assert_select ".secondary-actions a[href='#{api_old_way_path way, 1}']", :count => 0
end
- private
-
- ##
- # check that the current version of a way is equivalent to the
- # version which we're getting from the versions call.
- def check_current_version(way_id)
- # get the current version
- current_way = with_controller(WaysController.new) do
- get :show, :params => { :id => way_id }
- assert_response :success, "can't get current way #{way_id}"
- Way.from_xml(@response.body)
- end
- assert_not_nil current_way, "getting way #{way_id} returned nil"
-
- # get the "old" version of the way from the version method
- get :version, :params => { :id => way_id, :version => current_way.version }
- assert_response :success, "can't get old way #{way_id}, v#{current_way.version}"
- old_way = Way.from_xml(@response.body)
-
- # check that the ways are identical
- assert_ways_are_equal current_way, old_way
+ test "don't reveal redacted versions to anonymous users" do
+ way = create_redacted_way
+ get old_way_path(way, 1, :params => { :show_redactions => true })
+ assert_response :redirect
end
- ##
- # 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 :history, :params => { :id => 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"
+ test "don't reveal redacted versions to regular users" do
+ session_for(create(:user))
+ way = create_redacted_way
+ get old_way_path(way, 1, :params => { :show_redactions => true })
+ assert_response :redirect
+ end
- history_doc.find("//osm/way").each do |way_doc|
- history_way = Way.from_xml_node(way_doc)
- assert_not_nil history_way, "parsing way #{way_id} version failed"
+ test "reveal redacted versions to moderators" do
+ session_for(create(:moderator_user))
+ way = create_redacted_way
+ get old_way_path(way, 1, :params => { :show_redactions => true })
+ assert_response :success
+ assert_select "td", :text => "TOP SECRET", :count => 1
+ assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 1
+ end
- get :version, :params => { :id => way_id, :version => 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}"
+ def test_not_found
+ get old_way_path(0, 0)
+ assert_response :not_found
+ assert_template "old_ways/not_found"
+ assert_template :layout => "map"
+ assert_select "#sidebar_content", /way #0 version 0 could not be found/
+ end
- assert_ways_are_equal history_way, version_way
+ def test_show_timeout
+ way = create(:way, :with_history)
+ with_settings(:web_timeout => -1) do
+ get old_way_path(way, 1)
end
+ assert_response :error
+ assert_template :layout => "map"
+ assert_dom "h2", "Timeout Error"
+ assert_dom "p", /#{Regexp.quote("the way with the id #{way.id}")}/
end
- def do_redact_way(way, redaction)
- get :version, :params => { :id => way.way_id, :version => way.version }
- assert_response :success, "should be able to get version #{way.version} of way #{way.way_id}."
-
- # now redact it
- post :redact, :params => { :id => way.way_id, :version => way.version, :redaction => redaction.id }
- end
+ private
- def propagate_tags(way, old_way)
- way.tags.each do |k, v|
- create(:old_way_tag, :old_way => old_way, :k => k, :v => v)
+ def create_redacted_way
+ create(:way, :with_history, :version => 2) do |way|
+ way_v1 = way.old_ways.find_by(:version => 1)
+ create(:old_way_tag, :old_way => way_v1, :k => "name", :v => "TOP SECRET")
+ way_v1.redact!(create(:redaction))
end
end
end
projects / rails.git / blobdiff