{ :path => "/relation/1/history", :method => :get },
{ :controller => "browse", :action => "relation_history", :id => "1" }
)
- assert_routing(
- { :path => "/changeset/1", :method => :get },
- { :controller => "browse", :action => "changeset", :id => "1" }
- )
assert_routing(
{ :path => "/query", :method => :get },
{ :controller => "browse", :action => "query" }
def test_read_relation
relation = create(:relation)
- browse_check :relation_path, relation.id, "browse/feature"
+ sidebar_browse_check :relation_path, relation.id, "browse/feature"
assert_select "h4", /^Version/ do
assert_select "a[href='#{old_relation_path relation, 1}']", :text => "1", :count => 1
end
def test_multiple_version_relation_links
relation = create(:relation, :with_history, :version => 2)
- browse_check :relation_path, relation.id, "browse/feature"
+ sidebar_browse_check :relation_path, relation.id, "browse/feature"
assert_select ".secondary-actions a[href='#{relation_history_path relation}']", :count => 1
assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 1
assert_select ".secondary-actions a[href='#{old_relation_path relation, 2}']", :count => 1
def test_read_relation_history
relation = create(:relation, :with_history)
- browse_check :relation_history_path, relation.id, "browse/history"
+ sidebar_browse_check :relation_history_path, relation.id, "browse/history"
assert_select "h4", /^Version/ do
assert_select "a[href='#{old_relation_path relation, 1}']", :text => "1", :count => 1
end
def test_read_way
way = create(:way)
- browse_check :way_path, way.id, "browse/feature"
+ sidebar_browse_check :way_path, way.id, "browse/feature"
assert_select "h4", /^Version/ do
assert_select "a[href='#{old_way_path way, 1}']", :text => "1", :count => 1
end
def test_multiple_version_way_links
way = create(:way, :with_history, :version => 2)
- browse_check :way_path, way.id, "browse/feature"
+ sidebar_browse_check :way_path, way.id, "browse/feature"
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
assert_select ".secondary-actions a[href='#{old_way_path way, 2}']", :count => 1
def test_read_way_history
way = create(:way, :with_history)
- browse_check :way_history_path, way.id, "browse/history"
+ 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
def test_read_node
node = create(:node)
- browse_check :node_path, node.id, "browse/feature"
+ sidebar_browse_check :node_path, node.id, "browse/feature"
assert_select "h4", /^Version/ do
assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1
end
def test_multiple_version_node_links
node = create(:node, :with_history, :version => 2)
- browse_check :node_path, node.id, "browse/feature"
+ sidebar_browse_check :node_path, node.id, "browse/feature"
assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1
assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 1
assert_select ".secondary-actions a[href='#{old_node_path node, 2}']", :count => 1
def test_read_deleted_node
node = create(:node, :visible => false)
- browse_check :node_path, node.id, "browse/feature"
+ sidebar_browse_check :node_path, node.id, "browse/feature"
assert_select "h4", /^Version/ do
assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1
end
def test_read_node_history
node = create(:node, :with_history)
- browse_check :node_history_path, node.id, "browse/history"
+ sidebar_browse_check :node_history_path, node.id, "browse/history"
assert_select "h4", /^Version/ do
assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1
end
end
- def test_read_changeset
- user = create(:user)
- changeset = create(:changeset, :user => user)
- create(:changeset, :user => user)
- browse_check :changeset_path, changeset.id, "browse/changeset"
- end
-
- def test_read_private_changeset
- user = create(:user)
- changeset = create(:changeset, :user => create(:user, :data_public => false))
- create(:changeset, :user => user)
- browse_check :changeset_path, changeset.id, "browse/changeset"
- end
-
- def test_read_changeset_hidden_comments
- changeset = create(:changeset)
- create_list(:changeset_comment, 3, :changeset => changeset)
- create(:changeset_comment, :visible => false, :changeset => changeset)
-
- browse_check :changeset_path, changeset.id, "browse/changeset"
- assert_select "div.changeset-comments ul li", :count => 3
-
- session_for(create(:moderator_user))
-
- browse_check :changeset_path, changeset.id, "browse/changeset"
- assert_select "div.changeset-comments ul li", :count => 4
- end
-
- def test_read_changeset_element_links
- changeset = create(:changeset)
- node = create(:node, :with_history, :changeset => changeset)
-
- browse_check :changeset_path, changeset.id, "browse/changeset"
- assert_dom "a[href='#{node_path node}']", :count => 1
- assert_dom "a[href='#{old_node_path node, 1}']", :count => 1
- end
-
##
# Methods to check redaction.
#
assert_select ".browse-section.browse-node .longitude", 0
end
+ def test_redacted_node_unredacted_history
+ session_for(create(:moderator_user))
+ node = create(:node, :with_history, :deleted, :version => 2)
+ node_v1 = node.old_nodes.find_by(:version => 1)
+ node_v1.redact!(create(:redaction))
+
+ get node_history_path(:id => node, :params => { :show_redactions => true })
+ assert_response :success
+ assert_template "browse/history"
+
+ assert_select ".browse-section", 2
+ assert_select ".browse-section.browse-redacted", 0
+ assert_select ".browse-section.browse-node", 2
+ end
+
def test_redacted_way_history
way = create(:way, :with_history, :version => 4)
way_v1 = way.old_ways.find_by(:version => 1)
assert_select ".browse-section.browse-way", 2
end
+ def test_redacted_way_unredacted_history
+ 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))
+ way_v3 = way.old_ways.find_by(:version => 3)
+ way_v3.redact!(create(:redaction))
+
+ get way_history_path(:id => way, :params => { :show_redactions => true })
+ assert_response :success
+ assert_template "browse/history"
+
+ assert_select ".browse-section", 4
+ assert_select ".browse-section.browse-redacted", 0
+ assert_select ".browse-section.browse-way", 4
+ end
+
def test_redacted_relation_history
relation = create(:relation, :with_history, :version => 4)
relation_v1 = relation.old_relations.find_by(:version => 1)
assert_select ".browse-section.browse-relation", 2
end
+ def test_redacted_relation_unredacted_history
+ session_for(create(:moderator_user))
+ relation = create(:relation, :with_history, :version => 4)
+ relation_v1 = relation.old_relations.find_by(:version => 1)
+ relation_v1.redact!(create(:redaction))
+ relation_v3 = relation.old_relations.find_by(:version => 3)
+ relation_v3.redact!(create(:redaction))
+
+ get relation_history_path(:id => relation, :params => { :show_redactions => true })
+ assert_response :success
+ assert_template "browse/history"
+
+ assert_select ".browse-section", 4
+ assert_select ".browse-section.browse-redacted", 0
+ assert_select ".browse-section.browse-relation", 4
+ end
+
def test_query
get query_path
assert_response :success
assert_template "browse/query"
end
- private
-
- # This is a convenience method for most of the above checks
- # First we check that when we don't have an id, it will correctly return a 404
- # then we check that we get the correct 404 when a non-existant id is passed
- # then we check that it will get a successful response, when we do pass an id
- def browse_check(path, id, template)
- path_method = method(path)
+ def test_anonymous_user_feature_page_secondary_actions
+ node = create(:node, :with_history)
+ get node_path(:id => node)
+ assert_response :success
+ assert_select ".secondary-actions a", :text => "View Details", :count => 0
+ assert_select ".secondary-actions a", :text => "View History", :count => 1
+ assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 0
+ end
- assert_raise ActionController::UrlGenerationError do
- get path_method.call
- end
+ def test_regular_user_feature_page_secondary_actions
+ session_for(create(:user))
+ node = create(:node, :with_history)
+ get node_path(:id => node)
+ assert_response :success
+ assert_select ".secondary-actions a", :text => "View Details", :count => 0
+ assert_select ".secondary-actions a", :text => "View History", :count => 1
+ assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 0
+ end
- assert_raise ActionController::UrlGenerationError do
- get path_method.call(:id => -10) # we won't have an id that's negative
- end
+ def test_moderator_user_feature_page_secondary_actions
+ session_for(create(:moderator_user))
+ node = create(:node, :with_history)
+ get node_path(:id => node)
+ assert_response :success
+ assert_select ".secondary-actions a", :text => "View Details", :count => 0
+ assert_select ".secondary-actions a", :text => "View History", :count => 1
+ assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 1
+ end
- get path_method.call(:id => 0)
- assert_response :not_found
- assert_template "browse/not_found"
- assert_template :layout => "map"
+ def test_anonymous_user_history_page_secondary_actions
+ node = create(:node, :with_history)
+ get node_history_path(:id => node)
+ assert_response :success
+ assert_select ".secondary-actions a", :text => "View Details", :count => 1
+ assert_select ".secondary-actions a", :text => "View History", :count => 0
+ assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 0
+ end
- get path_method.call(:id => 0), :xhr => true
- assert_response :not_found
- assert_template "browse/not_found"
- assert_template :layout => "xhr"
+ def test_regular_user_history_page_secondary_actions
+ session_for(create(:user))
+ node = create(:node, :with_history)
+ get node_history_path(:id => node)
+ assert_response :success
+ assert_select ".secondary-actions a", :text => "View Details", :count => 1
+ assert_select ".secondary-actions a", :text => "View History", :count => 0
+ assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 0
+ end
- get path_method.call(:id => id)
+ def test_moderator_user_history_page_secondary_actions
+ session_for(create(:moderator_user))
+ node = create(:node, :with_history)
+ get node_history_path(:id => node)
assert_response :success
- assert_template template
- assert_template :layout => "map"
+ assert_select ".secondary-actions a", :text => "View Details", :count => 1
+ assert_select ".secondary-actions a", :text => "View History", :count => 0
+ assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 1
+ end
+
+ def test_anonymous_user_unredacted_history_page_secondary_actions
+ node = create(:node, :with_history)
+ get node_history_path(:id => node, :params => { :show_redactions => true })
+ assert_response :redirect
+ end
- get path_method.call(:id => id), :xhr => true
+ def test_regular_user_unredacted_history_page_secondary_actions
+ session_for(create(:user))
+ node = create(:node, :with_history)
+ get node_history_path(:id => node, :params => { :show_redactions => true })
+ assert_response :redirect
+ end
+
+ def test_moderator_user_unredacted_history_page_secondary_actions
+ session_for(create(:moderator_user))
+ node = create(:node, :with_history)
+ get node_history_path(:id => node, :params => { :show_redactions => true })
assert_response :success
- assert_template template
- assert_template :layout => "xhr"
+ assert_select ".secondary-actions a", :text => "View Details", :count => 1
+ assert_select ".secondary-actions a", :text => "View History", :count => 1
+ assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 0
end
end
projects / rails.git / blobdiff