{ :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 => "/note/1", :method => :get },
- { :controller => "browse", :action => "note", :id => "1" }
- )
- assert_routing(
- { :path => "/note/new", :method => :get },
- { :controller => "browse", :action => "new_note" }
- )
assert_routing(
{ :path => "/query", :method => :get },
{ :controller => "browse", :action => "query" }
end
def test_read_relation
- browse_check :relation_path, create(:relation).id, "browse/feature"
- end
-
- def test_read_relation_history
- browse_check :relation_history_path, create(:relation, :with_history).id, "browse/history"
- end
-
- def test_read_way
- browse_check :way_path, create(:way).id, "browse/feature"
- end
-
- def test_read_way_history
- browse_check :way_history_path, create(:way, :with_history).id, "browse/history"
- end
-
- def test_read_node
- node = create :node
- browse_check :node_path, node.id, "browse/feature"
- assert_select "a[href='#{api_node_path node}']", :count => 1
- end
-
- def test_read_deleted_node
- node = create :node, :visible => false
- browse_check :node_path, node.id, "browse/feature"
- assert_select "a[href='#{api_node_path node}']", :count => 0
- end
-
- def test_read_node_history
- browse_check :node_history_path, create(:node, :with_history).id, "browse/history"
+ relation = create(:relation)
+ 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
+ assert_select ".secondary-actions a[href='#{api_relation_path relation}']", :count => 1
+ assert_select ".secondary-actions a[href='#{relation_history_path relation}']", :count => 1
+ assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 0
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"
+ def test_multiple_version_relation_links
+ relation = create(:relation, :with_history, :version => 2)
+ 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
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"
+ def test_read_relation_history
+ relation = create(:relation, :with_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
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
+ def test_read_way
+ way = create(:way)
+ 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
+ assert_select ".secondary-actions a[href='#{api_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 => 0
end
- def test_read_note
- open_note = create(:note_with_comments)
-
- browse_check :browse_note_path, open_note.id, "browse/note"
+ def test_multiple_version_way_links
+ way = create(:way, :with_history, :version => 2)
+ 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
end
- def test_read_hidden_note
- hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
-
- get browse_note_path(:id => hidden_note_with_comment)
- assert_response :not_found
- assert_template "browse/not_found"
- assert_template :layout => "map"
-
- get browse_note_path(:id => hidden_note_with_comment), :xhr => true
- assert_response :not_found
- assert_template "browse/not_found"
- assert_template :layout => "xhr"
-
- session_for(create(:moderator_user))
-
- browse_check :browse_note_path, hidden_note_with_comment.id, "browse/note"
+ def test_read_way_history
+ way = create(:way, :with_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
end
- def test_read_note_hidden_comments
- note_with_hidden_comment = create(:note_with_comments, :comments_count => 2) do |note|
- create(:note_comment, :note => note, :visible => false)
+ def test_read_node
+ node = create(:node)
+ 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
+ assert_select ".secondary-actions a[href='#{api_node_path node}']", :count => 1
+ assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1
+ assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 0
+ end
- browse_check :browse_note_path, note_with_hidden_comment.id, "browse/note"
- assert_select "div.note-comments ul li", :count => 1
-
- session_for(create(:moderator_user))
-
- browse_check :browse_note_path, note_with_hidden_comment.id, "browse/note"
- assert_select "div.note-comments ul li", :count => 2
+ def test_multiple_version_node_links
+ node = create(:node, :with_history, :version => 2)
+ 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
end
- def test_read_note_hidden_user_comment
- hidden_user = create(:user, :deleted)
- note_with_hidden_user_comment = create(:note_with_comments, :comments_count => 2) do |note|
- create(:note_comment, :note => note, :author => hidden_user)
+ def test_read_deleted_node
+ node = create(:node, :visible => false)
+ 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
-
- browse_check :browse_note_path, note_with_hidden_user_comment.id, "browse/note"
- assert_select "div.note-comments ul li", :count => 1
-
- session_for(create(:moderator_user))
-
- browse_check :browse_note_path, note_with_hidden_user_comment.id, "browse/note"
- assert_select "div.note-comments ul li", :count => 1
+ assert_select "a[href='#{api_node_path node}']", :count => 0
end
- def test_read_closed_note
- user = create(:user)
- closed_note = create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc, :comments_count => 2) do |note|
- create(:note_comment, :event => "closed", :note => note, :author => user)
+ def test_read_node_history
+ node = create(:node, :with_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
-
- browse_check :browse_note_path, closed_note.id, "browse/note"
- assert_select "div.note-comments ul li", :count => 2
- assert_select "div.details", /Resolved by #{user.display_name}/
-
- user.soft_destroy!
-
- reset!
-
- browse_check :browse_note_path, closed_note.id, "browse/note"
- assert_select "div.note-comments ul li", :count => 1
- assert_select "div.details", /Resolved by deleted/
end
##
assert_select ".browse-section.browse-relation", 2
end
- def test_new_note
- get note_new_path
- assert_response :success
- assert_template "browse/new_note"
- 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)
-
- assert_raise ActionController::UrlGenerationError do
- get path_method.call
- end
-
- assert_raise ActionController::UrlGenerationError do
- get path_method.call(:id => -10) # we won't have an id that's negative
- end
-
- get path_method.call(:id => 0)
- assert_response :not_found
- assert_template "browse/not_found"
- assert_template :layout => "map"
-
- get path_method.call(:id => 0), :xhr => true
- assert_response :not_found
- assert_template "browse/not_found"
- assert_template :layout => "xhr"
-
- get path_method.call(:id => id)
- assert_response :success
- assert_template template
- assert_template :layout => "map"
-
- get path_method.call(:id => id), :xhr => true
- assert_response :success
- assert_template template
- assert_template :layout => "xhr"
- end
end
projects / rails.git / blobdiff